Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(bootswatch): Exclude .btn-light from .btn-default extension of .btn-secondary #687

Merged
merged 4 commits into from
Jul 17, 2023
Merged

fix(bootswatch): Exclude .btn-light from .btn-default extension of .btn-secondary #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bede56b
fix(bootswatch): Exclude `.btn-light` from `.btn-default` extension o…
gadenbuie Jul 17, 2023
302ffb8
chore(bootswatch-preset): Simplify finding `btn-outline-` classes
gadenbuie Jul 17, 2023
e3ae428
fix(typo)
gadenbuie Jul 17, 2023
cedec82
docs: Add NEWS item
gadenbuie Jul 17, 2023
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
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* Closed #636: Outputs in sidebars now work as expected when an initially-closed sidebar is opened. (#624)
* Closed #640: `accordion()` no longer errors when an `id` isn't supplied inside a Shiny `session` context. (#646)
* Closed #639: `nav_panel()`'s `icon` argument now supports generic `HTML()`, meaning that things like `bsicons::bs_icon()` and `fontawesome::fa()` can be used as values. (#645)
* Light-styled buttons in bslib-provided Bootswatch themes are now consistent with their design in Bootswatch. Previously, they were inadvertently styled similarly to secondary buttons. (#687)

# bslib 0.5.0

Expand Down
2 changes: 1 addition & 1 deletion R/bs-theme-preset-bootswatch.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ bootswatch_bundle <- function(bootswatch, version) {
if (identical(bootswatch, "sketchy")) ".dropdown-menu{ overflow: inherit; }" else "",
# Several Bootswatch themes (e.g., zephyr, simplex, etc) add custom .btn-secondary
# rules that should also apply to .btn-default
".btn-default:not(.btn-primary):not(.btn-info):not(.btn-success):not(.btn-warning):not(.btn-danger):not(.btn-dark):not(.btn-outline-primary):not(.btn-outline-info):not(.btn-outline-success):not(.btn-outline-warning):not(.btn-outline-danger):not(.btn-outline-dark) {
".btn-default:not(.btn-primary):not(.btn-info):not(.btn-success):not(.btn-warning):not(.btn-danger):not(.btn-dark):not(.btn-light):not([class*='btn-outline-']) {
@extend .btn-secondary !optional;
}"
)
Expand Down
Loading