summaryrefslogtreecommitdiff
path: root/cosmo/variables.less
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.me>2013-12-11 14:04:56 -0500
committerThomas Park <thomas@thomaspark.me>2013-12-11 14:04:56 -0500
commitbbe67be6ca5acc2e8416947d457aa9a06ecb0471 (patch)
tree07717ab58270d7765e57d47466f146dc46808448 /cosmo/variables.less
parent14855508fb5d2a6219ea7dc0c9665a916719a7be (diff)
fixes #182, updates all variables.less files for 3.0.3
Diffstat (limited to 'cosmo/variables.less')
-rw-r--r--cosmo/variables.less19
1 files changed, 12 insertions, 7 deletions
diff --git a/cosmo/variables.less b/cosmo/variables.less
index 8cded27c..3c7caba7 100644
--- 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;