From 6293dd41cff6f3e2e06c5cfb9e3ceb631c737990 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 9 Jan 2016 15:26:02 -0800 Subject: [PATCH 1/6] Extract $kbd-box-shadow variable --- scss/_code.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_code.scss b/scss/_code.scss index 60bbcae81e..a9ddb4c0f5 100644 --- a/scss/_code.scss +++ b/scss/_code.scss @@ -22,7 +22,7 @@ kbd { color: $kbd-color; background-color: $kbd-bg; @include border-radius($border-radius-sm); - @include box-shadow(inset 0 -.1rem 0 rgba(0,0,0,.25)); + @include box-shadow($kbd-box-shadow); kbd { padding: 0; diff --git a/scss/_variables.scss b/scss/_variables.scss index 4deb70019d..55104049db 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -191,6 +191,7 @@ $hr-border-width: $border-width !default; $dt-font-weight: bold !default; +$kbd-box-shadow: inset 0 -.1rem 0 rgba(0,0,0,.25) !default; $nested-kbd-font-weight: bold !default; $list-inline-padding: 5px !default; From a5b41e7254de30800ea2ccfcba3b8584e6c2f9e5 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 9 Jan 2016 15:27:56 -0800 Subject: [PATCH 2/6] Extract $btn-box-shadow variable --- scss/_variables.scss | 1 + scss/mixins/_buttons.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 55104049db..a55d197ec4 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -238,6 +238,7 @@ $table-border-color: $gray-lighter !default; $btn-padding-x: 1rem !default; $btn-padding-y: .375rem !default; $btn-font-weight: normal !default; +$btn-box-shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075) !default; $btn-active-box-shadow: inset 0 3px 5px rgba(0,0,0,.125) !default; $btn-primary-color: #fff !default; diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss index ec250c464c..21240dd932 100644 --- a/scss/mixins/_buttons.scss +++ b/scss/mixins/_buttons.scss @@ -10,7 +10,7 @@ color: $color; background-color: $background; border-color: $border; - @include box-shadow(inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075)); + @include box-shadow($btn-box-shadow); @include hover { color: $color; From 58f7e602aeff9bcea370f29bc1a6e50314b6784c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 9 Jan 2016 15:31:29 -0800 Subject: [PATCH 3/6] Extract $dropdown-box-shadow variable --- 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 d9776d59c6..6c50c94fb7 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -53,7 +53,7 @@ background-clip: padding-box; border: $dropdown-border-width solid $dropdown-border-color; @include border-radius($border-radius); - @include box-shadow(0 6px 12px rgba(0,0,0,.175)); + @include box-shadow($dropdown-box-shadow); } // Dividers (basically an `
`) within the dropdown diff --git a/scss/_variables.scss b/scss/_variables.scss index a55d197ec4..e906596fc8 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -343,6 +343,7 @@ $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-box-shadow: 0 6px 12px rgba(0,0,0,.175) !default; $dropdown-link-color: $gray-dark !default; $dropdown-link-hover-color: darken($gray-dark, 5%) !default; From 9b2d9f6e04de2d5a8316556af054cdd2f74da5c0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 9 Jan 2016 15:33:13 -0800 Subject: [PATCH 4/6] Extract $popover-box-shadow variable --- scss/_popover.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_popover.scss b/scss/_popover.scss index 4e8ed44992..303850cc0c 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -14,7 +14,7 @@ background-clip: padding-box; 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)); + @include box-shadow($popover-box-shadow); // Popover directions diff --git a/scss/_variables.scss b/scss/_variables.scss index e906596fc8..0cfa0d8bde 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -503,6 +503,7 @@ $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-box-shadow: 0 5px 10px rgba(0,0,0,.2) !default; $popover-title-bg: darken($popover-bg, 3%) !default; $popover-title-padding-x: 14px !default; From bbd449994a1a25ab8db041d916e94d46d453d499 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 9 Jan 2016 15:35:19 -0800 Subject: [PATCH 5/6] Extract $thumbnail-box-shadow variable --- 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 81e823ca02..60e8fc9b57 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -22,7 +22,7 @@ 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)); + @include box-shadow($thumbnail-box-shadow); // Keep them at most 100% wide @include img-fluid(inline-block); diff --git a/scss/_variables.scss b/scss/_variables.scss index 0cfa0d8bde..a09a79a7cc 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -623,6 +623,7 @@ $thumbnail-bg: $body-bg !default; $thumbnail-border-width: $border-width !default; $thumbnail-border-color: #ddd !default; $thumbnail-border-radius: $border-radius !default; +$thumbnail-box-shadow: 0 1px 2px rgba(0,0,0,.075) !default; // Breadcrumbs From 802c1cb5fcda09f78aec92e32d764eccda7a7927 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 9 Jan 2016 15:39:41 -0800 Subject: [PATCH 6/6] Extract variables for .modal-content box-shadow [skip sauce] [skip validator] --- scss/_modal.scss | 4 ++-- scss/_variables.scss | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scss/_modal.scss b/scss/_modal.scss index c88d085c9e..c43d55b5ac 100644 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@ -50,7 +50,7 @@ background-clip: padding-box; border: 1px solid $modal-content-border-color; @include border-radius($border-radius-lg); - @include box-shadow(0 3px 9px rgba(0,0,0,.5)); + @include box-shadow($modal-content-xs-box-shadow); // Remove focus outline from opened modal outline: 0; } @@ -134,7 +134,7 @@ margin: 30px auto; } .modal-content { - @include box-shadow(0 5px 15px rgba(0,0,0,.5)); + @include box-shadow($modal-content-sm-up-box-shadow); } // Modal sizes diff --git a/scss/_variables.scss b/scss/_variables.scss index a09a79a7cc..62515deaac 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -541,8 +541,10 @@ $modal-inner-padding: 15px !default; $modal-title-padding: 15px !default; $modal-title-line-height: $line-height !default; -$modal-content-bg: #fff !default; -$modal-content-border-color: rgba(0,0,0,.2) !default; +$modal-content-bg: #fff !default; +$modal-content-border-color: rgba(0,0,0,.2) !default; +$modal-content-xs-box-shadow: 0 3px 9px rgba(0,0,0,.5) !default; +$modal-content-sm-up-box-shadow: 0 5px 15px rgba(0,0,0,.5) !default; $modal-backdrop-bg: #000 !default; $modal-backdrop-opacity: .5 !default;