[WIP #64] Support bootstrap 3.2.0 / Cerulean

maxim · Jul 12, 2014 · 2223d66 · 2223d66
1 parent 25530cc
commit 2223d66
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 46 deletions.
diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_bootswatch.scss
@@ -15,28 +15,28 @@
   filter: none;
   @include box-shadow(0 1px 10px rgba(0, 0, 0, 0.1));
 
-  .navbar-default {
-
-    .badge {
-      background-color: #fff;
-      color: $navbar-default-bg;
-    }
+  .navbar-nav > li > a,
+  .navbar-brand {
+    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
   }
+}
 
-  .navbar-inverse {
-    @include gradient-vertical-three-colors(lighten($navbar-inverse-bg, 8%), lighten($navbar-inverse-bg, 4%), 60%, darken($navbar-inverse-bg, 2%));
-    filter: none;
-    border-bottom: 1px solid darken($navbar-inverse-bg, 10%);
+.navbar-default {
 
-    .badge {
-      background-color: #fff;
-      color: $navbar-inverse-bg;
-    }
+  .badge {
+    background-color: #fff;
+    color: $navbar-default-bg;
   }
+}
 
-  .navbar-nav > li > a,
-  .navbar-brand {
-    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+.navbar-inverse {
+  @include gradient-vertical-three-colors(lighten($navbar-inverse-bg, 8%), lighten($navbar-inverse-bg, 4%), 60%, darken($navbar-inverse-bg, 2%));
+  filter: none;
+  border-bottom: 1px solid darken($navbar-inverse-bg, 10%);
+
+  .badge {
+    background-color: #fff;
+    color: $navbar-inverse-bg;
   }
 }
 
@@ -62,7 +62,7 @@
 }
 
 .btn-default {
-  
+
   @include btn-shadow($btn-default-bg);
 
   &:hover {

diff --git a/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss b/vendor/assets/stylesheets/bootswatch/cerulean/_variables.scss
@@ -79,6 +79,31 @@ $icon-font-name:          "glyphicons-halflings-regular" !default;
 $icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 
 
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+$component-offset-horizontal: 180px !default;
+//** Text muted color
+$text-muted:                  $gray-light !default;
+//** Abbreviations and acronyms border color
+$abbr-border-color:           $gray-light !default;
+//** Headings small color
+$headings-small-color:        $gray-light !default;
+//** Blockquote small color
+$blockquote-small-color:      $gray-light !default;
+//** Blockquote font size
+$blockquote-font-size:        ($font-size-base * 1.25) !default;
+//** Blockquote border color
+$blockquote-border-color:     $gray-lighter !default;
+//** Page header border color
+$page-header-border-color:    $gray-lighter !default;
+//** Width of horizontal description list titles
+$dl-horizontal-offset:        $component-offset-horizontal !default;
+//** Horizontal line color.
+$hr-border:                   $gray-lighter !default;
+
 //== Components
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@@ -221,13 +246,13 @@ $dropdown-divider-bg:            #e5e5e5 !default;
 $dropdown-link-color:            $gray-dark !default;
 //** Hover color for dropdown links.
 $dropdown-link-hover-color:      #fff !default;
+//** Active dropdown menu item background color.
+$dropdown-link-active-bg:        $component-active-bg !default;
 //** Hover background for dropdown links.
 $dropdown-link-hover-bg:         $dropdown-link-active-bg !default;
 
 //** Active dropdown menu item text color.
 $dropdown-link-active-color:     #fff !default;
-//** Active dropdown menu item background color.
-$dropdown-link-active-bg:        $component-active-bg !default;
 
 //** Disabled dropdown menu item background color.
 $dropdown-link-disabled-color:   $text-muted !default;
@@ -817,29 +842,3 @@ $pre-border-color:            #ccc !default;
 $pre-scrollable-max-height:   340px !default;
 
 
-//== Type
-//
-//##
-
-//** Horizontal offset for forms and lists.
-$component-offset-horizontal: 180px !default;
-//** Text muted color
-$text-muted:                  $gray-light !default;
-//** Abbreviations and acronyms border color
-$abbr-border-color:           $gray-light !default;
-//** Headings small color
-$headings-small-color:        $gray-light !default;
-//** Blockquote small color
-$blockquote-small-color:      $gray-light !default;
-//** Blockquote font size
-$blockquote-font-size:        ($font-size-base * 1.25) !default;
-//** Blockquote border color
-$blockquote-border-color:     $gray-lighter !default;
-//** Page header border color
-$page-header-border-color:    $gray-lighter !default;
-//** Width of horizontal description list titles
-$dl-horizontal-offset:        $component-offset-horizontal !default;
-//** Horizontal line color.
-$hr-border:                   $gray-lighter !default;
-
-