ui improvements

This commit is contained in:
Michael Fatemi 2021-07-21 12:16:54 -04:00
parent d73e1eddad
commit d7637d9cf9
4 changed files with 428 additions and 386 deletions

View File

@ -2,4 +2,4 @@
Source for TowardsTJ flatpage Source for TowardsTJ flatpage
Made with :heart: by Rushil Umaretiya (2023rumareti) and Michael Fatemi (2022mfatemi) Made with :heart: by Michael Fatemi (2022mfatemi) and Rushil Umaretiya (2023rumareti)

View File

@ -1,208 +1,232 @@
html { html {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
} }
body { body {
background-color: #fafafa; background-color: #fafafa;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
main { main {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
align-items: center; align-items: center;
max-width: 50rem; max-width: 50rem;
margin: 1rem auto; margin: 1rem auto;
padding: 0.5rem; padding: 0.5rem;
font-size: 1.5rem; font-size: 1.5rem;
} }
nav { nav {
background: transparent; background: transparent;
padding: 1rem; padding: 1rem;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
transition: all 0.3s ease; transition: all 0.3s ease;
} }
.scrolled { .scrolled {
background: #fafafa; background: #fafafa;
} }
.wrapper { .wrapper {
position: fixed; position: fixed;
width: 100%; width: 100%;
top: 0; top: 0;
z-index: 1; z-index: 1;
} }
.nav-link { .nav-link {
display: inline-block; display: inline-block;
padding: 0.5rem 2rem; padding: 0.5rem 2rem;
line-height: 1.5; line-height: 1.5;
text-decoration: none; text-decoration: none;
color: #4a4a4a; color: #4a4a4a;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 0.02em; letter-spacing: 0.02em;
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.bold { .bold {
font-weight: bold; font-weight: bold;
} }
.hero { .hero {
position: relative; position: relative;
height: 100vh; height: 100vh;
} }
.important { .important {
font-size: 4rem; font-size: 4rem;
font-weight: normal; font-weight: normal;
} }
.quote { .quote {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
max-width: 75%; width: 100%;
margin: 1rem auto; margin-top: 1rem;
padding: 0.5rem; margin-bottom: 1rem;
font-size: 1.5rem; padding: 0.5rem;
font-size: 1.5rem;
}
.quote-col {
flex: 1;
padding: 2rem calc(min(4rem, 100vw));
} }
.introduction { .introduction {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100vh; padding-top: 2.5rem;
align-items: center; padding-bottom: 2.5rem;
justify-content: center; align-items: center;
justify-content: center;
} }
.subheader { .subheader {
max-width: 50%; max-width: 50%;
font-style: italic; font-style: italic;
} }
table { table {
border: 1px solid black; border: 1px solid black;
width: 100%; width: 100%;
} }
.button { .button {
border-radius: 0.5rem; border-radius: 0.5rem;
padding: 0.5em 1em; padding: 0.5em 1em;
margin: 0.5rem 0; margin: 0.5rem 0.5rem;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
transition: all 0.3s ease; transition: all 0.3s ease;
} }
.button:visited { .button:visited {
color: inherit; color: inherit;
} }
.hover-1:hover { .hover-1:hover {
background-image: linear-gradient( background-image: linear-gradient(
to right, to right,
#e7484f, #e7484f,
#e7484f 16.65%, #e7484f 16.65%,
#f68b1d 16.65%, #f68b1d 16.65%,
#f68b1d 33.3%, #f68b1d 33.3%,
#fced00 33.3%, #fced00 33.3%,
#fced00 49.95%, #fced00 49.95%,
#009e4f 49.95%, #009e4f 49.95%,
#009e4f 66.6%, #009e4f 66.6%,
#00aac3 66.6%, #00aac3 66.6%,
#00aac3 83.25%, #00aac3 83.25%,
#732982 83.25%, #732982 83.25%,
#732982 100%, #732982 100%,
#e7484f 100% #e7484f 100%
); );
animation: slidebg 2s reverse linear infinite; animation: slidebg 2s reverse linear infinite;
} }
.hover-2:hover { .hover-2:hover {
background-image: linear-gradient( background-image: linear-gradient(
to left, to left,
#e7484f, #e7484f,
#e7484f 16.65%, #e7484f 16.65%,
#f68b1d 16.65%, #f68b1d 16.65%,
#f68b1d 33.3%, #f68b1d 33.3%,
#fced00 33.3%, #fced00 33.3%,
#fced00 49.95%, #fced00 49.95%,
#009e4f 49.95%, #009e4f 49.95%,
#009e4f 66.6%, #009e4f 66.6%,
#00aac3 66.6%, #00aac3 66.6%,
#00aac3 83.25%, #00aac3 83.25%,
#732982 83.25%, #732982 83.25%,
#732982 100%, #732982 100%,
#e7484f 100% #e7484f 100%
); );
animation: slidebg 2s linear infinite; animation: slidebg 2s linear infinite;
} }
@keyframes slidebg { @keyframes slidebg {
to { to {
background-position: 20vw; background-position: 20vw;
} }
} }
.whitesmoke { .whitesmoke {
background-color: whitesmoke; background-color: #e7e7e7;
} }
.inline { .inline {
display: inline; display: inline;
} }
.signup-button { .signup-button {
display: inline-block; display: inline-block;
font-size: 1.25rem; font-size: 1.25rem;
font-weight: 600; font-weight: 600;
text-transform: uppercase; text-transform: uppercase;
} }
.materials-table { .materials-table {
border-spacing: 0; border-spacing: 0;
text-align: left; text-align: left;
padding: 0.5rem; padding: 1rem 0.5rem;
background-color: white; background-color: white;
border: 0px; border: 0px;
border-radius: 0.5rem; border-radius: 0.5rem;
margin-bottom: 2em; margin-bottom: 2em;
} }
.materials-table > thead > tr > th { .materials-table > thead > tr > th,
padding: 0.5rem; .materials-table > tbody > tr > td {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
}
.materials-table > thead > tr > th:nth-child(1) {
text-align: right;
padding-right: 1rem;
width: 15%;
}
.materials-table > thead > tr > th:nth-child(2) {
text-align: left;
padding-left: 1rem;
} }
/* Day number */ /* Day number */
.materials-table > tbody > tr > td:nth-child(1) { .materials-table > tbody > tr > td:nth-child(1) {
text-align: right; text-align: right;
padding: 0.5rem; padding-right: 1rem;
} }
/* Topics */ /* Topics */
.materials-table > tbody > tr > td:nth-child(2) { .materials-table > tbody > tr > td:nth-child(2) {
text-align: left; text-align: left;
padding: 0.5rem; padding-left: 1rem;
} }
.materials-table td { .materials-table td {
vertical-align: text-top; vertical-align: text-top;
} }
span.materials-table-title { span.materials-table-title {
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
margin-bottom: 1em; margin-bottom: 1em;
}
.footer {
font-size: 0.75rem;
} }

View File

@ -1,266 +1,285 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>TowardsTJ</title> <title>TowardsTJ</title>
<link rel="stylesheet" href="css/index.css" /> <link rel="stylesheet" href="css/index.css" />
</head> </head>
<body> <body>
<div class="wrapper"> <div class="wrapper">
<nav> <nav>
<a class="nav-link" href="#">Home</a> <a class="nav-link" href="#">Home</a>
<a class="nav-link" href="#schedule">Schedule</a> <a class="nav-link" href="#schedule">Schedule</a>
<a href="#"> <a href="#">
<img src="css/img/towards.png" style="height: 4rem" /> <img src="css/img/towards.png" style="height: 4rem" />
</a> </a>
<a class="nav-link" href="#topics">Topics</a> <a class="nav-link" href="#topics">Topics</a>
<a <a
class="nav-link bold" class="nav-link bold"
href="https://docs.google.com/forms/d/e/1FAIpQLSc5h3xspjHiVVlaRlOEOyQl9oM0tB4ba7gs7vxx3PouHBnw6A/viewform" href="https://docs.google.com/forms/d/e/1FAIpQLSc5h3xspjHiVVlaRlOEOyQl9oM0tB4ba7gs7vxx3PouHBnw6A/viewform"
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"
>Sign Up</a >Sign Up</a
> >
</nav> </nav>
</div> </div>
<div class="hero"> <div class="hero">
<img <img
style="width: 100%; height: 100%; object-fit: cover" style="width: 100%; height: 100%; object-fit: cover"
src="css/img/tj.jpg" src="css/img/tj.jpg"
/> />
<div <div
style=" style="
position: absolute; position: absolute;
inset: 0; inset: 0;
background-color: black; background-color: black;
opacity: 0.15; opacity: 0.15;
" "
></div> ></div>
<h1 <h1
style=" style="
position: absolute; position: absolute;
left: 5%; left: 5%;
top: calc(50% - 2em); top: calc(50% - 2em);
text-align: center; text-align: center;
color: white; color: white;
font-size: 4rem; font-size: 4rem;
padding: 0.5rem; padding: 0.5rem;
" "
> >
Get a Head Start<br /> Get a Head Start<br />
on Success at TJ on Success at TJ
</h1> </h1>
</div> </div>
<div class="introduction"> <div class="introduction">
<div class="quote"> <div class="quote">
<h1 class="important" style="text-align: center; margin-top: 2em"> <div class="quote-col">
Next year, over <span class="bold">800</span> students will enter the <h1 class="important" style="text-align: center">
TJ building for the first time. Next year, over <span class="bold">800</span> students will enter
</h1> the TJ building for the first time.
<p class="subheader"> </h1>
TJ's Student Government Association is hosting a summer program where </div>
students can get inside advice from upperclassmen about classes, <div class="quote-col">
extracurriculars, and TJ life. <p style="font-style: italic; font-size: 2rem">
</p> TJ's Student Government Association is hosting a summer program
</div> where students can get inside advice from upperclassmen about
<div class="inline"> classes, extracurriculars, and TJ life.
<a </p>
class="button hover-1 signup-button whitesmoke" </div>
href="https://docs.google.com/forms/d/e/1FAIpQLSc5h3xspjHiVVlaRlOEOyQl9oM0tB4ba7gs7vxx3PouHBnw6A/viewform" </div>
target="_blank" <div class="inline">
rel="noreferrer" <a
>Sign Up</a class="button hover-1 signup-button whitesmoke"
> href="https://docs.google.com/forms/d/e/1FAIpQLSc5h3xspjHiVVlaRlOEOyQl9oM0tB4ba7gs7vxx3PouHBnw6A/viewform"
<a target="_blank"
class="button hover-2 signup-button whitesmoke" rel="noreferrer"
href="https://docs.google.com/forms/d/e/1FAIpQLSc5h3xspjHiVVlaRlOEOyQl9oM0tB4ba7gs7vxx3PouHBnw6A/viewform" >Sign Up</a
target="_blank" >
rel="noreferrer" <a
>Volunteer</a class="button hover-2 signup-button whitesmoke"
> href="https://docs.google.com/forms/d/e/1FAIpQLSc5h3xspjHiVVlaRlOEOyQl9oM0tB4ba7gs7vxx3PouHBnw6A/viewform"
</div> target="_blank"
</div> rel="noreferrer"
<main> >Volunteer</a
<h1 class="header" id="schedule">Schedule</h1> >
<p style="margin-block-start: 0; text-align: center"> </div>
2024 students: August 2nd - August 6th, weekdays<br /> </div>
2025 students: August 2nd - August 13th, weekdays<br /><br /> <main style="position: relative">
<div id="schedule" style="margin-top: -5rem; height: 5rem"></div>
<h1 class="header">Schedule</h1>
<p style="margin-block-start: 0; text-align: center">
2024 students: August 2nd - August 6th, weekdays<br />
2025 students: August 2nd - August 13th, weekdays<br /><br />
10:00am - 11:15am or 11:30am - 12:45pm. 10:00am - 11:15am or 11:30am - 12:45pm.
</p> </p>
<h2 id="topics">Topics</h2> <div id="topics" style="margin-top: -5rem; height: 5rem"></div>
<h2>Topics</h2>
<span> <span>
(Jump to: <a href="#2025-week-1">2025 week 1</a>, (Jump to: <a href="#2025-week-1">2025 week 1</a>,
<a href="#2025-week-2">2025 week 2</a>, <a href="#2024">2024</a>) <a href="#2025-week-2">2025 week 2</a>, <a href="#2024">2024</a>)
</span> </span>
<span class="materials-table-title" id="2025-week-1" <span class="materials-table-title" id="2025-week-1"
>2025 Week 1: Introduction to TJ</span >2025 Week 1: Introduction to TJ</span
> >
<table id="2025-week-1-table" class="materials-table"> <table id="2025-week-1-table" class="materials-table">
<thead> <thead>
<tr> <tr>
<th>Day</th> <th>Day</th>
<th>Topics</th> <th>Topics</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>1</td> <td>1</td>
<td> <td>
Introduction to TJ<br /> Introduction to TJ<br />
Homecoming Homecoming
</td> </td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td> <td>
Biology<br /> Biology<br />
English English
</td> </td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td> <td>
Design and Technology<br /> Design and Technology<br />
IBET (Integrated Biology, English, and Technology) IBET (Integrated Biology, English, and Technology)
</td> </td>
</tr> </tr>
<tr> <tr>
<td>4</td> <td>4</td>
<td> <td>
Biology<br /> Biology<br />
English<br /> English<br />
<ul style="margin-top: 0"> <ul style="margin-top: 0">
<li>Literature reviews</li> <li>Literature reviews</li>
<li>Scientific writing</li> <li>Scientific writing</li>
<li>Citations</li> <li>Citations</li>
<li>Taking notes from a book</li> <li>Taking notes from a book</li>
</ul> </ul>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>5</td> <td>5</td>
<td> <td>
Test<br /> Test<br />
General TJ Advice General TJ Advice
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<span class="materials-table-title" id="2025-week-2" <span class="materials-table-title" id="2025-week-2"
>2025 Week 2: Introduction to TJ</span >2025 Week 2: Introduction to TJ</span
> >
<table id="2025-week-2-table" class="materials-table"> <table id="2025-week-2-table" class="materials-table">
<thead> <thead>
<tr> <tr>
<th>Day</th> <th>Day</th>
<th>Topics</th> <th>Topics</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>1</td> <td>1</td>
<td> <td>
Project briefing<br /> Project briefing<br />
Electives Pathways Electives Pathways
</td> </td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td> <td>
Languages<br /> Languages<br />
Project work time Project work time
</td> </td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td> <td>
Computer Science<br /> Computer Science<br />
<ul style="margin-top: 0"> <ul style="margin-top: 0">
<li>Electives</li> <li>Electives</li>
<li>Research labs</li> <li>Research labs</li>
</ul> </ul>
Project work time Project work time
</td> </td>
</tr> </tr>
<tr> <tr>
<td>4</td> <td>4</td>
<td> <td>
Math<br /> Math<br />
Project work time Project work time
</td> </td>
</tr> </tr>
<tr> <tr>
<td>5</td> <td>5</td>
<td> <td>
Project presentation<br /> Project presentation<br />
Extracurricular advice Extracurricular advice
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<span class="materials-table-title" id="2024" <span class="materials-table-title" id="2024"
>2024: Introduction to TJ</span >2024: Introduction to TJ</span
> >
<table id="2024-table" class="materials-table"> <table id="2024-table" class="materials-table">
<thead> <thead>
<tr> <tr>
<th>Day</th> <th>Day</th>
<th>Topics</th> <th>Topics</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>1</td> <td>1</td>
<td> <td>
Introduction to in-person TJ<br /> Introduction to in-person TJ<br />
Project briefing Project briefing
</td> </td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td> <td>
Chemistry<br /> Chemistry<br />
AP Biology<br /> AP Biology<br />
AP Chemistry<br /> AP Chemistry<br />
AP Computer Science AP Computer Science
</td> </td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td> <td>
Math<br /> Math<br />
Languages Languages
</td> </td>
</tr> </tr>
<tr> <tr>
<td>4</td> <td>4</td>
<td>Humanities (HUM)<br /></td> <td>Humanities (HUM)<br /></td>
</tr> </tr>
<tr> <tr>
<td>5</td> <td>5</td>
<td> <td>
Test<br /> Test<br />
General TJ Advice<br /> General TJ Advice<br />
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</main>
<script <br />
src="https://code.jquery.com/jquery-3.6.0.slim.min.js"
integrity="sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI=" <footer class="footer">
crossorigin="anonymous" <p>
></script> <a href="https://github.com/tjsga/towardstj">GitHub</a>
<script src="js/main.js"></script> </p>
</body> <p>
Website made with ❤ by
<a href="https://github.com/myfatemi04">Michael Fatemi</a> &amp;
<a href="https://github.com/rushilwiz">Rushil Umaretiya</a>
</p>
</footer>
</main>
<script
src="https://code.jquery.com/jquery-3.6.0.slim.min.js"
integrity="sha256-u7e5khyithlIdTpu22PHhENmPcRdFiHRjhAuHcs05RI="
crossorigin="anonymous"
></script>
<script src="js/main.js"></script>
</body>
</html> </html>

View File

@ -1,7 +1,6 @@
$(function () { $(() => {
$(document).scroll(function () { $(document).scroll(function () {
var $nav = $("nav"); const $nav = $('nav');
var $hero = $(".hero"); $nav.toggleClass('scrolled', $(this).scrollTop() > $nav.height());
$nav.toggleClass("scrolled", $(this).scrollTop() > $hero.height()); });
});
}); });