diff options
Diffstat (limited to 'cyborg/variables.less')
| -rw-r--r-- | cyborg/variables.less | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/cyborg/variables.less b/cyborg/variables.less index cc240a0a..71a77820 100644 --- a/cyborg/variables.less +++ b/cyborg/variables.less @@ -41,7 +41,7 @@ @font-family-sans-serif: "Droid Sans", "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: @gray-dark; @@ -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: @gray-darker; -@nav-open-caret-border-color: #fff; // Tabs @nav-tabs-border-color: @gray-dark; |