Merge branch 'development' of Halftone/halftone into master

2016-11-18 13:09:29 -05:00 · 2016-11-18 13:09:29 -05:00 · bef882bd08
commit bef882bd08
parent acf99c5b57 6af63f4bdb
2 changed files with 6 additions and 1 deletions
--- a/assets/sass/partials/_navigation.sass
+++ b/assets/sass/partials/_navigation.sass
@ -64,3 +64,8 @@
      border-radius: 5px
      border: 1px solid #212121
      box-shadow: inset 0 0 6px #212121
+
+    ul
+      .nav_item
+        display: block
+        padding: 5px
--- a/public/css/main.css
+++ b/public/css/main.css