Merge pull request #1031 from rstudio/feat/panel-conditional-gap-spacing

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

NEWS.md

@@ -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)
 
@@ -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
 

inst/bslib-scss/spacer.scss

@@ -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;
     }