Skip to content

Commit 62f0000

Browse files
authored
chore: Update Sass from bslib (#1809)
1 parent 41b8797 commit 62f0000

File tree

13 files changed

+135
-108
lines changed

13 files changed

+135
-108
lines changed

scripts/_pkg-sources.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
list(
2-
bslib = "rstudio/bslib@main",
3-
shiny = "rstudio/shiny@main",
2+
bslib = "rstudio/bslib@b54bfb5de82f76bc044c4c661995af3a63e7ab29",
3+
shiny = "rstudio/shiny@c489fef4ff46fc37eb2a7c447a7108afde7ad124",
44
sass = "sass",
55
htmltools = "rstudio/htmltools@main"
66
)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
33
"shiny_version": "1.9.1.9000 (rstudio/shiny@c489fef4ff46fc37eb2a7c447a7108afde7ad124)",
4-
"bslib_version": "0.8.0.9000 (rstudio/bslib@7ff88a1e2a88fc7c6289059dd247ce88512f8231)",
4+
"bslib_version": "0.8.0.9000 (rstudio/bslib@b54bfb5de82f76bc044c4c661995af3a63e7ab29)",
55
"htmltools_version": "0.5.8.9000 (rstudio/htmltools@487aa0bed7313d7597b6edd5810e53cab0061198)",
66
"bootstrap_version": "5.3.1"
77
}

shiny/www/shared/bootstrap/bootstrap.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/shared/bootstrap/font.css

Lines changed: 84 additions & 84 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"note!": "Generated by scripts/htmlDependencies.R: do not edit by hand",
33
"package": "bslib",
4-
"version": "0.8.0.9000 (rstudio/bslib@7ff88a1e2a88fc7c6289059dd247ce88512f8231)"
4+
"version": "0.8.0.9000 (rstudio/bslib@b54bfb5de82f76bc044c4c661995af3a63e7ab29)"
55
}

shiny/www/shared/bslib/components/components.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/shared/bslib/components/components.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/shared/bslib/components/web-components.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/shared/bslib/components/web-components.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/shared/sass/bslib/builtin/bs5/shiny/_rules.scss

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,9 @@ $bslib-checkbox-radio-margin-right: 0.35em !default;
130130
@if $bslib-dashboard-design {
131131

132132
:root {
133-
--bslib-dashboard-sidebar-bg: var(--#{$prefix}body-bg);
134-
--bslib-dashboard-sidebar-main-bg: var(--#{$prefix}body-bg);
135133
--bslib-dashboard-main-bg: rgb(247, 247, 247);
136134
--#{$prefix}card-border-color: var(--bslib-dashboard-border-color-translucent, var(--#{$prefix}border-color-translucent));
137135
--bslib-dashboard-card-header-font-weight: #{$font-weight-semibold};
138-
--bslib-sidebar-bg: RGBA(var(--#{$prefix}body-bg-rgb), 0.05);
139136
}
140137

141138
@include color-mode(dark) {
@@ -178,8 +175,12 @@ $bslib-checkbox-radio-margin-right: 0.35em !default;
178175

179176
.bslib-page-navbar, .bslib-page-dashboard {
180177
> .navbar {
181-
--bslib-navbar-default-bg: var(--#{$prefix}body-bg);
182-
--bslib-navbar-inverse-bg: var(--#{$prefix}body-color);
178+
@if not $navbar-light-bg and not $navbar-bg {
179+
--bslib-navbar-default-bg: var(--#{$prefix}body-bg);
180+
}
181+
@if not $navbar-dark-bg and not $navbar-bg {
182+
--bslib-navbar-inverse-bg: var(--#{$prefix}body-color);
183+
}
183184
}
184185

185186
> .navbar + div {
@@ -196,8 +197,10 @@ $bslib-checkbox-radio-margin-right: 0.35em !default;
196197
}
197198

198199
.bslib-page-sidebar {
199-
--bslib-page-sidebar-title-bg: var(--#{$prefix}body-bg);
200-
--bslib-page-sidebar-title-color: var(--#{$prefix}body-color);
200+
@if not $navbar-bg {
201+
--bslib-page-sidebar-title-bg: var(--#{$prefix}body-bg);
202+
--bslib-page-sidebar-title-color: var(--#{$prefix}body-color);
203+
}
201204

202205
.bslib-page-title {
203206
border-color: var(--#{$prefix}border-color-translucent);

0 commit comments

Comments
 (0)