Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sidenav highlighting #225

Merged
merged 4 commits into from
Dec 26, 2020
Merged

Fix sidenav highlighting #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a55ecf1
Fix sidenav highlighting
jadebuckwalter Dec 23, 2020
e101c86
Sidenav transition
jadebuckwalter Dec 23, 2020
c2f15ad
Fix colors in sidenav
jadebuckwalter Dec 26, 2020
e52c9c3
Change sidenav class to id
jadebuckwalter Dec 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 26 additions & 40 deletions public/css/home.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,6 @@ body {
--schedule6: #b1dfc0;
--schedule7: #c0e5cd;
--schedule8: #d0ecd9;

--sidenav-color: #e0e0e0;
--sidenav-button-color: #eaeaea;
--sidenav-button-child-color: #f9f9f9;
--sidenav-hr-color: #d8d8d8;

--sidenav-hover-color: #f3f3f3;
--sidenav-hover-lighter-color: #f3f3f3;

}

body.dark {
Expand Down Expand Up @@ -124,15 +115,6 @@ body.dark {
--schedule6: #00a336;
--schedule7: #00b83d;
--schedule8: #00cc44;

--sidenav-color: #121212;
--sidenav-button-color: #292a2b;
--sidenav-button-child-color: #4e5257;
--sidenav-hr-color: #576069;

--sidenav-hover-color: #333436;
--sidenav-hover-lighter-color: #606d78;

}

/*---------------------------------------------*/
Expand Down Expand Up @@ -1146,36 +1128,36 @@ p#large_clock_period {
background-color: var(--white1);
}

.sidenav .select-items div:hover {
background-color: var(--sidenav-hover-lighter-color);
#sidenav .select-items div:hover {
background-color: var(--white3);
}

.sidenav hr {
#sidenav hr {
height: 4px;
width: 270px;
background-color: var(--sidenav-hr-color);
background-color: var(--white3);
clear: both;
margin: 5px 0px;
border: 0px;
}

.sidenav {
#sidenav {
height: 100%;
width: 0;
position: fixed;
z-index: 2;
top: 0;
left: 0;
background-color: var(--sidenav-color);
background-color: var(--white2);
overflow-x: hidden;
padding-top: 5px;
transition: 0.5s;
transition: 0.3s;
display: block;
}

.sidenav button {
#sidenav button {
clear: both;
background-color: var(--sidenav-button-color);
background-color: inherit;
/* float: left; */
/* float: right; */
border: none;
Expand All @@ -1189,24 +1171,28 @@ p#large_clock_period {
/*transition: 0.3s; commented out to prevent weird transitions involving Calculated GPA*/
}

.sidenav .select-selected:hover {
background-color: var(--sidenav-hover-color) !important;
#sidenav button.active {
background-color: var(--gray);
}

#sidenav .select-selected:hover {
background-color: var(--white3) !important;
}

.sidenav button:hover {
background-color: var(--sidenav-hover-color) !important;
#sidenav button:hover {
background-color: var(--white3) !important;
}

.sidenav .GPA {
#sidenav .GPA {
clear: both;
height: 44px;
margin-bottom: 5px;
width: 270px;
}

.sidenav .select-selected {
#sidenav .select-selected {
color: var(--black) !important;
background-color: var(--sidenav-button-color);
background-color: inherit;
/* float: right; */
font-size: 14px !important;
font-family: Arial, Helvetica, sans-serif !important;
Expand All @@ -1216,21 +1202,21 @@ p#large_clock_period {
margin-bottom: 5px;
}

.sidenav .select-selected:after {
#sidenav .select-selected:after {
right: 15px;
}

.sidenav .activated-selected-item {
#sidenav .activated-selected-item {
/*border: 1px transparent solid;*/
border-width: 1px 1px 1px 1px !important;
margin: 0px 5px 5px 5px;
border-style: solid;
border-color: transparent !important; /* empty borders for these because it looks better */
}

.sidenav .activated-select-items {
#sidenav .activated-select-items {
color: var(--black);
background-color: var(--sidenav-button-child-color);
background-color: inherit;
float: right;
font-size: 14px !important;
font-family: Arial, Helvetica, sans-serif !important;
Expand All @@ -1241,15 +1227,15 @@ p#large_clock_period {
border-color: transparent !important;
}

.sidenav .select-items {
#sidenav .select-items {
position: static;
}

.hide {
display: none;
}

.sidenav-overlay {
#sidenav-overlay {
width: 100%;
height: 100%;
position: fixed;
Expand Down
4 changes: 2 additions & 2 deletions public/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<script src="vendor/file-saver/FileSaver.min.js" async="true"></script>
</head>
<body>
<div class="sidenav-overlay fade-in" id="sidenav-overlay"></div>
<div id="sidenav-overlay" class="fade-in"></div>
<noscript>
<p><strong>
Aspine is designed to work mainly as a client-side web application
Expand Down Expand Up @@ -75,7 +75,7 @@ <h4 id="title" onclick="openTab(event, 'grades')">Aspine</h4>
</div>

<!-- SIDENAV STUFF -->
<div id="sidenav" class="sidenav">
<div id="sidenav">
<!-- switch-exempt makes the switch out of navbar pass over this -->
<button onclick="closeSideNav()" class="tablinks switch-exempt" style="margin: 0px;width: 270px; height: 44px; background-color: var(--lightgray1)">
<i class="fa fa-times fa-2x" style="position: absolute; top: 18px; left: 18px; font-size: 1.3em; color: var(--black);"></i>
Expand Down