From be1bb9ec3efb202b6f99b8e2ac12fef4587a50ec Mon Sep 17 00:00:00 2001 From: Chris Bell Date: Thu, 15 Oct 2015 15:57:15 +0100 Subject: #17895 Added $alert-border-width that defaults to $border-width --- scss/_alert.scss | 2 +- scss/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_alert.scss b/scss/_alert.scss index 8e550d8f7..b9f6c60da 100644 --- a/scss/_alert.scss +++ b/scss/_alert.scss @@ -5,7 +5,7 @@ .alert { padding: $alert-padding; margin-bottom: $spacer-y; - border: 1px solid transparent; + border: $alert-border-width solid transparent; @include border-radius($alert-border-radius); // Improve alignment and spacing of inner content diff --git a/scss/_variables.scss b/scss/_variables.scss index dd331d9bc..26db18460 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -525,6 +525,7 @@ $modal-sm: 300px !default; $alert-padding: 15px !default; $alert-border-radius: $border-radius !default; $alert-link-font-weight: bold !default; +$alert-border-width: $border-width !default; $alert-success-bg: $state-success-bg !default; $alert-success-text: $state-success-text !default; -- cgit v1.2.3 From 94043ac71cd92759a927d4336f29699f8d30a5fc Mon Sep 17 00:00:00 2001 From: Matthew Conlen Date: Mon, 26 Oct 2015 13:40:08 -0400 Subject: remove bro from comment --- scss/_dropdown.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index aa1a9d1b3..6338de6d7 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -170,7 +170,7 @@ // Allow for dropdowns to go bottom up (aka, dropup-menu) // -// Just add .dropup after the standard .dropdown class and you're set, bro. +// Just add .dropup after the standard .dropdown class and you're set. // TODO: abstract this so that the navbar fixed styles are not placed here? .dropup, -- cgit v1.2.3 From 4264621cee139591c2b856c863393b1cdacfb7aa Mon Sep 17 00:00:00 2001 From: Almir Sarajcic Date: Wed, 28 Oct 2015 16:27:49 +0100 Subject: Fix #17768 --- scss/mixins/_forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 8a59e04f6..eab8063e0 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -5,7 +5,7 @@ @mixin form-control-validation($color) { // Color the label and help text - .help-block, + .text-help, .form-control-label, .radio, .checkbox, -- cgit v1.2.3 From 61e9a01a28a0d59cd426bc2edeead279ca75a41a Mon Sep 17 00:00:00 2001 From: AndersMad Date: Wed, 28 Oct 2015 21:54:56 +0100 Subject: Card fix static -> variable border radius Changed card border radius image caps to use variable rather than static values --- scss/_card.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scss') diff --git a/scss/_card.scss b/scss/_card.scss index aff6036a0..66851eb2b 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -169,10 +169,10 @@ // Card image caps .card-img-top { - @include border-radius(.25rem .25rem 0 0); + @include border-radius($card-border-radius-inner $card-border-radius-inner 0 0); } .card-img-bottom { - @include border-radius(0 0 .25rem .25rem); + @include border-radius(0 0 $card-border-radius-inner $card-border-radius-inner); } -- cgit v1.2.3 From 920f7fd695cd5efca346b518a91e47218f16290c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 12 Nov 2015 23:43:13 -0800 Subject: Revert "Drop cursor pointer for button role" This reverts commit 61067304cd8ad4394af69003971b4e9c3aa94c55. The normalize.css pull request (https://github.com/necolas/normalize.css/pull/379 ) was REJECTED, *NOT* merged! --- scss/_reboot.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'scss') diff --git a/scss/_reboot.scss b/scss/_reboot.scss index ae183e7ea..e4db70a9a 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -196,6 +196,17 @@ img { } +// iOS "clickable elements" fix for role="button" +// +// Fixes "clickability" issue (and more generally, the firing of events such as focus as well) +// for traditionally non-focusable elements with role="button" +// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile +// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged + +[role="button"] { + cursor: pointer; +} + // // Tables // -- cgit v1.2.3 From 5abd4e01422f9c35523fbea4914347ec02a9cd73 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 12 Nov 2015 23:46:29 -0800 Subject: Ports c256aca13cf6ff1c3c1d5933b28423bc144f1fc1 to v4 Refs #15947, #17542 [ci skip] --- scss/_reboot.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'scss') diff --git a/scss/_reboot.scss b/scss/_reboot.scss index e4db70a9a..58fd54c68 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -201,7 +201,6 @@ img { // Fixes "clickability" issue (and more generally, the firing of events such as focus as well) // for traditionally non-focusable elements with role="button" // see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile -// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged [role="button"] { cursor: pointer; -- cgit v1.2.3 From 0cdb20486729a7025a842f8c985678bd82a19fd1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 13 Nov 2015 00:17:25 -0800 Subject: scss/_card.scss: Remove trailing whitespace [ci skip] --- scss/_card.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_card.scss b/scss/_card.scss index 1f7e04e1e..75e4513b3 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -257,7 +257,7 @@ } &:last-child { @include border-left-radius(0); - + .card-img-top { border-top-left-radius: 0; } -- cgit v1.2.3 From 98ec749117206af8be831d7aa5df3bc7544a4a30 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 13 Nov 2015 00:19:19 -0800 Subject: Swap margin-right and margin-left ordering in .dropdown-toggle::after to make SCSS Lint happy [ci skip] --- scss/_dropdown.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 35b125060..fc2b810e4 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -10,8 +10,8 @@ display: inline-block; width: 0; height: 0; - margin-left: .25rem; margin-right: .25rem; + margin-left: .25rem; vertical-align: middle; content: ""; border-top: $caret-width solid; -- cgit v1.2.3 From 2315bc60521936f030e91f70b91b50c142b920c4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 13 Nov 2015 00:20:03 -0800 Subject: scss/_nav.scss: Remove trailing whitespace [ci skip] --- scss/_nav.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_nav.scss b/scss/_nav.scss index 90d02b254..5714c77eb 100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@ -92,7 +92,7 @@ .nav-pills { @include clearfix(); - + .nav-item { float: left; -- cgit v1.2.3 From 6d591edcb7540eff05b21ef53205aa8517080432 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 13 Nov 2015 00:21:43 -0800 Subject: .dropdown-menu: Swap color and font-size property order to make SCSS Lint happy --- scss/_dropdown.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index fc2b810e4..c477dfb17 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -45,8 +45,8 @@ min-width: 160px; padding: 5px 0; margin: 2px 0 0; // override default ul - color: $body-color; font-size: $font-size-base; + color: $body-color; text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) list-style: none; background-color: $dropdown-bg; -- cgit v1.2.3 From 0d34169e1f1126c0e752694905c037278402e0c8 Mon Sep 17 00:00:00 2001 From: Bass Jobsen Date: Mon, 2 Nov 2015 20:56:24 +0100 Subject: Refactor figure image styles to use CSS class instead of child selector Refactoring according the comments on https://github.com/twbs/bootstrap/pull/18104. Closes #18131 --- scss/_images.scss | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'scss') diff --git a/scss/_images.scss b/scss/_images.scss index ac481d58d..ffcd7086d 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -40,12 +40,11 @@ .figure { // Ensures the caption's text aligns with the image. display: inline-block; +} - > img { - @extend .img-fluid; - margin-bottom: ($spacer-y / 2); - line-height: 1; - } +.figure-img { + margin-bottom: ($spacer-y / 2); + line-height: 1; } .figure-caption { -- cgit v1.2.3