Merge pull request #35 from rstudio/well-bg

cpsievert · web-flow · commit 39ff000272ae · 2020-01-21T09:24:07.000-06:00
well bg color should be themable via card-bg variable
diff --git a/R/layers.R b/R/layers.R
@@ -69,9 +69,9 @@ bootstrap_javascript <- function(version, minified = TRUE) {
 
 bs3compat_layer <- function() {
   sass_layer(
-    defaults = sass_file(system.file("bs3compat", "_pre_variables.scss", package = "bootstraplib")),
+    defaults = sass_file(system.file("bs3compat", "_defaults.scss", package = "bootstraplib")),
     declarations = sass_file(system.file("bs3compat", "_declarations.scss", package = "bootstraplib")),
-    rules = sass_file(system.file("bs3compat", "_post_variables.scss", package = "bootstraplib")),
+    rules = sass_file(system.file("bs3compat", "_rules.scss", package = "bootstraplib")),
     # Gyliphicon font files
     file_attachments = c(
       fonts = system.file("node_modules/bootstrap-sass/assets/fonts", package = "bootstraplib")
diff --git a/inst/bs3compat/_components_compat.scss b/inst/bs3compat/_components_compat.scss
@@ -1,5 +1,7 @@
 .well {
-  @extend .bg-light; @extend .card; @extend .p-3;
+  @extend .card;
+  background-color: $well-bg;
+  padding: map-get($spacers, 3);
 }
 
 .help-text, .help-block {
diff --git a/inst/bs3compat/_declarations.scss b/inst/bs3compat/_declarations.scss
@@ -21,3 +21,9 @@ $default: null !default;
 }
 
 $theme-colors: map-merge(("default": $default), $theme-colors);
+
+
+// Cards are white by default, but we want a smarter default for .well
+// that it appears similar to $light with no theming, but is also smart enough
+// to respond to changes in foreground color
+$well-bg: rgba($body-color, 0.1) !default;
diff --git a/inst/bs3compat/_defaults.scss b/inst/bs3compat/_defaults.scss
diff --git a/inst/bs3compat/_rules.scss b/inst/bs3compat/_rules.scss
diff --git a/inst/bs3compat/_shiny_misc.scss b/inst/bs3compat/_shiny_misc.scss
@@ -1,6 +1,8 @@
 // For verbatimTextOutput()
 pre.shiny-text-output {
-  @extend .bg-light; @extend .card; @extend .p-2;
+  @extend .card;
+  background-color: $well-bg;
+  padding: map-get($spacers, 2);
 }
 
 // For code inside of showcase mode

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`.well {`
`2`		`- @extend .bg-light; @extend .card; @extend .p-3;`
	`2`	`+ @extend .card;`
	`3`	`+ background-color: $well-bg;`
	`4`	`+ padding: map-get($spacers, 3);`
`3`	`5`	`}`
`4`	`6`
`5`	`7`	`.help-text, .help-block {`
Original file line number	Diff line number	Diff line change
`@@ -21,3 +21,9 @@ $default: null !default;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`$theme-colors: map-merge(("default": $default), $theme-colors);`
	`24`	`+`
	`25`	`+`
	`26`	`+// Cards are white by default, but we want a smarter default for .well`
	`27`	`+// that it appears similar to $light with no theming, but is also smart enough`
	`28`	`+// to respond to changes in foreground color`
	`29`	`+$well-bg: rgba($body-color, 0.1) !default;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`// For verbatimTextOutput()`
`2`	`2`	`pre.shiny-text-output {`
`3`		`- @extend .bg-light; @extend .card; @extend .p-2;`
	`3`	`+ @extend .card;`
	`4`	`+ background-color: $well-bg;`
	`5`	`+ padding: map-get($spacers, 2);`
`4`	`6`	`}`
`5`	`7`
`6`	`8`	`// For code inside of showcase mode`