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.

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

feat(gap-spacing): Apply gap spacing margin-bottom rules to conditionalPanel too #1031

Merged
merged 6 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

* `tooltip()` and `popover()` now work as expected when inserted into a navbar/navset via `nav_insert()`. (#1020)

* `uiOutput()` no longer yields unwanted double padding when it's parent container uses `gap` for spacing multiple elements (e.g., `layout_columns()`, `page_fillable()`, etc). (#992)
* `uiOutput()` and `conditionalPanel()` no longer result in unwanted double padding when their parent container uses `gap` for spacing multiple elements (e.g., `layout_columns()`, `page_fillable()`, etc). (#992, #1031)

* `page_navbar()` and `navset_bar()` now validate and transform `padding` and `gap` arguments into appropriate CSS values. (#991)

Expand All @@ -58,7 +58,7 @@

# bslib 0.6.2

Increased the version requirement on the `{sass}` package to 0.4.9. As a result, `font_google(local=TRUE)` should no longer fail to download font files.
Increased the version requirement on the `{sass}` package to 0.4.9. As a result, `font_google(local=TRUE)` should no longer fail to download font files.

# bslib 0.6.1

Expand Down
Binary file modified R/sysdata.rda
Binary file not shown.
9 changes: 4 additions & 5 deletions inst/bslib-scss/spacer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@ $bslib-spacer: $spacer !default;
// ...And this class for layout containers (e.g, layout_columns())
.bslib-gap-spacing {
gap: var(--bslib-mb-spacer);
> .bslib-mb-spacing, > .form-group, > p, > pre {
margin-bottom: 0;
}
// Make sure to get similar behavior in a uiOutput()/renderUI() context
> .shiny-html-output {

&,
& > .shiny-html-output,
& > .shiny-panel-conditional {
> .bslib-mb-spacing, > .form-group, > p, > pre {
margin-bottom: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion inst/css-precompiled/3/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/css-precompiled/4/bootstrap.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/css-precompiled/5/bootstrap.min.css

Large diffs are not rendered by default.