Merge branch 'fix/nav-colors'

admin/static/css/mixin.styl

@@ -1,7 +1,7 @@
 $defaultColor   = #8FB1DD
 $aquaColor      = #91D6DF
 $blueColor      = #BAD0EF
-$greenColor     = #B5E6A8
+$greenColor     = #9BDD89
 $tealColor      = #97BEAD
 $purpleColor    = #B6B4EB
 $brownColor     = #DABB9E
@@ -31,7 +31,7 @@ $color20        = #9EC4DA
 $color21        = #B6B4EB
 $color22        = #DD9DAC
 $color23        = #BAA8E6
-$color24        = #B5E6A8
+$color24        = #9BDD89
 $color25        = #E6D4A8
 $color26        = #E6CBA8
 $color27        = #E6B7A8

site/static/css/setup-theme.styl

@@ -58,17 +58,19 @@ setupTheme($primaryColor = $blueColor, $secondaryColor = $lightGrey, $linkColor
       html.no-touch &:hover
       html.touch &:active
         background: darken($primaryColor, 10%)
+      &.open
+        background: darken($primaryColor, 10%)
     > ul
-      background: $primaryColor
+      background: darken($primaryColor, 10%)
       &:before
-        background: $primaryColor
+        background: darken($primaryColor, 10%)
       > li
         a
           html.no-touch &:hover
           html.touch &:active
-            background: darken($primaryColor, 5%)
+            background: darken($primaryColor, 14%)
           &.active
-            background: darken($primaryColor, 10%)
+            background: darken($primaryColor, 20%)
 
   .doc-nav
     > div
@@ -111,7 +113,7 @@ setupTheme($primaryColor = $blueColor, $secondaryColor = $lightGrey, $linkColor
       border-color: $primaryColor
     .social-icons
       a
-        color: $primaryColor
+        color: darken($primaryColor, 10%)
         html.no-touch &:hover
         html.touch &:active
-          color: darken($primaryColor, 10%)
+          color: darken($primaryColor, 20%)

site/static/css/theme.styl

@@ -72,6 +72,7 @@
 
     &.open
       height: $iconSize+11
+      background: darken($primaryColor, 10%)
 
     span
       display: block
@@ -101,7 +102,8 @@
     list-style-type: none
     padding: 0
     margin: 0
-    background: $primaryColor
+    text-shadow: 0 1px 1px rgba(0,0,0,0.2)
+    background: darken($primaryColor, 10%)
     box-shadow(-4px 4px 0 rgba(0, 0, 0, 0.1))
     overflow-y: scroll
     overflow-x: hidden
@@ -119,10 +121,10 @@
 
         html.no-touch &:hover
         html.touch &:active
-          background: darken($primaryColor, 5%)
+          background: darken($primaryColor, 14%)
 
         &.active
-          background: darken($primaryColor, 10%)
+          background: darken($primaryColor, 20%)
 
         i
           margin-right: 0.5em
@@ -619,12 +621,12 @@ footer
       font-size: 30px
       line-height: 30px
       text-align: center
-      color: $primaryColor
+      color: darken($primaryColor, 10%)
       overflow: hidden
 
       html.no-touch &:hover
       html.touch &:active
-        color: darken($primaryColor, 10%)
+        color: darken($primaryColor, 20%)
 
   .footer-html