From 76f705632155931bcf3cb7b23b439e0e2930cd1f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:28:45 -0800 Subject: [PATCH 01/22] $dropdown-border => $dropdown-border-color --- scss/_dropdown.scss | 2 +- scss/_variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index c477dfb172..f1213065a8 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -51,7 +51,7 @@ list-style: none; background-color: $dropdown-bg; background-clip: padding-box; - border: 1px solid $dropdown-border; + border: 1px solid $dropdown-border-color; @include border-radius($border-radius); @include box-shadow(0 6px 12px rgba(0,0,0,.175)); } diff --git a/scss/_variables.scss b/scss/_variables.scss index b7bb880903..be8c9d81bf 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -305,7 +305,7 @@ $form-icon-danger: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My // Dropdown menu container and contents. $dropdown-bg: #fff !default; -$dropdown-border: rgba(0,0,0,.15) !default; +$dropdown-border-color: rgba(0,0,0,.15) !default; $dropdown-divider-bg: #e5e5e5 !default; $dropdown-link-color: $gray-dark !default; From 2ea8950b26b22c296c859949f648a37cbbd4ceaa Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:30:16 -0800 Subject: [PATCH 02/22] Add $dropdown-border-width; refs #18150 --- scss/_dropdown.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index f1213065a8..eb3321377d 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -51,7 +51,7 @@ list-style: none; background-color: $dropdown-bg; background-clip: padding-box; - border: 1px solid $dropdown-border-color; + border: $dropdown-border-width solid $dropdown-border-color; @include border-radius($border-radius); @include box-shadow(0 6px 12px rgba(0,0,0,.175)); } diff --git a/scss/_variables.scss b/scss/_variables.scss index be8c9d81bf..ba9d663fd2 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -306,6 +306,7 @@ $form-icon-danger: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My $dropdown-bg: #fff !default; $dropdown-border-color: rgba(0,0,0,.15) !default; +$dropdown-border-width: $border-width !default; $dropdown-divider-bg: #e5e5e5 !default; $dropdown-link-color: $gray-dark !default; From 2d02910e014061b504a42705f84e415e37413b3a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:32:42 -0800 Subject: [PATCH 03/22] $input-border => $input-border-color --- scss/_custom-forms.scss | 2 +- scss/_forms.scss | 2 +- scss/_variables.scss | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 1fec265c60..72580352dc 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -138,7 +138,7 @@ background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; background-image: none \9; background-size: 8px 10px; - border: 1px solid $input-border; + border: 1px solid $input-border-color; // Use vendor prefixes as `appearance` isn't part of the CSS spec. -moz-appearance: none; -webkit-appearance: none; diff --git a/scss/_forms.scss b/scss/_forms.scss index 8796cbb773..32c9c66e03 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -14,7 +14,7 @@ background-color: $input-bg; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. background-image: none; - border: $border-width solid $input-border; + border: $border-width solid $input-border-color; // Note: This has no effect on `s in CSS. @include border-radius($input-border-radius); @include box-shadow($input-box-shadow); diff --git a/scss/_variables.scss b/scss/_variables.scss index ba9d663fd2..78d6d066d3 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -265,7 +265,7 @@ $input-bg: #fff !default; $input-bg-disabled: $gray-lighter !default; $input-color: $gray !default; -$input-border: #ccc !default; +$input-border-color: #ccc !default; $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default; $input-border-radius: $border-radius !default; @@ -290,7 +290,7 @@ $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-pa $form-group-margin-bottom: $spacer-y !default; $input-group-addon-bg: $gray-lighter !default; -$input-group-addon-border-color: $input-border !default; +$input-group-addon-border-color: $input-border-color !default; $cursor-disabled: not-allowed !default; From 1f29c306a65c6103e32969e83e173fd4bb73ae86 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:36:19 -0800 Subject: [PATCH 04/22] Add $input-border-width; refs #18150 --- scss/_custom-forms.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 72580352dc..241e97275f 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -138,7 +138,7 @@ background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; background-image: none \9; background-size: 8px 10px; - border: 1px solid $input-border-color; + border: $input-border-width solid $input-border-color; // Use vendor prefixes as `appearance` isn't part of the CSS spec. -moz-appearance: none; -webkit-appearance: none; diff --git a/scss/_variables.scss b/scss/_variables.scss index 78d6d066d3..9c66931930 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -266,6 +266,7 @@ $input-bg-disabled: $gray-lighter !default; $input-color: $gray !default; $input-border-color: #ccc !default; +$input-border-width: $border-width !default; $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default; $input-border-radius: $border-radius !default; From a420b66210654791a25d1efa1b17800e7f5cbc29 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:38:42 -0800 Subject: [PATCH 05/22] Add $nav-tabs-link-border-width; refs #18150 --- scss/_nav.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_nav.scss b/scss/_nav.scss index 5714c77eb7..b9aaf42a0a 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -59,7 +59,7 @@ .nav-link { display: block; padding: $nav-link-padding; - border: 1px solid transparent; + border: $nav-tabs-link-border-width solid transparent; @include border-radius($border-radius $border-radius 0 0); @include hover-focus { diff --git a/scss/_variables.scss b/scss/_variables.scss index 9c66931930..793e703714 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -366,6 +366,7 @@ $nav-disabled-link-hover-color: $gray-light !default; $nav-tabs-border-color: #ddd !default; +$nav-tabs-link-border-width: $border-width !default; $nav-tabs-link-hover-border-color: $gray-lighter !default; $nav-tabs-active-link-hover-bg: $body-bg !default; From a4594bd44550bad5a71ba631e4a6c505990edea3 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:48:18 -0800 Subject: [PATCH 06/22] $pager-border => $pager-border-color --- scss/_pager.scss | 2 +- scss/_variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_pager.scss b/scss/_pager.scss index 06036c206a..9c5ff60c8a 100644 --- a/scss/_pager.scss +++ b/scss/_pager.scss @@ -14,7 +14,7 @@ display: inline-block; padding: 5px 14px; background-color: $pager-bg; - border: 1px solid $pager-border; + border: 1px solid $pager-border-color; border-radius: $pager-border-radius; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 793e703714..3d89aecb7d 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -411,7 +411,7 @@ $pagination-disabled-border: #ddd !default; // Pager $pager-bg: $pagination-bg !default; -$pager-border: $pagination-border !default; +$pager-border-color: $pagination-border !default; $pager-border-radius: 15px !default; $pager-hover-bg: $pagination-hover-bg !default; From 687610e6f133dfd13078ebd87434b6efb6cd3742 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:49:14 -0800 Subject: [PATCH 07/22] Add $pager-border-width; refs #18150 --- scss/_pager.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_pager.scss b/scss/_pager.scss index 9c5ff60c8a..933036061d 100644 --- a/scss/_pager.scss +++ b/scss/_pager.scss @@ -14,7 +14,7 @@ display: inline-block; padding: 5px 14px; background-color: $pager-bg; - border: 1px solid $pager-border-color; + border: $pager-border-width solid $pager-border-color; border-radius: $pager-border-radius; } diff --git a/scss/_variables.scss b/scss/_variables.scss index 3d89aecb7d..5882597a05 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -411,6 +411,7 @@ $pagination-disabled-border: #ddd !default; // Pager $pager-bg: $pagination-bg !default; +$pager-border-width: $border-width !default; $pager-border-color: $pagination-border !default; $pager-border-radius: 15px !default; From 5f45f652f72e91046e3ac7497a1dffde89ff6393 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:51:18 -0800 Subject: [PATCH 08/22] Rename $pagination-border => $pagination-border-color for clarity --- scss/_pagination.scss | 2 +- scss/_variables.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index a52b9d1e23..124e14acf4 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -18,7 +18,7 @@ color: $pagination-color; text-decoration: none; background-color: $pagination-bg; - border: 1px solid $pagination-border; + border: 1px solid $pagination-border-color; } &:first-child { > a, diff --git a/scss/_variables.scss b/scss/_variables.scss index 5882597a05..6f5283faff 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -393,7 +393,7 @@ $pagination-padding-y-lg: .75rem !default; $pagination-color: $link-color !default; $pagination-bg: #fff !default; -$pagination-border: #ddd !default; +$pagination-border-color: #ddd !default; $pagination-hover-color: $link-hover-color !default; $pagination-hover-bg: $gray-lighter !default; @@ -412,7 +412,7 @@ $pagination-disabled-border: #ddd !default; $pager-bg: $pagination-bg !default; $pager-border-width: $border-width !default; -$pager-border-color: $pagination-border !default; +$pager-border-color: $pagination-border-color !default; $pager-border-radius: 15px !default; $pager-hover-bg: $pagination-hover-bg !default; From 203264d7aff74f966287feecde14125c1feb3c6a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:53:18 -0800 Subject: [PATCH 09/22] Add $pagination-border-width; refs #18150 --- scss/_pagination.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 124e14acf4..282cd48863 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -18,7 +18,7 @@ color: $pagination-color; text-decoration: none; background-color: $pagination-bg; - border: 1px solid $pagination-border-color; + border: $pagination-border-width solid $pagination-border-color; } &:first-child { > a, diff --git a/scss/_variables.scss b/scss/_variables.scss index 6f5283faff..c3d2bdbec0 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -393,6 +393,7 @@ $pagination-padding-y-lg: .75rem !default; $pagination-color: $link-color !default; $pagination-bg: #fff !default; +$pagination-border-width: $border-width !default; $pagination-border-color: #ddd !default; $pagination-hover-color: $link-hover-color !default; From 13ac07a862b94213e65b287ce7548a58da91c4f5 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:54:53 -0800 Subject: [PATCH 10/22] $thumbnail-border => $thumbnail-border-color --- scss/_images.scss | 2 +- scss/_variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_images.scss b/scss/_images.scss index ffcd7086d1..75010e4ad5 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -19,7 +19,7 @@ padding: $thumbnail-padding; line-height: $line-height; background-color: $thumbnail-bg; - border: 1px solid $thumbnail-border; + border: 1px solid $thumbnail-border-color; border-radius: $thumbnail-border-radius; transition: all .2s ease-in-out; @include box-shadow(0 1px 2px rgba(0,0,0,.075)); diff --git a/scss/_variables.scss b/scss/_variables.scss index c3d2bdbec0..18b0376a3e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -588,7 +588,7 @@ $list-group-link-heading-color: #333 !default; $thumbnail-padding: .25rem !default; $thumbnail-bg: $body-bg !default; -$thumbnail-border: #ddd !default; +$thumbnail-border-color: #ddd !default; $thumbnail-border-radius: $border-radius !default; From e3eaeb96e888c8b6c2fb4982db848fc3131bece5 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 22:56:20 -0800 Subject: [PATCH 11/22] Add $thumbnail-border-width; refs #18150 --- scss/_images.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_images.scss b/scss/_images.scss index 75010e4ad5..81e823ca02 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -19,7 +19,7 @@ padding: $thumbnail-padding; line-height: $line-height; background-color: $thumbnail-bg; - border: 1px solid $thumbnail-border-color; + border: $thumbnail-border-width solid $thumbnail-border-color; border-radius: $thumbnail-border-radius; transition: all .2s ease-in-out; @include box-shadow(0 1px 2px rgba(0,0,0,.075)); diff --git a/scss/_variables.scss b/scss/_variables.scss index 18b0376a3e..7cd1b81a95 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -588,6 +588,7 @@ $list-group-link-heading-color: #333 !default; $thumbnail-padding: .25rem !default; $thumbnail-bg: $body-bg !default; +$thumbnail-border-width: $border-width !default; $thumbnail-border-color: #ddd !default; $thumbnail-border-radius: $border-radius !default; From c174d7ab4ec426a739038b1fc5d7747854f9af14 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 23:11:20 -0800 Subject: [PATCH 12/22] Add $popover-border-width; refs #18150 --- scss/_popover.scss | 4 ++-- scss/_variables.scss | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scss/_popover.scss b/scss/_popover.scss index 674a8f31f6..39f5542eda 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -12,7 +12,7 @@ font-size: $font-size-sm; background-color: $popover-bg; background-clip: padding-box; - border: 1px solid $popover-border-color; + border: $popover-border-width solid $popover-border-color; @include border-radius($border-radius-lg); @include box-shadow(0 5px 10px rgba(0,0,0,.2)); @@ -107,7 +107,7 @@ margin: 0; // reset heading margin font-size: $font-size-base; background-color: $popover-title-bg; - border-bottom: 1px solid darken($popover-title-bg, 5%); + border-bottom: $popover-border-width solid darken($popover-title-bg, 5%); @include border-radius(($border-radius-lg - 1) ($border-radius-lg - 1) 0 0); } diff --git a/scss/_variables.scss b/scss/_variables.scss index 7cd1b81a95..13177bc10e 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -479,6 +479,7 @@ $tooltip-arrow-color: $tooltip-bg !default; $popover-bg: #fff !default; $popover-max-width: 276px !default; +$popover-border-width: $border-width !default; $popover-border-color: rgba(0,0,0,.2) !default; $popover-title-bg: darken($popover-bg, 3%) !default; From 6a66d2dd92dd703c0e58b466ff8a5a241f6f5e4d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 14 Nov 2015 23:24:48 -0800 Subject: [PATCH 13/22] Add $table-border-width; refs #18150 --- scss/_tables.scss | 24 ++++++++++++------------ scss/_variables.scss | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scss/_tables.scss b/scss/_tables.scss index d5dccefef5..8ec35b9d40 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -12,16 +12,16 @@ padding: $table-cell-padding; line-height: $line-height; vertical-align: top; - border-top: 1px solid $table-border-color; + border-top: $table-border-width solid $table-border-color; } thead th { vertical-align: bottom; - border-bottom: 2px solid $table-border-color; + border-bottom: (2 * $table-border-width) solid $table-border-color; } tbody + tbody { - border-top: 2px solid $table-border-color; + border-top: (2 * $table-border-width) solid $table-border-color; } .table { @@ -47,17 +47,17 @@ // Add borders all around the table and between all the columns. .table-bordered { - border: 1px solid $table-border-color; + border: $table-border-width solid $table-border-color; th, td { - border: 1px solid $table-border-color; + border: $table-border-width solid $table-border-color; } thead { th, td { - border-bottom-width: 2px; + border-bottom-width: (2 * $table-border-width); } } } @@ -114,7 +114,7 @@ // TODO: find out if we need this still. // - // border: 1px solid $table-border-color; + // border: $table-border-width solid $table-border-color; // -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057 } @@ -160,11 +160,11 @@ th, td { - border-top: 1px solid $table-border-color; - border-left: 1px solid $table-border-color; + border-top: $table-border-width solid $table-border-color; + border-left: $table-border-width solid $table-border-color; &:last-child { - border-right: 1px solid $table-border-color; + border-right: $table-border-width solid $table-border-color; } } @@ -175,7 +175,7 @@ tr:last-child { th, td { - border-bottom: 1px solid $table-border-color; + border-bottom: $table-border-width solid $table-border-color; } } } @@ -187,7 +187,7 @@ th, td { display: block !important; - border: 1px solid $table-border-color; + border: $table-border-width solid $table-border-color; } } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 13177bc10e..870cf00281 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -207,6 +207,7 @@ $table-bg-accent: #f9f9f9 !default; $table-bg-hover: #f5f5f5 !default; $table-bg-active: $table-bg-hover !default; +$table-border-width: $border-width !default; $table-border-color: $gray-lighter !default; From 85c9cc806be3899c544d5925f04611f057c167d0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Nov 2015 01:18:36 -0800 Subject: [PATCH 14/22] .form-control: Use $input-border-width instead of $border-width [skip sauce] --- scss/_forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_forms.scss b/scss/_forms.scss index 32c9c66e03..2df584e5dd 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -14,7 +14,7 @@ background-color: $input-bg; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. background-image: none; - border: $border-width solid $input-border-color; + border: $input-border-width solid $input-border-color; // Note: This has no effect on `s in CSS. @include border-radius($input-border-radius); @include box-shadow($input-box-shadow); From 9da0b7140aea21c0986be5d9db58c30e041ae12c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Nov 2015 01:25:38 -0800 Subject: [PATCH 15/22] Move viewport-dependent padding tweak into main .jumbotron block Refs #18259 [skip sauce] --- scss/_jumbotron.scss | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scss/_jumbotron.scss b/scss/_jumbotron.scss index 97806afed3..b12d465d97 100644 --- a/scss/_jumbotron.scss +++ b/scss/_jumbotron.scss @@ -3,18 +3,16 @@ margin-bottom: $jumbotron-padding; background-color: $jumbotron-bg; @include border-radius($border-radius-lg); + + @include media-breakpoint-up(sm) { + padding: ($jumbotron-padding * 2) $jumbotron-padding; + } } .jumbotron-hr { border-top-color: darken($jumbotron-bg, 10%); } -@include media-breakpoint-up(sm) { - .jumbotron { - padding: ($jumbotron-padding * 2) $jumbotron-padding; - } -} - .jumbotron-fluid { padding-right: 0; padding-left: 0; From e54a9d7e8d89599e4141db880a2a6310fe49d6ad Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Nov 2015 12:43:42 -0800 Subject: [PATCH 16/22] $list-group-border => $list-group-border-color [skip sauce] --- scss/_list-group.scss | 2 +- scss/_variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_list-group.scss b/scss/_list-group.scss index cff9d17b79..e7fefa1fd7 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -20,7 +20,7 @@ // Place the border on the list items and negative margin up for better styling margin-bottom: -$border-width; background-color: $list-group-bg; - border: $border-width solid $list-group-border; + border: $border-width solid $list-group-border-color; // Round the first and last items &:first-child { diff --git a/scss/_variables.scss b/scss/_variables.scss index 870cf00281..4a64b59216 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -568,7 +568,7 @@ $progress-bar-info-bg: $brand-info !default; // List group $list-group-bg: #fff !default; -$list-group-border: #ddd !default; +$list-group-border-color: #ddd !default; $list-group-border-radius: $border-radius !default; $list-group-hover-bg: #f5f5f5 !default; From ca68331b8b1ed803acb4636ef2d5b3bf1f1dae85 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Nov 2015 12:46:35 -0800 Subject: [PATCH 17/22] Add $list-group-border-width; refs #18150 [skip sauce] --- scss/_list-group.scss | 6 +++--- scss/_variables.scss | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scss/_list-group.scss b/scss/_list-group.scss index e7fefa1fd7..8b940adefc 100644 --- a/scss/_list-group.scss +++ b/scss/_list-group.scss @@ -18,9 +18,9 @@ display: block; padding: .75rem 1.25rem; // Place the border on the list items and negative margin up for better styling - margin-bottom: -$border-width; + margin-bottom: -$list-group-border-width; background-color: $list-group-bg; - border: $border-width solid $list-group-border-color; + border: $list-group-border-width solid $list-group-border-color; // Round the first and last items &:first-child { @@ -34,7 +34,7 @@ .list-group-flush { .list-group-item { - border-width: $border-width 0; + border-width: $list-group-border-width 0; border-radius: 0; } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 4a64b59216..c8121f9d74 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -569,6 +569,7 @@ $progress-bar-info-bg: $brand-info !default; $list-group-bg: #fff !default; $list-group-border-color: #ddd !default; +$list-group-border-width: $border-width !default; $list-group-border-radius: $border-radius !default; $list-group-hover-bg: #f5f5f5 !default; From 1e6f23ce922b0310bda5a4a9cf9ebd4ae6881f0c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 15 Nov 2015 14:09:12 -0800 Subject: [PATCH 18/22] Fix #17001 in v4 Refs #18253 [skip sauce] --- scss/_input-group.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scss/_input-group.scss b/scss/_input-group.scss index 3b4ef632cb..ad09d28a89 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -19,6 +19,10 @@ // proper border colors. position: relative; z-index: 2; + // Bring the "active" form control to the front + @include hover-focus-active { + z-index: 3; + } @if $enable-flex { flex: 1; } @else { @@ -160,7 +164,7 @@ } // Bring the "active" button to the front @include hover-focus-active { - z-index: 2; + z-index: 3; } } @@ -176,6 +180,10 @@ > .btn-group { z-index: 2; margin-left: -1px; + // Because specificity + @include hover-focus-active { + z-index: 3; + } } } } From ade2ab13418b2c86aa47a767533e542dc6589aff Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 22 Nov 2015 20:53:34 -0800 Subject: [PATCH 19/22] Remove non-responsive text alignment classes These can be replaced by their `.text-xs-*` parallels. This also avoids any complications from interactions between the responsive and non-responsive classes. (e.g. `
`) Refs #18300 [skip sauce] --- docs/components/card.md | 22 +++++++++++----------- docs/components/utilities.md | 16 +++++++++++++--- docs/content/figures.md | 2 +- docs/content/images.md | 4 ++-- docs/examples/album/index.html | 2 +- docs/examples/carousel/index.html | 4 ++-- docs/layout/grid.md | 10 +++++----- scss/_utilities.scss | 3 --- 8 files changed, 35 insertions(+), 28 deletions(-) diff --git a/docs/components/card.md b/docs/components/card.md index 13f80a736b..3d112c501f 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -130,13 +130,13 @@ You can quickly change the text alignment of any card—in its entirety or speci Go somewhere
-
+

Special title treatment

With supporting text below as a natural lead-in to additional content.

Go somewhere
-
+

Special title treatment

With supporting text below as a natural lead-in to additional content.

Go somewhere @@ -186,7 +186,7 @@ Add an optional header and/or footer within a card. {% endexample %} {% example html %} -
+
Featured
@@ -260,7 +260,7 @@ You can also use `.card-inverse` with the [contextual backgrounds variants](#bac Cards include their own variant classes for quickly changing the `background-color` and `border-color` of a card. **Darker colors require the use of `.card-inverse`.** {% example html %} -
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -268,7 +268,7 @@ Cards include their own variant classes for quickly changing the `background-col
-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -276,7 +276,7 @@ Cards include their own variant classes for quickly changing the `background-col
-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -284,7 +284,7 @@ Cards include their own variant classes for quickly changing the `background-col
-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -292,7 +292,7 @@ Cards include their own variant classes for quickly changing the `background-col
-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

@@ -409,7 +409,7 @@ Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns

Last updated 3 mins ago

-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat.

@@ -419,7 +419,7 @@ Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns
-
+

Card title

This card has supporting text below as a natural lead-in to additional content.

Last updated 3 mins ago

@@ -427,7 +427,7 @@ Cards can be organized into [Masonry](http://masonry.desandro.com)-like columns
Card image
-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.