Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified R/sysdata.rda
Binary file not shown.
12 changes: 8 additions & 4 deletions R/utils-deps.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,19 @@ component_dependency_sass <- function(theme) {
}
}

component_dependency_sass_ <- function(theme) {
component_dependency_sass_layer <- function() {
Comment thread
gadenbuie marked this conversation as resolved.
Outdated
scss_dir <- path_inst("components", "scss")
scss_files <- c(
file.path(scss_dir, "mixins", "_mixins.scss"),
dir(scss_dir, pattern = "\\.scss$", full.names = TRUE)
)

# Although rare, it's possible for bs_dependency_defer() to pass
# along a NULL theme (e.g., renderTags(accordion())), so fallback
lapply(scss_files, sass_file)
}

component_dependency_sass_ <- function(theme) {
# Although rare, it's possible for bs_dependency_defer() to pass
# along a NULL theme (e.g., renderTags(accordion())), so fallback
# to the default theme if need be
theme <- theme %||% bs_theme()

Expand All @@ -65,7 +69,7 @@ component_dependency_sass_ <- function(theme) {
}

bs_dependency(
input = lapply(scss_files, sass_file),
input = component_dependency_sass_layer(),
theme = theme,
name = "bslib-component-css",
version = get_package_version("bslib"),
Expand Down
4 changes: 0 additions & 4 deletions inst/builtin/bs5/shiny/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@ $accordion-button-active-bg: null;
$accordion-button-active-color: null;
$accordion-icon-active-color: null;

// Shiny: selectInput() and selectizeInput()
$selectize-color-dropdown-item-active: $component-active-bg !default;
$selectize-color-dropdown-item-active-text: $component-active-color !default;

Comment thread
gadenbuie marked this conversation as resolved.
// Component Variables
@import "ionrangeslider/_variables.scss";
Binary file modified inst/fonts/1Ptug8zYS_SKggPNyC0ITw.woff2
Binary file not shown.
Binary file modified inst/fonts/1Ptug8zYS_SKggPNyCAIT5lu.woff2
Binary file not shown.
Binary file modified inst/fonts/1Ptug8zYS_SKggPNyCIIT5lu.woff2
Binary file not shown.
Binary file modified inst/fonts/1Ptug8zYS_SKggPNyCMIT5lu.woff2
Binary file not shown.
Binary file modified inst/fonts/1Ptug8zYS_SKggPNyCkIT5lu.woff2
Binary file not shown.