diff options
| author | Thomas Park <thomas@thomaspark.me> | 2014-06-27 01:07:56 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2014-06-27 01:07:56 -0400 |
| commit | f3189e26cff5142e200568a81ef3db608530cc6f (patch) | |
| tree | 00efe6915ac2ca82e175dbdcb15085b2e90c5ca6 /flatly/variables.less | |
| parent | 25f107274a4a05e2be8d1c0a7ae77c19f8da5fa9 (diff) | |
3.1.1 -> 3.2.0
Diffstat (limited to 'flatly/variables.less')
| -rw-r--r-- | flatly/variables.less | 61 |
1 files changed, 39 insertions, 22 deletions
diff --git a/flatly/variables.less b/flatly/variables.less index 22f9996d..69bca3aa 100644 --- a/flatly/variables.less +++ b/flatly/variables.less @@ -1,4 +1,4 @@ -// Flatly 3.1.1 +// Flatly 3.2.0 // Variables // -------------------------------------------------- @@ -22,7 +22,7 @@ //== Scaffolding // -// ## Settings for some of the most global styles. +//## Settings for some of the most global styles. //** Background color for `<body>`. @body-bg: #fff; @@ -68,14 +68,18 @@ @headings-color: inherit; -//-- Iconography +//== Iconography // -//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//** Load fonts from this directory. @icon-font-path: "../fonts/"; +//** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; +//** Element ID within SVG icon file. @icon-font-svg-id: "glyphicons_halflingsregular"; + //== Components // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). @@ -232,7 +236,7 @@ //** Text color for headers within dropdown menus. @dropdown-header-color: @text-muted; -// Note: Deprecated @dropdown-caret-color as of v3.1.0 +//** Deprecated `@dropdown-caret-color` as of v3.1.0 @dropdown-caret-color: #000; @@ -245,8 +249,8 @@ @zindex-navbar: 1000; @zindex-dropdown: 1000; -@zindex-popover: 1010; -@zindex-tooltip: 1030; +@zindex-popover: 1060; +@zindex-tooltip: 1070; @zindex-navbar-fixed: 1030; @zindex-modal-background: 1040; @zindex-modal: 1050; @@ -257,27 +261,32 @@ //## Define the breakpoints at which your layout will change, adapting to different screen sizes. // Extra small screen / phone -// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1 +//** Deprecated `@screen-xs` as of v3.0.1 @screen-xs: 480px; +//** Deprecated `@screen-xs-min` as of v3.2.0 @screen-xs-min: @screen-xs; +//** Deprecated `@screen-phone` as of v3.0.1 @screen-phone: @screen-xs-min; // Small screen / tablet -// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1 +//** Deprecated `@screen-sm` as of v3.0.1 @screen-sm: 768px; @screen-sm-min: @screen-sm; +//** Deprecated `@screen-tablet` as of v3.0.1 @screen-tablet: @screen-sm-min; // Medium screen / desktop -// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1 +//** Deprecated `@screen-md` as of v3.0.1 @screen-md: 992px; @screen-md-min: @screen-md; +//** Deprecated `@screen-desktop` as of v3.0.1 @screen-desktop: @screen-md-min; // Large screen / wide desktop -// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1 +//** Deprecated `@screen-lg` as of v3.0.1 @screen-lg: 1200px; @screen-lg-min: @screen-lg; +//** Deprecated `@screen-lg-desktop` as of v3.0.1 @screen-lg-desktop: @screen-lg-min; // So media queries don't overlap when required, provide a maximum @@ -643,17 +652,26 @@ //** List group border radius @list-group-border-radius: @border-radius-base; -//** Background color of single list elements on hover +//** Background color of single list items on hover @list-group-hover-bg: @gray-lighter; -//** Text color of active list elements +//** Text color of active list items @list-group-active-color: @component-active-color; -//** Background color of active list elements +//** Background color of active list items @list-group-active-bg: @component-active-bg; //** Border color of active list elements @list-group-active-border: @list-group-active-bg; +//** Text color for content within active list items @list-group-active-text-color: lighten(@list-group-active-bg, 40%); +//** Text color of disabled list items +@list-group-disabled-color: @gray-light; +//** Background color of disabled list items +@list-group-disabled-bg: @gray-lighter; +//** Text color for content within disabled list items +@list-group-disabled-text-color: @list-group-disabled-color; + @list-group-link-color: #555; +@list-group-link-hover-color: @list-group-link-color; @list-group-link-heading-color: #333; @@ -663,6 +681,8 @@ @panel-bg: #fff; @panel-body-padding: 15px; +@panel-heading-padding: 10px 15px; +@panel-footer-padding: @panel-heading-padding; @panel-border-radius: @border-radius-base; //** Border color for elements within panels @@ -802,6 +822,8 @@ // //## +//** Horizontal offset for forms and lists. +@component-offset-horizontal: 180px; //** Text muted color @text-muted: @gray-light; //** Abbreviations and acronyms border color @@ -816,14 +838,9 @@ @blockquote-border-color: @gray-lighter; //** Page header border color @page-header-border-color: transparent; - - -//== Miscellaneous -// -//## - +//** Width of horizontal description list titles +@dl-horizontal-offset: @component-offset-horizontal; //** Horizontal line color. @hr-border: @gray-lighter; -//** Horizontal offset for forms and lists. -@component-offset-horizontal: 180px; + |