From 793db366401a0ee33077c2359b12a441e30c1376 Mon Sep 17 00:00:00 2001 From: Catalin Zalog Date: Mon, 24 Aug 2015 01:44:16 +0300 Subject: Apply !default to SCSS variables !default to all variables. --- scss/_variables.scss | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 3b31dbdaf..b96e45b0e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -172,7 +172,7 @@ $blockquote-font-size: ($font-size-base * 1.25) !default; $blockquote-border-color: $gray-lighter !default; $hr-border-color: rgba(0,0,0,.1) !default; -$hr-border-width: $border-width; +$hr-border-width: $border-width !default; // Components @@ -212,8 +212,8 @@ $table-border-color: $gray-lighter !default; // // For each of Bootstrap's buttons, define text, background and border color. -$btn-padding-x: 1rem; -$btn-padding-y: .375rem; +$btn-padding-x: 1rem !default; +$btn-padding-y: .375rem !default; $btn-font-weight: normal !default; $btn-primary-color: #fff !default; @@ -249,9 +249,9 @@ $btn-padding-x-lg: 1.25rem !default; $btn-padding-y-lg: .75rem !default; // Allows for customizing button radius independently from global border radius -$btn-border-radius: $border-radius; -$btn-border-radius-lg: $border-radius-lg; -$btn-border-radius-sm: $border-radius-sm; +$btn-border-radius: $border-radius !default; +$btn-border-radius-lg: $border-radius-lg !default; +$btn-border-radius-sm: $border-radius-sm !default; // Forms @@ -285,7 +285,7 @@ $input-height: (($font-size-base * $line-height) + ($input-pad $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default; $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default; -$form-group-margin-bottom: 15px; +$form-group-margin-bottom: 15px !default; $input-group-addon-bg: $gray-lighter !default; $input-group-addon-border-color: $input-border !default; @@ -293,9 +293,9 @@ $input-group-addon-border-color: $input-border !default; $cursor-disabled: not-allowed !default; // Form validation icons -$form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg=="; -$form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg=="; -$form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4="; +$form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg==" !default; +$form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg==" !default; +$form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4=" !default; // Dropdowns @@ -341,15 +341,15 @@ $navbar-border-radius: $border-radius !default; $navbar-padding-horizontal: $spacer !default; $navbar-padding-vertical: ($spacer / 2) !default; -$navbar-dark-color: rgba(255,255,255,.5); -$navbar-dark-hover-color: rgba(255,255,255,.75); -$navbar-dark-active-color: rgba(255,255,255,1); -$navbar-dark-disabled-color: rgba(255,255,255,.25); +$navbar-dark-color: rgba(255,255,255,.5) !default; +$navbar-dark-hover-color: rgba(255,255,255,.75) !default; +$navbar-dark-active-color: rgba(255,255,255,1) !default; +$navbar-dark-disabled-color: rgba(255,255,255,.25) !default; -$navbar-light-color: rgba(0,0,0,.3); -$navbar-light-hover-color: rgba(0,0,0,.6); -$navbar-light-active-color: rgba(0,0,0,.8); -$navbar-light-disabled-color: rgba(0,0,0,.15); +$navbar-light-color: rgba(0,0,0,.3) !default; +$navbar-light-hover-color: rgba(0,0,0,.6) !default; +$navbar-light-active-color: rgba(0,0,0,.8) !default; +$navbar-light-disabled-color: rgba(0,0,0,.15) !default; // Navs @@ -445,12 +445,12 @@ $state-danger-border: darken($state-danger-bg, 5%) !default; // Cards -$card-spacer-x: 1.25rem; -$card-spacer-y: .75rem; -$card-border-width: .0625rem; -$card-border-radius: .25rem; -$card-border-color: #e5e5e5; -$card-border-radius-inner: ($card-border-radius - $card-border-width); +$card-spacer-x: 1.25rem !default; +$card-spacer-y: .75rem !default; +$card-border-width: .0625rem !default; +$card-border-radius: .25rem !default; +$card-border-color: #e5e5e5 !default; +$card-border-radius-inner: ($card-border-radius - $card-border-width) !default; $card-cap-bg: #f5f5f5; -- cgit v1.2.3 From 7633d4c603d916bb2174dd5a6d4063449088caef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 22:13:58 -0700 Subject: Make predefined grid classes conditional - Add explicit -grid-classes variable and set to true by default - Wrap .row and .col generation in the boolean 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 3b31dbdaf..8e7614bcf 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -49,6 +49,7 @@ $enable-shadows: false !default; $enable-gradients: false !default; $enable-transitions: false !default; $enable-hover-media-query: false !default; +$enable-grid-classes: true !default; // Spacing -- cgit v1.2.3 From 9420297dc2e548fe70250a0e5c5f40dfb8a73eda Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 25 Aug 2015 08:49:45 +0300 Subject: SCSS lint fixes. [ci skip] --- 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 b96e45b0e..e4b638732 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -179,7 +179,7 @@ $hr-border-width: $border-width !default; // // Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). -$line-height-lg: (4/3) !default; +$line-height-lg: (4 / 3) !default; $line-height-sm: 1.5 !default; $border-radius: .25rem !default; -- cgit v1.2.3 From 18395219ccc3ee67c0ef2fc8fab0d6daffef3d45 Mon Sep 17 00:00:00 2001 From: Catalin Zalog Date: Tue, 1 Sep 2015 11:26:01 +0300 Subject: Apply !default to SCSS variables Missed one variable :( --- scss/_variables.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index e4b638732..cfaf954a1 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -451,8 +451,7 @@ $card-border-width: .0625rem !default; $card-border-radius: .25rem !default; $card-border-color: #e5e5e5 !default; $card-border-radius-inner: ($card-border-radius - $card-border-width) !default; - -$card-cap-bg: #f5f5f5; +$card-cap-bg: #f5f5f5 !default; // Tooltips -- cgit v1.2.3 From d11980048945f10504b1f37917e585b29c75f461 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 1 Sep 2015 21:01:12 -0700 Subject: fix #17356 --- 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 a01c12440..70ac7f38c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -286,7 +286,7 @@ $input-height: (($font-size-base * $line-height) + ($input-pad $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default; $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default; -$form-group-margin-bottom: 15px !default; +$form-group-margin-bottom: $spacer-y !default; $input-group-addon-bg: $gray-lighter !default; $input-group-addon-border-color: $input-border !default; -- cgit v1.2.3 From 29c3eddaeb323299cd37796d893ed475ac1a29bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 1 Sep 2015 21:11:53 -0700 Subject: fixes #17412: reverse display heading classes to match h1-h6 headings --- scss/_variables.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scss/_variables.scss') diff --git a/scss/_variables.scss b/scss/_variables.scss index 70ac7f38c..6c7cdf5a2 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -143,10 +143,10 @@ $font-size-h4: 1.5rem !default; $font-size-h5: 1.25rem !default; $font-size-h6: 1rem !default; -$display1-size: 3.5rem !default; -$display2-size: 4.5rem !default; -$display3-size: 5.5rem !default; -$display4-size: 6rem !default; +$display1-size: 6rem !default; +$display2-size: 5.5rem !default; +$display3-size: 4.5rem !default; +$display4-size: 3.5rem !default; $display1-weight: 300 !default; $display2-weight: 300 !default; -- cgit v1.2.3 From 8f9e50c02d226f3abc083330f8e30b10b2f6511c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 1 Sep 2015 21:14:51 -0700 Subject: fixes #17385: add var for default link decoration --- 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 6c7cdf5a2..b54308e97 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -76,6 +76,7 @@ $body-color: $gray-dark !default; // Style anchor elements. $link-color: $brand-primary !default; +$link-decoration: none !default; $link-hover-color: darken($link-color, 15%) !default; $link-hover-decoration: underline !default; -- cgit v1.2.3