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

View File

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

View File

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