From ed1de86794cc0911dc7a3dbbf3bb9dfe421ef4b6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Mar 2017 12:20:44 -0800 Subject: Update spacer utilities (#22123) * Drop -x and -y as they're all the same - Also move -width to elsewhere in the vars because it makes no sense by spacers. - Update values of -x and -y across main Sass and docs Sass. * Update docs to reflect changes; link to spacing utils from options page --- scss/_variables.scss | 74 ++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 09ac11a9d..9a95602b7 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -138,36 +138,33 @@ $enable-print-styles: true !default; // variables. Mostly focused on spacing. // You can add more entries to the $spacers map, should you need more variation. -$spacer: 1rem !default; -$spacer-x: $spacer !default; -$spacer-y: $spacer !default; +$spacer: 1rem !default; $spacers: ( 0: ( x: 0, y: 0 ), 1: ( - x: ($spacer-x * .25), - y: ($spacer-y * .25) + x: ($spacer * .25), + y: ($spacer * .25) ), 2: ( - x: ($spacer-x * .5), - y: ($spacer-y * .5) + x: ($spacer * .5), + y: ($spacer * .5) ), 3: ( - x: $spacer-x, - y: $spacer-y + x: $spacer, + y: $spacer ), 4: ( - x: ($spacer-x * 1.5), - y: ($spacer-y * 1.5) + x: ($spacer * 1.5), + y: ($spacer * 1.5) ), 5: ( - x: ($spacer-x * 3), - y: ($spacer-y * 3) + x: ($spacer * 3), + y: ($spacer * 3) ) ) !default; -$border-width: 1px !default; // This variable affects the `.h-*` and `.w-*` classes. $sizes: ( @@ -237,6 +234,30 @@ $grid-gutter-widths: ( xl: $grid-gutter-width-base ) !default; + +// Components +// +// Define common padding and border radius sizes and more. + +$line-height-lg: (4 / 3) !default; +$line-height-sm: 1.5 !default; + +$border-width: 1px !default; + +$border-radius: .25rem !default; +$border-radius-lg: .3rem !default; +$border-radius-sm: .2rem !default; + +$component-active-color: $white !default; +$component-active-bg: $brand-primary !default; + +$caret-width: .3em !default; + +$transition-base: all .2s ease-in-out !default; +$transition-fade: opacity .15s linear !default; +$transition-collapse: height .35s ease !default; + + // Fonts // // Font, line-height, and color for body text, headings, and more. @@ -305,27 +326,6 @@ $nested-kbd-font-weight: $font-weight-bold !default; $list-inline-padding: 5px !default; -// Components -// -// Define common padding and border radius sizes and more. - -$line-height-lg: (4 / 3) !default; -$line-height-sm: 1.5 !default; - -$border-radius: .25rem !default; -$border-radius-lg: .3rem !default; -$border-radius-sm: .2rem !default; - -$component-active-color: $white !default; -$component-active-bg: $brand-primary !default; - -$caret-width: .3em !default; - -$transition-base: all .2s ease-in-out !default; -$transition-fade: opacity .15s linear !default; -$transition-collapse: height .35s ease !default; - - // Tables // // Customizes the `.table` component with basic values, each used across all table variations. @@ -450,7 +450,7 @@ $form-check-input-margin-x: .25rem !default; $form-check-inline-margin-x: .75rem !default; -$form-group-margin-bottom: $spacer-y !default; +$form-group-margin-bottom: 1rem !default; $input-group-addon-bg: $gray-lighter !default; $input-group-addon-border-color: $input-border-color !default; @@ -804,7 +804,7 @@ $modal-transition: transform .3s ease-out !default; $alert-padding-x: 1.25rem !default; $alert-padding-y: .75rem !default; -$alert-margin-bottom: $spacer-y !default; +$alert-margin-bottom: 1rem !default; $alert-border-radius: $border-radius !default; $alert-link-font-weight: $font-weight-bold !default; $alert-border-width: $border-width !default; -- cgit v1.2.3 From 95f37e4c402df37db16781995ffa1592032df9c8 Mon Sep 17 00:00:00 2001 From: Starsam80 Date: Sun, 5 Mar 2017 14:07:38 -0700 Subject: Clean up spacers a bit more --- scss/_variables.scss | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 9a95602b7..4d7cd9dc9 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -140,30 +140,12 @@ $enable-print-styles: true !default; $spacer: 1rem !default; $spacers: ( - 0: ( - x: 0, - y: 0 - ), - 1: ( - x: ($spacer * .25), - y: ($spacer * .25) - ), - 2: ( - x: ($spacer * .5), - y: ($spacer * .5) - ), - 3: ( - x: $spacer, - y: $spacer - ), - 4: ( - x: ($spacer * 1.5), - y: ($spacer * 1.5) - ), - 5: ( - x: ($spacer * 3), - y: ($spacer * 3) - ) + 0: 0, + 1: ($spacer * .25), + 2: ($spacer * .5), + 3: $spacer, + 4: ($spacer * 1.5), + 5: ($spacer * 3) ) !default; // This variable affects the `.h-*` and `.w-*` classes. -- cgit v1.2.3 From 08d612f3e4b1c1beb40b764de3a4018415e346c9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Mar 2017 16:52:39 -0700 Subject: correct inverse table border color, add new var --- scss/_variables.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 4d7cd9dc9..93628a808 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -318,6 +318,7 @@ $table-sm-cell-padding: .3rem !default; $table-bg: transparent !default; $table-inverse-bg: $gray-dark !default; +$table-inverse-border: lighten($gray-dark, 7.5%) !default; $table-inverse-color: $body-bg !default; $table-bg-accent: rgba($black,.05) !default; -- cgit v1.2.3 From 13a874e3404ff82d9c84e39c596e7205803bb25e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Mar 2017 17:03:52 -0700 Subject: reorder --- scss/_variables.scss | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 93628a808..54bf91c1e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -316,20 +316,19 @@ $table-cell-padding: .75rem !default; $table-sm-cell-padding: .3rem !default; $table-bg: transparent !default; - -$table-inverse-bg: $gray-dark !default; -$table-inverse-border: lighten($gray-dark, 7.5%) !default; -$table-inverse-color: $body-bg !default; - $table-bg-accent: rgba($black,.05) !default; $table-bg-hover: rgba($black,.075) !default; $table-bg-active: $table-bg-hover !default; +$table-border-width: $border-width !default; +$table-border-color: $gray-lighter !default; + $table-head-bg: $gray-lighter !default; $table-head-color: $gray !default; -$table-border-width: $border-width !default; -$table-border-color: $gray-lighter !default; +$table-inverse-bg: $gray-dark !default; +$table-inverse-border: lighten($gray-dark, 7.5%) !default; +$table-inverse-color: $body-bg !default; // Buttons -- cgit v1.2.3 From d093460252c712f82ef1b52758c7f12f3110193e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 19 Mar 2017 17:37:00 -0700 Subject: fixes rest of #21585; adds custom styles for inverse table accent hover and active states --- scss/_variables.scss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 54bf91c1e..69eb4017b 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -327,6 +327,9 @@ $table-head-bg: $gray-lighter !default; $table-head-color: $gray !default; $table-inverse-bg: $gray-dark !default; +$table-inverse-bg-accent: rgba($white, .05) !default; +$table-inverse-bg-hover: rgba($white, .075) !default; +$table-inverse-bg-active: $table-inverse-bg-hover !default; $table-inverse-border: lighten($gray-dark, 7.5%) !default; $table-inverse-color: $body-bg !default; -- cgit v1.2.3 From a03aaf39df876691e4ba6acb0b40e9790e4c7127 Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Sat, 14 Jan 2017 01:52:05 -0500 Subject: Harmonize navbar-brand, navbar-text and nav-link height --- scss/_variables.scss | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 69eb4017b..b0c8859a5 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -21,8 +21,8 @@ // Forms // Dropdowns // Z-index master list -// Navbar // Navs +// Navbar // Pagination // Jumbotron // Form states and alerts @@ -573,11 +573,39 @@ $zindex-modal: 1050 !default; $zindex-popover: 1060 !default; $zindex-tooltip: 1070 !default; +// Navs + +$nav-item-margin: .2rem !default; +$nav-item-inline-spacer: 1rem !default; +$nav-link-padding-x: 1rem !default; +$nav-link-padding-y: .5rem !default; +$nav-link-hover-bg: $gray-lighter !default; +$nav-disabled-link-color: $gray-light !default; + +$nav-tabs-border-color: #ddd !default; +$nav-tabs-border-width: $border-width !default; +$nav-tabs-border-radius: $border-radius !default; +$nav-tabs-link-hover-border-color: $gray-lighter !default; +$nav-tabs-active-link-color: $gray !default; +$nav-tabs-active-link-bg: $body-bg !default; +$nav-tabs-active-link-border-color: #ddd !default; +$nav-tabs-justified-link-border-color: #ddd !default; +$nav-tabs-justified-active-link-border-color: $body-bg !default; + +$nav-pills-border-radius: $border-radius !default; +$nav-pills-active-link-color: $component-active-color !default; +$nav-pills-active-link-bg: $component-active-bg !default; + // Navbar $navbar-padding-x: $spacer !default; $navbar-padding-y: ($spacer / 2) !default; +// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link +$nav-link-height: $font-size-lg * $line-height-base !default; +$navbar-brand-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default; +$navbar-brand-padding-y: ($navbar-brand-height - $nav-link-height) / 2 !default; + $navbar-toggler-padding-x: .75rem !default; $navbar-toggler-padding-y: .25rem !default; $navbar-toggler-font-size: $font-size-lg !default; @@ -597,24 +625,6 @@ $navbar-light-disabled-color: rgba($black,.3) !default; $navbar-light-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default; $navbar-light-toggler-border: rgba($black,.1) !default; -// Navs - -$nav-link-padding: .5em 1em !default; -$nav-disabled-link-color: $gray-light !default; - -$nav-tabs-border-color: #ddd !default; -$nav-tabs-border-width: $border-width !default; -$nav-tabs-border-radius: $border-radius !default; -$nav-tabs-link-hover-border-color: $gray-lighter !default; -$nav-tabs-active-link-color: $gray !default; -$nav-tabs-active-link-bg: $body-bg !default; -$nav-tabs-active-link-border-color: #ddd !default; - -$nav-pills-border-radius: $border-radius !default; -$nav-pills-active-link-color: $component-active-color !default; -$nav-pills-active-link-bg: $component-active-bg !default; - - // Pagination $pagination-padding-x: .75rem !default; -- cgit v1.2.3 From 17cb5bb674fd2f6c47619726aeea29437bcd6a0a Mon Sep 17 00:00:00 2001 From: Pierre-Denis Vanduynslager Date: Sat, 14 Jan 2017 01:59:20 -0500 Subject: Allow to customize navbar-brand font-size --- scss/_variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index b0c8859a5..0fa4f334b 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -601,8 +601,9 @@ $nav-pills-active-link-bg: $component-active-bg !default; $navbar-padding-x: $spacer !default; $navbar-padding-y: ($spacer / 2) !default; +$navbar-brand-font-size: $font-size-lg !default; // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link -$nav-link-height: $font-size-lg * $line-height-base !default; +$nav-link-height: $navbar-brand-font-size * $line-height-base !default; $navbar-brand-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default; $navbar-brand-padding-y: ($navbar-brand-height - $nav-link-height) / 2 !default; -- cgit v1.2.3 From 296c99020c0f7c8122b8cd1a7f93c0797f8ff8dd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 28 Mar 2017 09:28:27 -0700 Subject: Revamp button and input vars while fixing #21587 (#22287) --- scss/_variables.scss | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 0fa4f334b..e8ead3033 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -221,7 +221,7 @@ $grid-gutter-widths: ( // // Define common padding and border radius sizes and more. -$line-height-lg: (4 / 3) !default; +$line-height-lg: 1.5 !default; $line-height-sm: 1.5 !default; $border-width: 1px !default; @@ -338,9 +338,18 @@ $table-inverse-color: $body-bg !default; // // For each of Bootstrap's buttons, define text, background and border color. -$btn-padding-x: 1rem !default; -$btn-padding-y: .5rem !default; -$btn-line-height: 1.25 !default; +$input-btn-padding-x: 1rem !default; +$input-btn-padding-y: .5rem !default; +$input-btn-line-height: 1.25 !default; + +$input-btn-padding-x-sm: .5rem !default; +$input-btn-padding-y-sm: .25rem !default; +$input-btn-line-height-sm: 1.5 !default; + +$input-btn-padding-x-lg: 1rem !default; +$input-btn-padding-y-lg: .5rem !default; +$input-btn-line-height-lg: 1.5 !default; + $btn-font-weight: $font-weight-normal !default; $btn-box-shadow: inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075) !default; $btn-focus-box-shadow: 0 0 0 2px rgba($brand-primary, .25) !default; @@ -372,12 +381,6 @@ $btn-danger-border: $btn-danger-bg !default; $btn-link-disabled-color: $gray-light !default; -$btn-padding-x-sm: .5rem !default; -$btn-padding-y-sm: .25rem !default; - -$btn-padding-x-lg: 1.5rem !default; -$btn-padding-y-lg: .75rem !default; - $btn-block-spacing-y: .5rem !default; // Allows for customizing button radius independently from global border radius @@ -390,10 +393,6 @@ $btn-transition: all .2s ease-in-out !default; // Forms -$input-padding-x: .75rem !default; -$input-padding-y: .5rem !default; -$input-line-height: 1.25 !default; - $input-bg: $white !default; $input-bg-disabled: $gray-lighter !default; @@ -413,15 +412,9 @@ $input-color-focus: $input-color !default; $input-color-placeholder: $gray-light !default; -$input-padding-x-sm: .5rem !default; -$input-padding-y-sm: .25rem !default; - -$input-padding-x-lg: 1.5rem !default; -$input-padding-y-lg: .75rem !default; - -$input-height: (($font-size-base * $input-line-height) + ($input-padding-y * 2)) !default; -$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default; -$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default; +$input-height: (($font-size-base * $input-btn-line-height) + ($input-btn-padding-y * 2)) !default; +$input-height-lg: (($font-size-lg * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2)) !default; +$input-height-sm: (($font-size-sm * $input-btn-line-height-sm) + ($input-btn-padding-y-sm * 2)) !default; $input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s !default; @@ -479,7 +472,7 @@ $custom-radio-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3C $custom-select-padding-x: .75rem !default; $custom-select-padding-y: .375rem !default; $custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator -$custom-select-line-height: $input-line-height !default; +$custom-select-line-height: $input-btn-line-height !default; $custom-select-color: $input-color !default; $custom-select-disabled-color: $gray-light !default; $custom-select-bg: $white !default; -- cgit v1.2.3 From cb4bc89fdf0286e9b88b6d5be6148b9b53463ff8 Mon Sep 17 00:00:00 2001 From: Praveen Puglia Date: Wed, 29 Mar 2017 03:51:47 +0530 Subject: ability to change text color in popovers (#22221) --- scss/_variables.scss | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index e8ead3033..0d22877a2 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -721,9 +721,11 @@ $popover-border-color: rgba($black,.2) !default; $popover-box-shadow: 0 5px 10px rgba($black,.2) !default; $popover-title-bg: darken($popover-bg, 3%) !default; +$popover-title-color: $headings-color !default; $popover-title-padding-x: 14px !default; $popover-title-padding-y: 8px !default; +$popover-content-color: $body-color !default; $popover-content-padding-x: 14px !default; $popover-content-padding-y: 9px !default; -- cgit v1.2.3 From c6168b64ed32a4787365d03a5fa65de157799452 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Apr 2017 12:02:59 -0700 Subject: Remove system-ui from font stack due to i18n issues --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 0d22877a2..46105e1a5 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -244,7 +244,7 @@ $transition-collapse: height .35s ease !default; // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; -- cgit v1.2.3 From f7881336e508f6f4fcfb279eb8a8f26509a05b67 Mon Sep 17 00:00:00 2001 From: Catalin Zalog Date: Sat, 8 Apr 2017 14:18:17 +0300 Subject: css: just some ordering Order y & x axis by top, right, bottom, left logic --- scss/_variables.scss | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 46105e1a5..dfbe891a5 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -338,16 +338,16 @@ $table-inverse-color: $body-bg !default; // // For each of Bootstrap's buttons, define text, background and border color. -$input-btn-padding-x: 1rem !default; $input-btn-padding-y: .5rem !default; +$input-btn-padding-x: 1rem !default; $input-btn-line-height: 1.25 !default; -$input-btn-padding-x-sm: .5rem !default; $input-btn-padding-y-sm: .25rem !default; +$input-btn-padding-x-sm: .5rem !default; $input-btn-line-height-sm: 1.5 !default; -$input-btn-padding-x-lg: 1rem !default; $input-btn-padding-y-lg: .5rem !default; +$input-btn-padding-x-lg: 1rem !default; $input-btn-line-height-lg: 1.5 !default; $btn-font-weight: $font-weight-normal !default; @@ -436,8 +436,8 @@ $input-group-addon-border-color: $input-border-color !default; $cursor-disabled: not-allowed !default; $custom-control-gutter: 1.5rem !default; -$custom-control-spacer-x: 1rem !default; $custom-control-spacer-y: .25rem !default; +$custom-control-spacer-x: 1rem !default; $custom-control-indicator-size: 1rem !default; $custom-control-indicator-bg: #ddd !default; @@ -469,8 +469,8 @@ $custom-checkbox-indeterminate-box-shadow: none !default; $custom-radio-radius: 50% !default; $custom-radio-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-checked-indicator-color}'/%3E%3C/svg%3E"), "#", "%23") !default; -$custom-select-padding-x: .75rem !default; $custom-select-padding-y: .375rem !default; +$custom-select-padding-x: .75rem !default; $custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator $custom-select-line-height: $input-btn-line-height !default; $custom-select-color: $input-color !default; @@ -493,8 +493,8 @@ $custom-file-height: 2.5rem !default; $custom-file-width: 14rem !default; $custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem $brand-primary !default; -$custom-file-padding-x: .5rem !default; $custom-file-padding-y: 1rem !default; +$custom-file-padding-x: .5rem !default; $custom-file-line-height: 1.5 !default; $custom-file-color: $gray !default; $custom-file-bg: $white !default; @@ -570,8 +570,8 @@ $zindex-tooltip: 1070 !default; $nav-item-margin: .2rem !default; $nav-item-inline-spacer: 1rem !default; -$nav-link-padding-x: 1rem !default; $nav-link-padding-y: .5rem !default; +$nav-link-padding-x: 1rem !default; $nav-link-hover-bg: $gray-lighter !default; $nav-disabled-link-color: $gray-light !default; @@ -591,8 +591,8 @@ $nav-pills-active-link-bg: $component-active-bg !default; // Navbar -$navbar-padding-x: $spacer !default; $navbar-padding-y: ($spacer / 2) !default; +$navbar-padding-x: $spacer !default; $navbar-brand-font-size: $font-size-lg !default; // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link @@ -600,8 +600,8 @@ $nav-link-height: $navbar-brand-font-size * $line-height-base $navbar-brand-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default; $navbar-brand-padding-y: ($navbar-brand-height - $nav-link-height) / 2 !default; -$navbar-toggler-padding-x: .75rem !default; $navbar-toggler-padding-y: .25rem !default; +$navbar-toggler-padding-x: .75rem !default; $navbar-toggler-font-size: $font-size-lg !default; $navbar-toggler-border-radius: $btn-border-radius !default; @@ -621,12 +621,12 @@ $navbar-light-toggler-border: rgba($black,.1) !default; // Pagination -$pagination-padding-x: .75rem !default; $pagination-padding-y: .5rem !default; -$pagination-padding-x-sm: .5rem !default; +$pagination-padding-x: .75rem !default; $pagination-padding-y-sm: .25rem !default; -$pagination-padding-x-lg: 1.5rem !default; +$pagination-padding-x-sm: .5rem !default; $pagination-padding-y-lg: .75rem !default; +$pagination-padding-x-lg: 1.5rem !default; $pagination-line-height: 1.25 !default; $pagination-color: $link-color !default; @@ -677,8 +677,8 @@ $state-danger-border: darken($state-danger-bg, 5%) !default; // Cards -$card-spacer-x: 1.25rem !default; $card-spacer-y: .75rem !default; +$card-spacer-x: 1.25rem !default; $card-border-width: 1px !default; $card-border-radius: $border-radius !default; $card-border-color: rgba($black,.125) !default; @@ -722,12 +722,12 @@ $popover-box-shadow: 0 5px 10px rgba($black,.2) !default; $popover-title-bg: darken($popover-bg, 3%) !default; $popover-title-color: $headings-color !default; -$popover-title-padding-x: 14px !default; $popover-title-padding-y: 8px !default; +$popover-title-padding-x: 14px !default; $popover-content-color: $body-color !default; -$popover-content-padding-x: 14px !default; $popover-content-padding-y: 9px !default; +$popover-content-padding-x: 14px !default; $popover-arrow-width: 10px !default; $popover-arrow-color: $popover-bg !default; @@ -749,8 +749,8 @@ $badge-color: $white !default; $badge-link-hover-color: $white !default; $badge-font-size: 75% !default; $badge-font-weight: $font-weight-bold !default; -$badge-padding-x: .4em !default; $badge-padding-y: .25em !default; +$badge-padding-x: .4em !default; $badge-pill-padding-x: .6em !default; // Use a higher than normal value to ensure completely rounded edges when @@ -793,8 +793,8 @@ $modal-transition: transform .3s ease-out !default; // // Define alert colors, border radius, and padding. -$alert-padding-x: 1.25rem !default; $alert-padding-y: .75rem !default; +$alert-padding-x: 1.25rem !default; $alert-margin-bottom: 1rem !default; $alert-border-radius: $border-radius !default; $alert-link-font-weight: $font-weight-bold !default; @@ -836,8 +836,8 @@ $list-group-border-color: rgba($black,.125) !default; $list-group-border-width: $border-width !default; $list-group-border-radius: $border-radius !default; -$list-group-item-padding-x: 1.25rem !default; $list-group-item-padding-y: .75rem !default; +$list-group-item-padding-x: 1.25rem !default; $list-group-hover-bg: $gray-lightest !default; $list-group-active-color: $component-active-color !default; @@ -915,8 +915,8 @@ $close-text-shadow: 0 1px 0 $white !default; // Code $code-font-size: 90% !default; -$code-padding-x: .4rem !default; $code-padding-y: .2rem !default; +$code-padding-x: .4rem !default; $code-color: #bd4147 !default; $code-bg: $gray-lightest !default; -- cgit v1.2.3 From 2f21403a933336f7cb01c86bf3c650490bc658a6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Apr 2017 14:01:38 -0700 Subject: Drop width from sizing utils given .col- classes can do the same thing (follow up to #22376) --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index dfbe891a5..be8caa342 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -148,7 +148,7 @@ $spacers: ( 5: ($spacer * 3) ) !default; -// This variable affects the `.h-*` and `.w-*` classes. +// This variable affects the `.h-*` classes. $sizes: ( 25: 25%, 50: 50%, -- cgit v1.2.3 From 050aab338b3f6bac15337b79feed0a1c54bdcc6d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Apr 2017 14:17:06 -0700 Subject: Add dropdown-item-padding-y var - Closes #21622 which kept the 3px - Puts variable in proper order for shorthand (y x) --- scss/_variables.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index be8caa342..3af5205a4 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -547,6 +547,7 @@ $dropdown-link-active-bg: $component-active-bg !default; $dropdown-link-disabled-color: $gray-light !default; +$dropdown-item-padding-y: .25rem !default; $dropdown-item-padding-x: 1.5rem !default; $dropdown-header-color: $gray-light !default; -- cgit v1.2.3 From fba27befef3c63f523a681230358cc996bc037aa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Apr 2017 14:05:33 -0700 Subject: Add transition to .progress-bar - Pulls in values from v3 - Closes #22371 which didn't use a transition include --- scss/_variables.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 3af5205a4..beb8b9c13 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -828,6 +828,7 @@ $progress-box-shadow: inset 0 .1rem .1rem rgba($black,.1) !default; $progress-bar-color: $white !default; $progress-bar-bg: $brand-primary !default; $progress-bar-animation-timing: 1s linear infinite !default; +$progress-bar-transition: width .6s ease !default; // List group -- cgit v1.2.3 From feb35b94a61c4d6016be8d1773a79a6bbe57d856 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Apr 2017 15:14:52 -0700 Subject: Revert "Drop width from sizing utils given .col- classes can do the same thing (follow up to #22376)" This reverts commit 2f21403a933336f7cb01c86bf3c650490bc658a6. --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index beb8b9c13..f517797fa 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -148,7 +148,7 @@ $spacers: ( 5: ($spacer * 3) ) !default; -// This variable affects the `.h-*` classes. +// This variable affects the `.h-*` and `.w-*` classes. $sizes: ( 25: 25%, 50: 50%, -- cgit v1.2.3