diff --git a/inst/lib/bs4/scss/_variables.scss b/inst/lib/bs4/scss/_variables.scss index dde6f2faa..ecf2386bd 100644 --- a/inst/lib/bs4/scss/_variables.scss +++ b/inst/lib/bs4/scss/_variables.scss @@ -66,7 +66,7 @@ $colors: map-merge( $colors ); -// Semantically, $secondary is closest to BS3's 'default' theme color; +// Semantically, $secondary is closest to BS3's 'default' theme color; // so use that if specified. Otherwise, use a light instead of dark gray // default color for $default since that's closer to bootstrap 3's default $default: if(variable-exists("secondary"), $secondary, $gray-300) !default; diff --git a/inst/lib/bs5/scss/_variables.scss b/inst/lib/bs5/scss/_variables.scss index 77bef7668..76593a66f 100644 --- a/inst/lib/bs5/scss/_variables.scss +++ b/inst/lib/bs5/scss/_variables.scss @@ -66,7 +66,7 @@ $colors: ( ) !default; // scss-docs-end colors-map -// Semantically, $secondary is closest to BS3's 'default' theme color; +// Semantically, $secondary is closest to BS3's 'default' theme color; // so use that if specified. Otherwise, use a light instead of dark gray // default color for $default since that's closer to bootstrap 3's default $default: if(variable-exists("secondary"), $secondary, $gray-300) !default; diff --git a/inst/lib/bsw5/dist/cerulean/_bootswatch.scss b/inst/lib/bsw5/dist/cerulean/_bootswatch.scss index 169696a43..be26e7d52 100644 --- a/inst/lib/bsw5/dist/cerulean/_bootswatch.scss +++ b/inst/lib/bsw5/dist/cerulean/_bootswatch.scss @@ -6,14 +6,6 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default; -// See inst/bs3compat/_declarations.scss -// It's very important that this come before other btn-* rules -@if variable-exists("default") { - .btn-default { - @include btn-shadow($default); - } -} - // Mixins @mixin btn-shadow($color){ @@ -45,6 +37,13 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default; text-shadow: $text-shadow; } +// It's very important that this come before other btn-* rules +@if variable-exists("default") { + .btn-default { + @include btn-shadow($default); + } +} + .btn-primary { @include btn-shadow($primary); } diff --git a/tools/patches/006-bootswatch-cerulean-bs5.patch b/tools/patches/006-bootswatch-cerulean-bs5.patch index 0f70114d7..7424b919d 100644 --- a/tools/patches/006-bootswatch-cerulean-bs5.patch +++ b/tools/patches/006-bootswatch-cerulean-bs5.patch @@ -1,12 +1,11 @@ diff --git a/inst/lib/bsw5/dist/cerulean/_bootswatch.scss b/inst/lib/bsw5/dist/cerulean/_bootswatch.scss -index 8eda79b..169696a 100644 +index 8eda79b..be26e7d 100644 --- a/inst/lib/bsw5/dist/cerulean/_bootswatch.scss +++ b/inst/lib/bsw5/dist/cerulean/_bootswatch.scss -@@ -6,6 +6,14 @@ +@@ -37,6 +37,13 @@ $text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default; + text-shadow: $text-shadow; + } - $text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default; - -+// See inst/bs3compat/_declarations.scss +// It's very important that this come before other btn-* rules +@if variable-exists("default") { + .btn-default { @@ -14,6 +13,6 @@ index 8eda79b..169696a 100644 + } +} + - // Mixins - - @mixin btn-shadow($color){ + .btn-primary { + @include btn-shadow($primary); + }