Permalink
Browse files

New nav design.

  • Loading branch information...
tomdrever committed Mar 20, 2016
1 parent 8a12133 commit 39c1856c87c50d798c01916682f290f72c94e5e0
Showing with 28 additions and 17 deletions.
  1. +2 −2 _includes/default-nav.html
  2. +11 −6 violet/dist/violet.css
  3. +1 −1 violet/dist/violet.min.css
  4. +14 −8 violet/src/scss/_nav.scss
@@ -1,7 +1,7 @@
<div class="nav bar">
<img class="brand left" src="../assets/img/logo_blue.png" width="225" height="75"></img>
<img class="brand left" src="/assets/img/logo_blue.png" width="225" height="75"></img>

<ul class="right">
<ul>
<li{% if page.section == 'home' %} class="enabled"{% endif %}><a href="/">HOME</a></li>
<li{% if page.section == 'blog' %} class="enabled"{% endif %}><a href="/blog">BLOG</a></li>
<li{% if page.section == 'software' %} class="enabled"{% endif %}><a href="/software">SOFTWARE</a></li>
@@ -1,3 +1,4 @@
@charset "UTF-8";
@import url(https://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,600,700,800,900);
@import url(https://fonts.googleapis.com/css?family=Open+Sans);
html {
@@ -100,25 +101,29 @@ main {
float: left;
margin: 0;
padding: 0; }
.bar .enabled {
border-bottom-color: #40C4FF !important; }
.bar .enabled a {
text-decoration: underline; }
.bar * {
float: left;
margin: 0;
padding: 0; }
.bar ul {
float: right;
padding-top: 0.7em; }
.bar li {
padding: 0.25em 0.8em calc(0.25em - 0.4em) 0.8em;
padding: 0.25em 0 calc(0.25em - 0.4em) 0.4em;
list-style: none;
font-size: x-large;
color: #111111;
font-weight: bold; }
.bar li a {
color: #111111;
text-decoration: none; }
.bar li:first-child {
border-left: none; }
.bar li:not(:last-child):before {
padding-left: 0.4em;
content: ""; }
.bar li:last-child {
border-right: none; }
padding-right: 1.2em; }
.bar li:hover {
border-bottom-color: #40C4FF; }
.bar .brand {

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -8,8 +8,8 @@

//background-color: $colour_navbar_background;

.enabled {
border-bottom-color: $colour_navbar_highlight !important;
.enabled a {
text-decoration: underline;
}

* {
@@ -18,9 +18,14 @@
margin: 0;
padding: 0;
}

ul {
float: right;
padding-top: 0.7em;
}

li {
padding: 0.25em 0.8em calc(0.25em - 0.4em) 0.8em;
padding: 0.25em 0 calc(0.25em - 0.4em) 0.4em;

list-style: none;

@@ -37,13 +42,14 @@

//border-left: 0.01em solid #ccc;
//border-right: 0.01em solid #ccc;

&:first-child {
border-left: none;

&:not(:last-child):before {
padding-left: 0.4em;
content: ""
}

&:last-child {
border-right: none;
padding-right: 1.2em;
}

&:hover {

0 comments on commit 39c1856

Please sign in to comment.