Merge pull request #226 from IKavanagh/master

Separated some sass variables

sass/_theme_layout.sass

@@ -34,7 +34,7 @@
     font-weight: bold
     text-transform: uppercase
     font-size: 80%
-    color: $gray
+    color: $menu-color
     white-space: nowrap
 
   ul
@@ -45,13 +45,13 @@
     &.divide-bottom
       border-bottom: solid 1px hsl(0, 0%, 25%)
     &.current
-      background: darken($section-background-color, 10%)
+      background: darken($menu-vertical-background-color, 10%)
       a
-        color: $text-medium
+        color: $menu-link-medium
-        border-right: solid 1px darken($section-background-color, 20%)
+        border-right: solid 1px darken($menu-vertical-background-color, 20%)
         padding: $gutter / 4 $gutter * 1.5
         &:hover
-          background: darken($section-background-color, 15%)
+          background: darken($menu-vertical-background-color, 15%)
     code
       border: none
       background: inherit
@@ -67,31 +67,31 @@
       @extend .fa-plus-square-o
       font-size: .8em
       line-height: 1.6em
-      color: darken($text-medium, 20%)
+      color: darken($menu-link-medium, 20%)
 
   // On state for the first level
   li.on a, li.current > a
-    color: $text-color
+    color: $menu-link-color
     padding: $gutter / 4 $gutter
     font-weight: bold
     position: relative
-    background: $section-background-color
+    background: $menu-vertical-background-color
     border: none
-    border-bottom: solid 1px darken($section-background-color, 20%)
+    border-bottom: solid 1px darken($menu-vertical-background-color, 20%)
-    border-top: solid 1px darken($section-background-color, 20%)
+    border-top: solid 1px darken($menu-vertical-background-color, 20%)
     padding-left: $gutter -4px
     +font-smooth
     &:hover
-      background: $section-background-color
+      background: $menu-vertical-background-color
       span.toctree-expand
-        color: $text-medium
+        color: $menu-link-medium
     span.toctree-expand
       @extend .fa
       @extend .fa-minus-square-o
       display: block
       font-size: .8em
       line-height: 1.6em
-      color: darken($text-medium, 30%)
+      color: darken($menu-link-medium, 30%)
 
   // This is the on state for pages beyond second level
   li.toctree-l1.current li.toctree-l2, li.toctree-l2.current li.toctree-l3
@@ -102,32 +102,32 @@
   li.toctree-l2
     &.current
       > a
-        background: darken($section-background-color, 20%)
+        background: darken($menu-vertical-background-color, 20%)
         padding: $gutter / 4 $gutter * 1.5
       li.toctree-l3 > a
         display: block
-        background: darken($section-background-color, 20%)
+        background: darken($menu-vertical-background-color, 20%)
         padding: $gutter / 4 $gutter * 2.5
     a:hover span.toctree-expand
-      color: $text-medium
+      color: $menu-link-medium
     span.toctree-expand
-      color: darken($section-background-color, 35%)
+      color: darken($menu-vertical-background-color, 35%)
   li.toctree-l3
     font-size: .9em
     &.current
       > a
-        background: darken($section-background-color, 25%)
+        background: darken($menu-vertical-background-color, 25%)
         padding: $gutter / 4 $gutter * 2.5
       li.toctree-l4 > a
         display: block
-        background: darken($section-background-color, 25%)
+        background: darken($menu-vertical-background-color, 25%)
         padding: $gutter / 4 $gutter * 3.5
         border-top: none
         border-bottom: none
     a:hover span.toctree-expand
-      color: $text-medium
+      color: $menu-link-medium
     span.toctree-expand
-      color: darken($section-background-color, 40%)
+      color: darken($menu-vertical-background-color, 40%)
   li.toctree-l4
     font-size: .9em
 
@@ -141,7 +141,7 @@
       display: block
   li ul li a
     margin-bottom: 0
-    color: $text-light
+    color: $menu-link-light
     font-weight: normal
   a
     display: inline-block
@@ -150,26 +150,26 @@
     display: block
     position: relative
     font-size: 90%
-    color: $text-light
+    color: $menu-link-light
     &:hover
       background-color: lighten($menu-background-color, 10%)
       cursor: pointer
       span.toctree-expand
-        color: $text-light
+        color: $menu-link-light
     &:active
       background-color: $menu-logo-color
       cursor: pointer
-      color: $white
+      color: $menu-link-active
       span.toctree-expand
-        color: $white
+        color: $menu-link-active
 
 .wy-side-nav-search
   z-index: $z-index-popover
-  background-color: $link-color
+  background-color: $nav-search-background-color
   text-align: center
   padding: $gutter / 2
   display: block
-  color: $section-background-color
+  color: $nav-search-color
   margin-bottom: $gutter / 2
   input[type=text]
     width: 100%
@@ -185,7 +185,7 @@
     padding: 5px
     border-radius: 100%
   > a, .wy-dropdown > a
-    color: $section-background-color
+    color: $nav-search-color
     font-size: 100%
     font-weight: bold
     display: inline-block
@@ -261,7 +261,7 @@
   overflow-x: hidden
   overflow-y: scroll
   min-height: 100%
-  background: $menu-background-color
+  background: $nav-background-color
   z-index: $z-index-popover
 
 .wy-nav-top
@@ -311,7 +311,7 @@
   &.on
     display: block
 footer
-  color: $gray-light
+  color: $footer-color
   p
     margin-bottom: $base-line-height / 2
   span.commit code
@@ -320,7 +320,7 @@ footer
     font-size: 1em
     background: none
     border: none
-    color: $gray-light
+    color: $footer-color
 
 .rst-footer-buttons
   +clearfix

sass/_theme_rst.sass

@@ -124,8 +124,8 @@
     display: block
     margin: 0 0 $base-line-height $base-line-height
     padding: $base-line-height
-    background: $table-stripe-color
+    background: $sidebar-background-color
-    border: solid 1px $table-border-color
+    border: solid 1px $sidebar-border-color
     // Sidebar content is usually less relevant, so adjust the margins and sizes.
     p, ul, dl
       font-size: 90%
@@ -142,7 +142,7 @@
       font-size: 100%
   // Sphinx can highlight searched text with ?highlighted=searchterm
   .highlighted
-    background: $yellow
+    background: $highlight-color
     display: inline-block
     font-weight: bold
     padding: 0 $base-line-height / 4
@@ -203,7 +203,7 @@
       color: $text-code-color
     &.xref, a &
       font-weight: bold
-      color: $text-color
+      color: $text-codexref-color
   // If the literal is inside an a tag, let's color it like a link
   a tt, a code
     color: $link-color
@@ -230,13 +230,13 @@
       margin: $base-line-height / 4 0
       font-size: 90%
       line-height: normal
-      background: lighten($blue, 50%)
+      background: lighten($class-color, 50%)
-      color: $blue
+      color: $class-color
-      border-top: solid 3px lighten($blue, 20%)
+      border-top: solid 3px lighten($class-color, 20%)
       padding: $base-line-height / 4
       position: relative
       &:before
-        color: lighten($blue, 20%)
+        color: lighten($class-color, 20%)
       .headerlink
         color: $text-color
         font-size: 100% !important
@@ -246,9 +246,9 @@
       border: none
       border-left: solid 3px hsl(0,0%,80%)
       background: hsl(0,0%,94%)
-      color: $text-medium
+      color: $method-color
       .headerlink
-        color: $text-color
+        color: $headerlink-color
         font-size: 100% !important
     dt:first-child
       margin-top: 0
@@ -274,7 +274,7 @@
   // Doc links to sourcecode
   .viewcode-link, .viewcode-back
     display: inline-block
-    color: $green
+    color: $text-viewcode-color
     font-size: 80%
     padding-left: $base-line-height
   .viewcode-back

sass/_theme_variables.sass

@@ -6,6 +6,53 @@ $font-awesome-dir:                    "../font/"
 $static-img:                          "../img/"
 $mathjax-color:                       $text-color
 
+$headerlink-color:                    $text-color
+
+// Code colors
+$text-viewcode-color:                 $green
+$text-codexref-color:                 $text-color
+
+// Definition list colors
+$class-color:                         $blue
+$method-color:                        $gray
+
+// Footer colors
+$footer-color:                        $gray-light
+
+// Menu colors
+$menu-vertical-background-color:      $section-background-color
+
+// Menu text colors
+$menu-color:                          $gray
+$menu-dark:                           lighten($menu-color,15%) !default
+$menu-medium:                         lighten($menu-color,25%) !default
+$menu-light:                          lighten($menu-color,45%) !default
+$menu-lighter:                        lighten($menu-color,60%) !default
+
+// Menu link colors
+$menu-link-color:                     $text-color
+$menu-link-dark:                      $text-dark
+$menu-link-medium:                    $text-medium
+$menu-link-light:                     $text-light
+$menu-link-active:                    $white
+
+// Navigation colors
+$nav-background-color:                $menu-background-color
+$nav-search-background-color:         $blue
+$nav-search-color:                    $section-background-color
+$nav-link-color:                      $blue
+$nav-link-color-visited:              $purple
+$nav-link-color-hover:                lighten($nav-link-color, 6%) !default
+$nav-link-color-alt:                  hsl(33, 100%, 51%)
+
+// Sidebar colors
+$sidebar-background-color:            $table-stripe-color
+$sidebar-border-color:                $table-border-color
+$sidebar-title-background-color:      $table-border-color
+
+// Sphinx highlight color
+$highlight-color:                     $yellow
+
 $base-font-family:                    "Lato", "proxima-nova", "Helvetica Neue", Arial, sans-serif
 $custom-font-family:                  "Roboto Slab", "ff-tisa-web-pro", "Georgia", Arial, sans-serif
 $custom-font-family2:                 Georgia, serif

sphinx_rtd_theme/static/css/badge_only.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
 "names": [],
 "file": "badge_only.css"