_variables.scss in bootstrap-sass-rails-3.0.3.0

- old
+ new

@@ -39,11 +39,11 @@
 // Typography
 // -------------------------
 
 $font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
-$font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace !default;
+$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
 $font-family-base:        $font-family-sans-serif !default;
 
 $font-size-base:          14px !default;
 $font-size-large:         ceil($font-size-base * 1.25) !default; // ~18px
 $font-size-small:         ceil($font-size-base * 0.85) !default; // ~12px
@@ -82,10 +82,13 @@
 $padding-large-horizontal:       16px !default;
 
 $padding-small-vertical:         5px !default;
 $padding-small-horizontal:       10px !default;
 
+$padding-xs-vertical:            1px !default;
+$padding-xs-horizontal:          5px !default;
+
 $line-height-large:              1.33 !default;
 $line-height-small:              1.5 !default;
 
 $border-radius-base:             4px !default;
 $border-radius-large:            6px !default;
@@ -155,11 +158,11 @@
 $input-border-focus:             #66afe9 !default;
 
 $input-color-placeholder:        $gray-light !default;
 
 $input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
-$input-height-large:             (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
+$input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
 $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
 
 $legend-color:                   $gray-dark !default;
 $legend-border-color:            #e5e5e5 !default;
 
@@ -184,13 +187,11 @@
 
 $dropdown-link-disabled-color:   $gray-light !default;
 
 $dropdown-header-color:          $gray-light !default;
 
-$dropdown-caret-color:           #000 !default;
 
-
 // COMPONENT VARIABLES
 // --------------------------------------------------
 
 
 // Z-index master list
@@ -244,12 +245,17 @@
 
 // Number of columns in the grid system
 $grid-columns:              12 !default;
 // Padding, to be divided by two and applied to the left and right of all columns
 $grid-gutter-width:         30px !default;
-// Point at which the navbar stops collapsing
+
+// Navbar collapse
+
+// Point at which the navbar becomes uncollapsed
 $grid-float-breakpoint:     $screen-sm-min !default;
+// Point at which the navbar begins collapsing
+$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
 
 
 // Navbar
 // -------------------------
 
@@ -319,11 +325,10 @@
 
 $nav-disabled-link-color:                   $gray-light !default;
 $nav-disabled-link-hover-color:             $gray-light !default;
 
 $nav-open-link-hover-color:                 #fff !default;
-$nav-open-caret-border-color:               #fff !default;
 
 // Tabs
 $nav-tabs-border-color:                     #ddd !default;
 
 $nav-tabs-link-hover-border-color:          $gray-lighter !default;
@@ -373,22 +378,22 @@
 
 
 // Form states and alerts
 // -------------------------
 
-$state-success-text:             #468847 !default;
+$state-success-text:             #3c763d !default;
 $state-success-bg:               #dff0d8 !default;
 $state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%) !default;
 
-$state-info-text:                #3a87ad !default;
+$state-info-text:                #31708f !default;
 $state-info-bg:                  #d9edf7 !default;
 $state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !default;
 
-$state-warning-text:             #c09853 !default;
+$state-warning-text:             #8a6d3b !default;
 $state-warning-bg:               #fcf8e3 !default;
 $state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
 
-$state-danger-text:              #b94a48 !default;
+$state-danger-text:              #a94442 !default;
 $state-danger-bg:                #f2dede !default;
 $state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
 
 
 // Tooltips