Merge changes from main branch

- Updated toolbar.scss to use margin: 0 on both .action-icon and .action-label
- Applied snapshot updates for bs-theme-preset files

Author: elnelson575

inst/components/dist/components.css

@@ -34,9 +34,10 @@
     height: var(--_toolbar-btn-size); // Keep square icon and label + icon button heights consistent
     display: flex;
 
-    // Override shiny's .action-button .action-icon+.action-label margin rule for toolbar buttons
-    .action-icon + .action-label {
-      margin-left: 0;
+    // Remove margins from action button elements
+    .action-icon,
+    .action-label {
+      margin: 0;
     }
 
     &.btn-default:not(.btn-primary):not(.btn-secondary):not(.btn-success):not(.btn-danger):not(.btn-warning):not(.btn-info):not(.btn-light):not(.btn-dark) {
@@ -73,6 +74,13 @@
     }
   }
 
+  // Add spacing between icon and label in buttons with both
+  .bslib-toolbar-input-button[data-type="both"] {
+    .action-icon {
+      margin-right: 0.5ch;
+    }
+  }
+
   // Square icon-only buttons
   .bslib-toolbar-input-button[data-type="icon"] {
     aspect-ratio: 1;

inst/components/scss/toolbar.scss

@@ -1,4 +1,4 @@
-# builtin_bundle() / errors for unknown preset names
+# builtin_bundle(): errors for unknown preset names
 
     Code
       builtin_bundle("not-a-preset", version = "5")

man/navset.Rd

@@ -1,4 +1,4 @@
-# resolve_bs_preset() / throws an error if both `name` and `bootswatch` are provided
+# resolve_bs_preset(): throws an error if both `name` and `bootswatch` are provided
 
     Code
       resolve_bs_preset(preset = "name", bootswatch = "bootswatch")
@@ -10,7 +10,7 @@
       * `preset = "bootswatch"`
       * `bootswatch = "bootswatch"`
 
-# resolve_bs_preset() / throws an error if `name` or `bootswatch` are not scalar strings
+# resolve_bs_preset(): throws an error if `name` or `bootswatch` are not scalar strings
 
     Code
       resolve_bs_preset(preset = c("a", "b"))
@@ -30,7 +30,7 @@
       x Bad: `bootswatch = c("flatly", "darkly")`
       v Good: `bootswatch = "flatly"`
 
-# resolve_bs_preset() / throws an error if `name` or `bootswatch` don't match existing presets
+# resolve_bs_preset(): throws an error if `name` or `bootswatch` don't match existing presets
 
     Code
       resolve_bs_preset(preset = "not_a_preset", version = 4)