Skip to content

Commit

Permalink
Merge pull request #46 from YorkURobotics/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
PurveshPatelYu authored Apr 30, 2024
2 parents 14f3c19 + 9ba1403 commit b991e15
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 101 deletions.
Binary file added website/_assets/img/IEEE.png
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 website/_assets/img/WiSE_pfp_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
107 changes: 23 additions & 84 deletions website/_layouts/industry.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,7 @@
object-fit: contain;
flex: 1 1 auto;
}
.ytvid {
position: relative;
overflow: hidden;
width: 100%;
padding-top: 56.25%;
}

.framevid {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
}
.partner {
display: flex;
justify-content: flex-start;
Expand All @@ -58,13 +43,35 @@
object-fit: contain;
flex: 1 1 auto;
}
.button {
background-color: #111827;
border: 1px solid transparent;
border-radius: .75rem;
box-sizing: border-box;
color: #FFFFFF;
cursor: pointer;
flex: 0 0 auto;
font-family: "Inter var",ui-sans-serif,system-ui,-apple-system,system-ui,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
font-size: 1.125rem;
font-weight: 600;
line-height: 1.5rem;
padding: .75rem 1.2rem;
text-align: center;
text-decoration: none #6B7280 solid;

touch-action: manipulation;
width: auto;
}

/* Adjustments for mobile screens */
@media (max-width: 768px) {
.clubs {
flex-direction: column; /* Stack images vertically on smaller screens */
align-items: center;
}

.button {
padding: .75rem 1.5rem;
}
.clubs img {
max-width: 100%; /* Images take full width on mobile */
}
Expand All @@ -77,72 +84,7 @@
max-width: 100%; /* Images take full width on mobile */
}
}
.buttons-container {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
margin-top: 20px;
}

button {
background: white;
border: solid 2px black;
}

.button-arounder {
font-size: 25px;
background: hsl(190deg, 30%, 15%);
color: hsl(190deg, 10%, 95%);

box-shadow: 0 0px 0px hsla(190deg, 15%, 5%, .2);
transform: translateY(0);
border-top-left-radius: 0px;
border-top-right-radius: 0px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;

--dur: .15s;
--delay: .15s;
--radius: 16px;

transition:
border-top-left-radius var(--dur) var(--delay) ease-out,
border-top-right-radius var(--dur) calc(var(--delay) * 2) ease-out,
border-bottom-right-radius var(--dur) calc(var(--delay) * 3) ease-out,
border-bottom-left-radius var(--dur) calc(var(--delay) * 4) ease-out,
box-shadow calc(var(--dur) * 4) ease-out,
transform calc(var(--dur) * 4) ease-out,
background calc(var(--dur) * 4) steps(4, jump-end);
}

.button-arounder:hover,
.button-arounder:focus {
box-shadow: 0 4px 8px hsla(190deg, 15%, 5%, .2);
transform: translateY(-4px);
background: hsl(230deg, 50%, 45%);
border-top-left-radius: var(--radius);
border-top-right-radius: var(--radius);
border-bottom-left-radius: var(--radius);
border-bottom-right-radius: var(--radius);
}
body {
font-family: Arial, sans-serif;
max-width: 100%;
margin: 0 auto;
padding: 20px;
text-align: center;
}
.tickets-button {
display: inline-block;
background-color: #007bff;
color: white;
padding: 10px 20px;
border-radius: 5px;
text-decoration: none;
margin-right: auto;
margin-left: 10px;
}
#header #logo {
position: absolute;
width: 1.75em;
Expand All @@ -169,9 +111,6 @@
line-height: 1.6;
text-align: justify;
}
#footer {
margin-top: 2em;
}
</style>
</head>
<body class="is-preload">
Expand Down
35 changes: 18 additions & 17 deletions website/industrynight.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
---
<header>
<br>
<div class="ytvid">
<iframe class="framevid" src="https://www.youtube.com/embed/zV7TQaIjNjo" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>
</div>
<div>
<iframe class="ytvid" src="https://www.youtube.com/embed/zV7TQaIjNjo" style="border: 0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen=""></iframe>
</div>
<h2>What is Industry Night?</h2>
</header>

Expand All @@ -31,19 +31,9 @@ <h2>What is Industry Night?</h2>
departments and the respective related industries.
</p>
<br>
<br>
<h2>Featured Clubs:</h2>
<br>
<div class="clubs">
<img src="assets/img/Logo_Remake_Minimalist.png" alt="Rockertry">
<img src="assets/img/Logo_RWR_Filled.png" alt="Lassonde MotorSports">
<img src="assets/img/Frame_1.png" alt="CS Hub">
<img src="assets/img/YURS_Logo_constellation.png" alt="YURS">
</div>
<br>
<h2> 2024 Partners</h2>
<br>
<h2>Past Partners</h2>
<h2>2023 Partners</h2>
<br>
<div class="partner">
<img src="assets/img/Pantheon_Gold_Horizontal_Logo.png" alt="" >
Expand All @@ -54,7 +44,18 @@ <h2>Past Partners</h2>
<img src="assets/img/image_1.png" alt="Ontario Power Generation">
<img src="assets/img/quanser-logo.jpg" alt="quanser">

</div>
<div class="buttons-container">
<button class="button-arounder" onclick="window.location.href='https://drive.google.com/file/d/1WCMefPH5gFQue7jhgAO-KzsEupQ3B65J/view?usp=drive_link';">Sponsor This Event</button>
</div>
<br>
<h2>Featured Clubs 2023:</h2>
<br>
<div class="clubs">
<img src="assets/img/IEEE.png" alt="IEEE">
<img src="assets/img/WiSE_pfp_logo.png" alt="WISE">
<img src="assets/img/Logo_Remake_Minimalist.png" alt="Rockertry">
<img src="assets/img/Logo_RWR_Filled.png" alt="Lassonde MotorSports">
<img src="assets/img/Frame_1.png" alt="CS Hub">
<img src="assets/img/YURS_Logo_constellation.png" alt="YURS">
</div>
<br>

<a href="https://drive.google.com/file/d/1C2CIJ8UFBEHOK-m7qH7IYynZsgiCIKdG/view?usp=sharing"><button class="button" role="button">Sponsor this Event</button></a>

0 comments on commit b991e15

Please sign in to comment.