Skip to content

Commit

Permalink
Merge pull request #144 from wfrautschy4/master
Browse files Browse the repository at this point in the history 
Updated main page for upcoming events
  • Loading branch information
@wfrautschy4
wfrautschy4 authored Jul 11, 2024
2 parents 250ad7d + af166be commit 54e9682
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 12 deletions.
28 changes: 27 additions & 1 deletion assets/css/redesign-main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ a.pretty-link:visited{
margin: 0 15px;
justify-content: center;
align-items: center;
border-radius: 7px;
/* Must be relative for img to be absolutely positioned */
position: relative;

Expand All @@ -195,18 +196,43 @@ a.pretty-link:visited{

height: 11em;
}
.event-box-small {
flex: 1;
flex-grow: 1;
display: -webkit-flex;
display: flex;
margin: 0 15px;
justify-content: center;
align-items: center;
border-radius: 7px;
/* Must be relative for img to be absolutely positioned */
position: relative;
background-color: rgb(34, 34, 34);
color: white;

height: 9em;
}
.event-box:hover {
background-color: #080808;
}
.event-box-text {
.event-box .event-box-text {
margin-left: 5%;
position: relative;
font-size: 28px;
}
.event-box-small .event-box-text {
margin-left: 5%;
position: relative;
font-size: 22px;
}
.event-box img {
position: relative;
height: 50%;
}
.event-box-small img {
position: relative;
height: 40%;
}
.event-box .event-coming-soon {
position: absolute;
top: 20%;
Expand Down
Binary file added assets/img/events/code4cause-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/events/construct-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/events/stem-logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 54 additions & 11 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,13 @@
<div id="featured-banner">
<div class="container">
<div class="bottom-left text-with-back">
<div id="featured-event"></div>
<div id="featured-event">
<a href="https://software.osu.edu/construct-io-builders-summit" target="_blank" rel="noopener noreferrer">
<h3>FEATURED EVENT</h3>
<h1>Construct I/O 2024</h1>
<h4>October 17th, 2024</h4>
</a>
</div>
<!-- <div class="reg-button"><a id="apply" href="https://www.eventbrite.com/e/hackohio-2021-showcase-tickets-190617390747" target="_blank" rel="noopener nonreferrer">Signup for Showcase!</a></div> -->
</div>
</div>
Expand Down Expand Up @@ -235,32 +241,57 @@ <h1 style="margin-bottom: 0%">Community Events</h1>

<br/>

<div class="container">
<div class="main-events">
<a href="https://software.osu.edu/construct-io-builders-summit" target="_blank" rel="noopener nonreferrer">
<div class="event-box" style="height: 9em;">
<img src="assets/img/events/construct-logo.png" alt="ConstructIO Logo"/>
<span class="event-box-text">
<div>Construct I/O</div>
<div style="font-size: 50%;">October 17, 2024</div>
</span>
</div>
</a>
<br/>
</div>
</div>

<br/>

<div class="container">
<div class="main-events">
<a href="/dataio/" target="_blank" rel="noopener nonreferrer">
<div class="event-box">
<div class="event-box-small">
<img src="assets/img/events/dataio-logo.png" alt="DataIO Logo"/>
<span class="event-box-text">
<div>Data I/O</div>
</span>
</div>
</a>
<a href="http://ctf.osucyber.club/" target="_blank" rel="noopener nonreferrer">
<div class="event-box">
<div class="event-box-small">
<img src="assets/img/events/ctf-logo2.png" alt="CTF Logo"/>
<span class="event-box-text">
<div>Capture the Flag</div>
</span>
</div>
</a>
<a href="https://www.osuaiclub.com/hackai.html" target="_blank" rel="noopener nonreferrer">
<div class="event-box">
<div class="event-box-small">
<img src="assets/img/events/hackai-logo.png" alt="HackAI Logo"/>
<span class="event-box-text">
<div>Hack A/I</div>
</span>
</div>
</a>
<a href="https://byrd.osu.edu/climathon" target="_blank" rel="noopener nonreferrer">
<div class="event-box-small">
<img src="assets/img/events/clima-logo.png" alt="Climathon Logo"/>
<span class="event-box-text">
<div>Climathon</div>
</span>
</div>
</a>
<br/>
</div>
</div>
Expand All @@ -271,32 +302,44 @@ <h1 style="margin-bottom: 0%">Community Events</h1>
<div class="main-events">
<a href="https://www.osubmes.org/initiatives/bio-hack" target="_blank" rel="noopener nonreferrer">
<!-- Usual link: https://u.osu.edu/bmes/annual-events/bio-hack/ -->
<div class="event-box">
<div class="event-box-small">
<img src="assets/img/events/biohack-logo.svg" alt="BioHack Logo"/>
<span class="event-box-text">
<div>Bio-Hack</div>
</span>
</div>
</a>
<a href="/codeio/" target="_blank" rel="noopener nonreferrer">
<div class="event-box">
<a href="https://acmwosu.github.io/codeio.html" target="_blank" rel="noopener nonreferrer">
<div class="event-box-small">

<img src="assets/img/events/codeio-logo.svg" alt="CodeIO Logo"/>
<span class="event-box-text">
<div>Code I/O</div>
</span>
</div>
</a>
<a href="https://byrd.osu.edu/climathon" target="_blank" rel="noopener nonreferrer">
<div class="event-box">
<img src="assets/img/events/clima-logo.png" alt="Climathon Logo"/>
<a href="https://www.yforsec4c.org/" target="_blank" rel="noopener nonreferrer">
<div class="event-box-small" >
<img src="assets/img/events/code4cause-logo.png" alt="Code4Cause Logo"/>
<span class="event-box-text">
<div>Climathon</div>
<div>Code4Cause</div>
</span>
</div>
</a>
<a href="#" target="_blank" rel="noopener nonreferrer">
<div class="event-box-small" >
<img src="assets/img/events/stem-logo.png" alt="STEM IO Logo"/>
<span class="event-box-text">
<div>STEM I/O&emsp;</div>
</span>
</div>
</a>
<br/>
</div>
</div>

<br/>


<br/><br/><br/><br/>

Expand Down

0 comments on commit 54e9682

Please sign in to comment.