fixes thomaspark#182, updates all variables.less files for 3.0.3

jiangxianfu · Dec 11, 2013 · bbe67be · bbe67be
1 parent 1485550
commit bbe67be
Show file tree

Hide file tree

Showing 39 changed files with 304 additions and 239 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
@@ -761,7 +761,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
 code {
@@ -2145,16 +2145,16 @@ textarea.input-sm {
 }
 
 .input-lg {
-  height: 56px;
+  height: 54px;
   padding: 14px 16px;
   font-size: 18px;
   line-height: 1.33;
   border-radius: 6px;
 }
 
 select.input-lg {
-  height: 56px;
-  line-height: 56px;
+  height: 54px;
+  line-height: 54px;
 }
 
 textarea.input-lg {
@@ -4094,7 +4094,7 @@ input[type="button"].btn-block {
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
 .input-group-lg > .input-group-btn > .btn {
-  height: 56px;
+  height: 54px;
   padding: 14px 16px;
   font-size: 18px;
   line-height: 1.33;
@@ -4104,8 +4104,8 @@ input[type="button"].btn-block {
 select.input-group-lg > .form-control,
 select.input-group-lg > .input-group-addon,
 select.input-group-lg > .input-group-btn > .btn {
-  height: 56px;
-  line-height: 56px;
+  height: 54px;
+  line-height: 54px;
 }
 
 textarea.input-group-lg > .form-control,

diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
diff --git a/amelia/variables.less b/amelia/variables.less
@@ -41,7 +41,7 @@
 
 @font-family-sans-serif:  "Cabin", Arial, sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
-@font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
 @font-size-base:          14px;
@@ -84,6 +84,9 @@
 @padding-small-vertical:         5px;
 @padding-small-horizontal:       10px;
 
+@padding-xs-vertical:            1px;
+@padding-xs-horizontal:          5px;
+
 @line-height-large:              1.33;
 @line-height-small:              1.5;
 
@@ -157,8 +160,8 @@
 @input-color-placeholder:        @gray-light;
 
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large:             (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
-@input-height-small:             (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
 
 @legend-color:                   @text-color;
 @legend-border-color:            darken(@body-bg, 5%);
@@ -186,8 +189,6 @@
 
 @dropdown-header-color:          @gray-lighter;
 
-@dropdown-caret-color:           #fff;
-
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -246,8 +247,13 @@
 @grid-columns:              12;
 // Padding, to be divided by two and applied to the left and right of all columns
 @grid-gutter-width:         30px;
-// Point at which the navbar stops collapsing
+
+// Navbar collapse
+
+// Point at which the navbar becomes uncollapsed
 @grid-float-breakpoint:     @screen-sm-min;
+// Point at which the navbar begins collapsing
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
 
 
 // Navbar
@@ -321,7 +327,6 @@
 @nav-disabled-link-hover-color:             @gray-lighter;
 
 @nav-open-link-hover-color:                 @nav-link-hover-bg;
-@nav-open-caret-border-color:               @nav-link-hover-bg;
 
 // Tabs
 @nav-tabs-border-color:                     @nav-link-hover-bg;

diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css
@@ -759,7 +759,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
 code {
@@ -2143,16 +2143,16 @@ textarea.input-sm {
 }
 
 .input-lg {
-  height: 56px;
+  height: 54px;
   padding: 14px 16px;
   font-size: 18px;
   line-height: 1.33;
   border-radius: 6px;
 }
 
 select.input-lg {
-  height: 56px;
-  line-height: 56px;
+  height: 54px;
+  line-height: 54px;
 }
 
 textarea.input-lg {
@@ -4092,7 +4092,7 @@ input[type="button"].btn-block {
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
 .input-group-lg > .input-group-btn > .btn {
-  height: 56px;
+  height: 54px;
   padding: 14px 16px;
   font-size: 18px;
   line-height: 1.33;
@@ -4102,8 +4102,8 @@ input[type="button"].btn-block {
 select.input-group-lg > .form-control,
 select.input-group-lg > .input-group-addon,
 select.input-group-lg > .input-group-btn > .btn {
-  height: 56px;
-  line-height: 56px;
+  height: 54px;
+  line-height: 54px;
 }
 
 textarea.input-group-lg > .form-control,

diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css
diff --git a/cerulean/variables.less b/cerulean/variables.less
@@ -41,7 +41,7 @@
 
 @font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
-@font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
 @font-size-base:          14px;
@@ -84,6 +84,9 @@
 @padding-small-vertical:         5px;
 @padding-small-horizontal:       10px;
 
+@padding-xs-vertical:            1px;
+@padding-xs-horizontal:          5px;
+
 @line-height-large:              1.33;
 @line-height-small:              1.5;
 
@@ -157,8 +160,8 @@
 @input-color-placeholder:        @gray-light;
 
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large:             (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
-@input-height-small:             (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
 
 @legend-color:                   @text-color;
 @legend-border-color:            #e5e5e5;
@@ -186,8 +189,6 @@
 
 @dropdown-header-color:          @text-muted;
 
-@dropdown-caret-color:           #fff;
-
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -246,8 +247,13 @@
 @grid-columns:              12;
 // Padding, to be divided by two and applied to the left and right of all columns
 @grid-gutter-width:         30px;
-// Point at which the navbar stops collapsing
+
+// Navbar collapse
+
+// Point at which the navbar becomes uncollapsed
 @grid-float-breakpoint:     @screen-sm-min;
+// Point at which the navbar begins collapsing
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
 
 
 // Navbar
@@ -321,7 +327,6 @@
 @nav-disabled-link-hover-color:             @gray-light;
 
 @nav-open-link-hover-color:                 #fff;
-@nav-open-caret-border-color:               #fff;
 
 // Tabs
 @nav-tabs-border-color:                     #ddd;

diff --git a/cosmo/bootstrap.css b/cosmo/bootstrap.css
@@ -761,7 +761,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
 code {
@@ -2145,16 +2145,16 @@ textarea.input-sm {
 }
 
 .input-lg {
-  height: 66px;
+  height: 64px;
   padding: 18px 30px;
   font-size: 19px;
   line-height: 1.33;
   border-radius: 0;
 }
 
 select.input-lg {
-  height: 66px;
-  line-height: 66px;
+  height: 64px;
+  line-height: 64px;
 }
 
 textarea.input-lg {
@@ -4094,7 +4094,7 @@ input[type="button"].btn-block {
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
 .input-group-lg > .input-group-btn > .btn {
-  height: 66px;
+  height: 64px;
   padding: 18px 30px;
   font-size: 19px;
   line-height: 1.33;
@@ -4104,8 +4104,8 @@ input[type="button"].btn-block {
 select.input-group-lg > .form-control,
 select.input-group-lg > .input-group-addon,
 select.input-group-lg > .input-group-btn > .btn {
-  height: 66px;
-  line-height: 66px;
+  height: 64px;
+  line-height: 64px;
 }
 
 textarea.input-group-lg > .form-control,

diff --git a/cosmo/bootstrap.min.css b/cosmo/bootstrap.min.css
diff --git a/cosmo/variables.less b/cosmo/variables.less
@@ -41,7 +41,7 @@
 
 @font-family-sans-serif:  "Open Sans", Calibri, Candara, Arial, sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
-@font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
 @font-size-base:          15px;
@@ -84,6 +84,9 @@
 @padding-small-vertical:         5px;
 @padding-small-horizontal:       10px;
 
+@padding-xs-vertical:            1px;
+@padding-xs-horizontal:          5px;
+
 @line-height-large:              1.33;
 @line-height-small:              1.5;
 
@@ -157,8 +160,8 @@
 @input-color-placeholder:        @gray-light;
 
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
-@input-height-large:             (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
-@input-height-small:             (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
 
 @legend-color:                   @text-color;
 @legend-border-color:            #e5e5e5;
@@ -186,8 +189,6 @@
 
 @dropdown-header-color:          @text-muted;
 
-@dropdown-caret-color:           #000;
-
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -246,8 +247,13 @@
 @grid-columns:              12;
 // Padding, to be divided by two and applied to the left and right of all columns
 @grid-gutter-width:         30px;
-// Point at which the navbar stops collapsing
+
+// Navbar collapse
+
+// Point at which the navbar becomes uncollapsed
 @grid-float-breakpoint:     @screen-sm-min;
+// Point at which the navbar begins collapsing
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
 
 
 // Navbar
@@ -321,7 +327,6 @@
 @nav-disabled-link-hover-color:             @gray-light;
 
 @nav-open-link-hover-color:                 #fff;
-@nav-open-caret-border-color:               #fff;
 
 // Tabs
 @nav-tabs-border-color:                     #ddd;