lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss in bootstrap-generators-3.1.1.3 vs lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss in bootstrap-generators-3.2.0

- old
+ new

@@ -12,11 +12,11 @@ //## Gray and brand colors for use across Bootstrap. $gray-darker: lighten(#000, 13.5%) !default; // #222 $gray-dark: lighten(#000, 20%) !default; // #333 $gray: lighten(#000, 33.5%) !default; // #555 -$gray-light: lighten(#000, 60%) !default; // #999 +$gray-light: lighten(#000, 46.7%) !default; // #777 $gray-lighter: lighten(#000, 93.5%) !default; // #eee $brand-primary: #428bca !default; $brand-success: #5cb85c !default; $brand-info: #5bc0de !default; @@ -24,11 +24,11 @@ $brand-danger: #d9534f !default; //== Scaffolding // -// ## Settings for some of the most global styles. +//## Settings for some of the most global styles. //** Background color for `<body>`. $body-bg: #fff !default; //** Global text color on `<body>`. $text-color: $gray-dark !default; @@ -70,18 +70,22 @@ $headings-font-weight: 500 !default; $headings-line-height: 1.1 !default; $headings-color: inherit !default; -//-- 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: "bootstrap/" !default; +//** File name for all font files. $icon-font-name: "glyphicons-halflings-regular" !default; +//** Element ID within SVG icon file. $icon-font-svg-id: "glyphicons_halflingsregular" !default; + //== Components // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). $padding-base-vertical: 6px !default; @@ -234,11 +238,11 @@ $dropdown-link-disabled-color: $gray-light !default; //** Text color for headers within dropdown menus. $dropdown-header-color: $gray-light !default; -// Note: Deprecated $dropdown-caret-color as of v3.1.0 +//** Deprecated `$dropdown-caret-color` as of v3.1.0 $dropdown-caret-color: #000 !default; //-- Z-index master list // @@ -247,43 +251,48 @@ // // Note: These variables are not generated into the Customizer. $zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; -$zindex-popover: 1010 !default; -$zindex-tooltip: 1030 !default; +$zindex-popover: 1060 !default; +$zindex-tooltip: 1070 !default; $zindex-navbar-fixed: 1030 !default; $zindex-modal-background: 1040 !default; $zindex-modal: 1050 !default; //== Media queries breakpoints // //## 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 !default; +//** Deprecated `$screen-xs-min` as of v3.2.0 $screen-xs-min: $screen-xs !default; +//** Deprecated `$screen-phone` as of v3.0.1 $screen-phone: $screen-xs-min !default; // 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 !default; $screen-sm-min: $screen-sm !default; +//** Deprecated `$screen-tablet` as of v3.0.1 $screen-tablet: $screen-sm-min !default; // 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 !default; $screen-md-min: $screen-md !default; +//** Deprecated `$screen-desktop` as of v3.0.1 $screen-desktop: $screen-md-min !default; // 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 !default; $screen-lg-min: $screen-lg !default; +//** Deprecated `$screen-lg-desktop` as of v3.0.1 $screen-lg-desktop: $screen-lg-min !default; // So media queries don't overlap when required, provide a maximum $screen-xs-max: ($screen-sm-min - 1) !default; $screen-sm-max: ($screen-md-min - 1) !default; @@ -527,11 +536,11 @@ $popover-arrow-color: #fff !default; //** Popover outer arrow width $popover-arrow-outer-width: ($popover-arrow-width + 1) !default; //** Popover outer arrow color -$popover-arrow-outer-color: fadein($popover-border-color, 5%) !default; +$popover-arrow-outer-color: fade_in($popover-border-color, 0.05) !default; //** Popover outer arrow fallback color $popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default; //== Labels @@ -560,11 +569,11 @@ //== Modals // //## //** Padding applied to the modal body -$modal-inner-padding: 20px !default; +$modal-inner-padding: 15px !default; //** Padding applied to the modal title $modal-title-padding: 15px !default; //** Modal title line-height $modal-title-line-height: $line-height-base !default; @@ -645,30 +654,41 @@ //** `.list-group-item` border color $list-group-border: #ddd !default; //** List group border radius $list-group-border-radius: $border-radius-base !default; -//** Background color of single list elements on hover +//** Background color of single list items on hover $list-group-hover-bg: #f5f5f5 !default; -//** Text color of active list elements +//** Text color of active list items $list-group-active-color: $component-active-color !default; -//** Background color of active list elements +//** Background color of active list items $list-group-active-bg: $component-active-bg !default; //** Border color of active list elements $list-group-active-border: $list-group-active-bg !default; +//** Text color for content within active list items $list-group-active-text-color: lighten($list-group-active-bg, 40%) !default; +//** Text color of disabled list items +$list-group-disabled-color: $gray-light !default; +//** Background color of disabled list items +$list-group-disabled-bg: $gray-lighter !default; +//** Text color for content within disabled list items +$list-group-disabled-text-color: $list-group-disabled-color !default; + $list-group-link-color: #555 !default; +$list-group-link-hover-color: $list-group-link-color !default; $list-group-link-heading-color: #333 !default; //== Panels // //## $panel-bg: #fff !default; $panel-body-padding: 15px !default; +$panel-heading-padding: 10px 15px !default; +$panel-footer-padding: $panel-heading-padding !default; $panel-border-radius: $border-radius-base !default; //** Border color for elements within panels $panel-inner-border: #ddd !default; $panel-footer-bg: #f5f5f5 !default; @@ -804,10 +824,12 @@ //== Type // //## +//** Horizontal offset for forms and lists. +$component-offset-horizontal: 180px !default; //** Text muted color $text-muted: $gray-light !default; //** Abbreviations and acronyms border color $abbr-border-color: $gray-light !default; //** Headings small color @@ -818,16 +840,11 @@ $blockquote-font-size: ($font-size-base * 1.25) !default; //** Blockquote border color $blockquote-border-color: $gray-lighter !default; //** Page header border color $page-header-border-color: $gray-lighter !default; - - -//== Miscellaneous -// -//## - +//** Width of horizontal description list titles +$dl-horizontal-offset: $component-offset-horizontal !default; //** Horizontal line color. $hr-border: $gray-lighter !default; -//** Horizontal offset for forms and lists. -$component-offset-horizontal: 180px !default; +