Follow up to #3366: don't change sliderInput()'s default accent color

rstudio · Jun 15, 2021 · e089e73 · e089e73
1 parent b3247d5
commit e089e73
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/R/input-slider.R b/R/input-slider.R
@@ -229,8 +229,11 @@ ionRangeSliderDependencyCSS <- function(theme) {
   }
 
   bslib::bs_dependency(
-    input = sass::sass_file(
-      system.file(package = "shiny", "www/shared/ionrangeslider/scss/shiny.scss")
+    input = list(
+      list(accent = "$component-active-bg"),
+      sass::sass_file(
+        system.file(package = "shiny", "www/shared/ionrangeslider/scss/shiny.scss")
+      )
     ),
     theme = theme,
     name = "ionRangeSlider",

diff --git a/inst/www/shared/ionrangeslider/css/ion.rangeSlider.css b/inst/www/shared/ionrangeslider/css/ion.rangeSlider.css
@@ -172,9 +172,9 @@
 .irs--shiny .irs-bar {
   top: 25px;
   height: 8px;
-  border-top: 1px solid #337ab7;
-  border-bottom: 1px solid #337ab7;
-  background: #337ab7;
+  border-top: 1px solid #428bca;
+  border-bottom: 1px solid #428bca;
+  background: #428bca;
 }
 
 .irs--shiny .irs-bar--single {
@@ -228,7 +228,7 @@
   color: #fff;
   text-shadow: none;
   padding: 1px 3px;
-  background-color: #337ab7;
+  background-color: #428bca;
   border-radius: 3px;
   font-size: 11px;
   line-height: 1.333;

diff --git a/inst/www/shared/ionrangeslider/scss/shiny.scss b/inst/www/shared/ionrangeslider/scss/shiny.scss
@@ -37,7 +37,7 @@ $font-family: $font-family-base !default;
   // "High-level" coloring
   $bg:     $body-bg !default;
   $fg:     color-contrast($body-bg) !default;
-  $accent: $component-active-bg !default;
+  $accent: #428bca !default;
 
   // "Low-level" coloring, borders, and fonts
   $line_bg:            linear-gradient(to bottom, mix($bg, $fg, 87%) -50%, $bg 150%) !default;

diff --git a/tools/ion.rangeSlider-patches/0001-Add-skin-customized-for-Shiny.patch b/tools/ion.rangeSlider-patches/0001-Add-skin-customized-for-Shiny.patch
@@ -43,7 +43,7 @@ index 00000000..ba052f8b
 +  // "High-level" coloring
 +  $bg:     $body-bg !default;
 +  $fg:     color-contrast($body-bg) !default;
-+  $accent: $component-active-bg !default;
++  $accent: #428bca !default;
 +
 +  // "Low-level" coloring, borders, and fonts
 +  $line_bg:            linear-gradient(to bottom, mix($bg, $fg, 87%) -50%, $bg 150%) !default;