Skip to content

Commit 903d192

Browse files
committed
Fixed navbar-active state to work again, changed nav items to not be uppercase anymore and refined the spacing and sizing between them, fixed logo alignment in lefthand corner to be vertically centered at all times
1 parent 9d1dd37 commit 903d192

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

_includes/header.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span class="icon-bar"></span>
1111
</button>
1212
<a class="navbar-brand" href="{{site.baseurl}}/index.html">
13-
<img src="{{site.baseurl}}/assets/nav_logo.svg" style="height:45px;" alt="Jupyter logo">
13+
<img class="navbar-logo" src="{{site.baseurl}}/assets/nav_logo.svg" alt="Jupyter logo">
1414
</a>
1515
</div>
1616
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -19,18 +19,18 @@
1919
{% for nav in site.data.nav.head %}
2020
{% if nav.url %}
2121
<li>
22-
<a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank">{{nav.title | upcase}}</a>
22+
<a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank">{{nav.title}}</a>
2323
</li>
2424
{% else %}
2525
{% for targetpage in site.pages %}
2626
{% if nav contains targetpage.title%}
2727
{% if page.title == targetpage.title %}
2828
<li>
29-
<a href class="tab navbar-active">{{targetpage.title| upcase}}</a>
29+
<a href class="tab navbar-active">{{targetpage.title}}</a>
3030
</li>
3131
{% else %}
3232
<li>
33-
<a href="{{site.baseurl}}{{targetpage.url}}" class="tab">{{targetpage.title| upcase}}</a>
33+
<a href="{{site.baseurl}}{{targetpage.url}}" class="tab">{{targetpage.title}}</a>
3434
</li>
3535
{% endif %}
3636
{% endif %}

css/logo-nav.css

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ body {
2020
color: black;
2121
}
2222
.navbar-fixed-top .navbar-brand {
23-
margin-top: 5px;
2423
padding: 0 15px;
2524
}
2625
.navbar-header .icon-bar {
2726
background-color: black;
2827
}
29-
.navbar-active {
28+
.navbar-nav > li > .navbar-active {
3029
color: #E46E2E;
3130
}
3231
.navbar-scroll {
@@ -36,8 +35,12 @@ body {
3635
-webkit-box-shadow: 1px 1px 1px #999;
3736
box-shadow: 1px 1px 1px #999;
3837
}
38+
.navbar-logo {
39+
height: 45px;
40+
}
3941
.nav > li > a {
40-
padding: 15px 13px 10px;
42+
font-size: 16px;
43+
padding: 12px 16px 10px;
4144
}
4245
.nav > li > a:hover {
4346
background-color: transparent;
@@ -736,6 +739,10 @@ body {
736739
.navbar-toggle {
737740
padding-top: 10px;
738741
}
742+
.navbar-logo {
743+
height: 40px;
744+
margin-top: 6px;
745+
}
739746
.companies li {
740747
width: 30%;
741748
}

0 commit comments

Comments
 (0)