Skip to content

Commit e05de18

Browse files
committed
chore: use bslib assets from main
1 parent 041bf0f commit e05de18

File tree

9 files changed

+27
-9
lines changed

9 files changed

+27
-9
lines changed

scripts/_pkg-sources.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
list(
2-
bslib = "rstudio/bslib@feat/toasts",
2+
bslib = "rstudio/bslib@main",
33
shiny = "rstudio/shiny@main",
44
sass = "sass",
55
htmltools = "rstudio/htmltools@main"

shiny/www/shared/_version.json

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": "shiny",
4-
"version": "1.11.1.9001 (rstudio/shiny@b56c275364c8a7e609274a61b775ef2e003f6399)"
4+
"version": "1.11.1.9001 (rstudio/shiny@e3cf4fb0892e091689f07fcf35b16da27e363f20)"
55
}
Lines changed: 2 additions & 2 deletions
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",
3-
"shiny_version": "1.11.1.9001 (rstudio/shiny@b56c275364c8a7e609274a61b775ef2e003f6399)",
4-
"bslib_version": "0.9.0.9002 (rstudio/bslib@1066aa86f4cba69c717c4c7423efd27ddb150a5f)",
3+
"shiny_version": "1.11.1.9001 (rstudio/shiny@e3cf4fb0892e091689f07fcf35b16da27e363f20)",
4+
"bslib_version": "0.9.0.9002 (rstudio/bslib@8988ac9fa787060f6a26d531e336ab7f5ac829f2)",
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.
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.9.0.9002 (rstudio/bslib@1066aa86f4cba69c717c4c7423efd27ddb150a5f)"
4+
"version": "0.9.0.9002 (rstudio/bslib@8988ac9fa787060f6a26d531e336ab7f5ac829f2)"
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/sass/bslib/components/scss/card.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,24 @@
2727
}
2828

2929
.card-header {
30+
display: flex;
31+
flex-direction: row;
32+
align-items: center;
33+
align-self: stretch;
34+
gap: 0.25rem;
35+
36+
// Give the nav flex: 1 so that if the card header contains a nav, it will take all the available space
37+
// and correctly push items to the right if `nav_spacer` is used
38+
> .nav {
39+
flex: 1;
40+
min-width: 0; // Prevent flex item from overflowing
41+
}
42+
43+
// Ensures that nav_spacer() correctly pushes subsequent items to the right in card headers
44+
> .bslib-nav-spacer {
45+
margin-left: auto;
46+
}
47+
3048
.form-group {
3149
margin-bottom: 0;
3250
}

shiny/www/shared/sass/preset/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/sass/preset/shiny/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.

0 commit comments

Comments
 (0)