diff --git a/NEWS.md b/NEWS.md index ae11a39297..be67dcf47f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -7,6 +7,8 @@ shiny 1.6.0.9000 * The `format` and `locale` arguments to `sliderInput()` have been removed. They have been deprecated since 0.10.2.2 (released on 2014-12-08). +* Closed #3403: `insertTab()` with `target = NULL` now inserts the `tab` before (instead of after) the tabset when `position = "before"` (which is the default). (#3404) + ### New features and improvements * Bootstrap 5 support. (#3410 and rstudio/bslib#304) diff --git a/R/input-slider.R b/R/input-slider.R index df6931baed..3f439576c4 100644 --- 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/R/insert-tab.R b/R/insert-tab.R index 52f3bd0adf..edee27380a 100644 --- a/R/insert-tab.R +++ b/R/insert-tab.R @@ -137,14 +137,14 @@ insertTab <- function(inputId, tab, target = NULL, #' @export prependTab <- function(inputId, tab, select = FALSE, menuName = NULL, session = getDefaultReactiveDomain()) { - bslib::tab_prepend(inputId, tab, menu_title = menuName, select = select, session = session) + bslib::nav_prepend(inputId, tab, menu_title = menuName, select = select, session = session) } #' @rdname insertTab #' @export appendTab <- function(inputId, tab, select = FALSE, menuName = NULL, session = getDefaultReactiveDomain()) { - bslib::tab_append(inputId, tab, menu_title = menuName, select = select, session = session) + bslib::nav_append(inputId, tab, menu_title = menuName, select = select, session = session) } #' @rdname insertTab diff --git a/inst/www/shared/ionrangeslider/css/ion.rangeSlider.css b/inst/www/shared/ionrangeslider/css/ion.rangeSlider.css index 1f19414f7e..ae1934f29e 100644 --- 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 index ba052f8b4d..91ab339f05 100644 --- 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/tests/testthat/_snaps/tabPanel.md b/tests/testthat/_snaps/tabPanel.md index ffdc489ae1..5d19e6dbfc 100644 --- a/tests/testthat/_snaps/tabPanel.md +++ b/tests/testthat/_snaps/tabPanel.md @@ -313,10 +313,10 @@ Output
-
A div
-
a
+
A div
+
a
b
c
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 index 513bd98aed..fdbf2aeaa2 100644 --- 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;