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

updates color, adds image + small nav refactor #48

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

updates color, adds image + small nav refactor #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Empty file modified filelist.sh
100755 → 100644
View file
Open in desktop
Empty file.
37 changes: 23 additions & 14 deletions pages/bigoil.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,30 @@
<body>
<!-- Navbar -->
<div class="navbar">
<a href="#" data-lang="system.name">PD2 Builder</a>
<button>
<span></span>
</button>
<div class="navbar-dropdown">
<div>
<select name="language" id="langDrop"></select>
</div>
<div>
<a href="." data-lang="system.home">Home</a>
<div class="navbar-inner">
<div class="navbar-inner--left">
<img src="../img/header.png" />
<a href="#">
PD2Builder
</a>
</div>
<div class="navbar-inner--right">
<button>
<span></span>
</button>
<div class="navbar-dropdown">
<div>
<select name="language" id="langDrop"></select>
</div>
<div>
<a class="current" href="#" data-lang="system.home">Home</a>
</div>
<div>
<a href="bigoil.html" data-lang="system.bigoil">Big Oil Engine Calc</a>
</div>
</div>
</div>
</div>
<div>
<a class="current" href="#" data-lang="system.bigoil">Big Oil Engine Calc</a>
</div>
</div>
</div>

<!-- Big Oil Engine Calculator -->
Expand Down
37 changes: 23 additions & 14 deletions pages/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,30 @@
<body>
<!-- Navbar -->
<div class="navbar">
<a href="#" data-lang="system.name">PD2 Builder</a>
<button>
<span></span>
</button>
<div class="navbar-dropdown">
<div>
<select name="language" id="langDrop"></select>
</div>
<div>
<a class="current" href="#" data-lang="system.home">Home</a>
</div>
<div>
<a href="bigoil.html" data-lang="system.bigoil">Big Oil Engine Calc</a>
<div class="navbar-inner">
<div class="navbar-inner--left">
<img src="../img/header.png" />
<a href="#">
PD2Builder
</a>
</div>
<div class="navbar-inner--right">
<button>
<span></span>
</button>
<div class="navbar-dropdown">
<div>
<select name="language" id="langDrop"></select>
</div>
<div>
<a class="current" href="#" data-lang="system.home">Home</a>
</div>
<div>
<a href="bigoil.html" data-lang="system.bigoil">Big Oil Engine Calc</a>
</div>
</div>
</div>
</div>
</div>
</div>

<div id="loading_spinner">
Expand Down
49 changes: 43 additions & 6 deletions public/css/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ div.navbar {
display: flex;
flex-flow: row nowrap;
align-items: center;

max-height: 60px;

justify-content: flex-start;
padding: 0 16px;
font-family: "Noto Sans", sans-serif;

background-color: rgb(50, 55, 60);
padding: 1vh 3vw;
background-color: rgb(0, 2, 24);
border-bottom: 1px solid rgba(255, 255, 255, 0.2);
box-shadow: 0px 2px 2px 2px rgba(86, 100, 125, 0.2);
}

@media only screen and (max-width: 1002px) {
Expand All @@ -83,6 +83,12 @@ div.navbar {
}
}

div.navbar img {
object-fit: contain;
margin-right: 24px;
position: relative;
}

div.navbar a {
font-size: min(1.1em, 24px);
line-height: 2em;
Expand All @@ -100,7 +106,11 @@ div.navbar a:visited {
}

/* Small screens, have navbar collapse */
@media only screen and (max-width: 767px) {
@media only screen and (max-width: 767px) {
div.navbar {
padding: 0px 16px;
}

div.navbar button {
height: 80%;
margin: auto 0;
Expand All @@ -112,6 +122,10 @@ div.navbar a:visited {
border-radius: 5px;
cursor: pointer;
}

div.navbar img {
display: none;
}

div.navbar button > span {
display: inline-block;
Expand Down Expand Up @@ -171,6 +185,25 @@ div.navbar a:visited {
div.navbar .navbar-dropdown > div:not(:last-of-type) {
margin-right: 25px;
}

div.navbar .navbar-inner {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24px;
width: 100%;
}

div.navbar .navbar-inner > .navbar-inner--left {
display: flex;
align-items: center;
}


div.navbar .navbar-inner > .navbar-inner--right {
margin-right: 16px;
}

}

div.navbar .navbar-dropdown > div {
Expand All @@ -186,6 +219,10 @@ div.navbar .navbar-dropdown a {
font-size: min(0.8em, 20px);
}

div.navbar .current {
border-bottom: 2px solid #297EB7;
}

div.navbar .navbar-dropdown a:not(.current) {
color: rgba(240, 240, 240, 0.5);
}
Expand Down
Binary file added public/img/header.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.