Merge remote-tracking branch 'shoelace-orginal/next' into viur

viur-framework · Aug 5, 2024 · 8a9ae01 · 8a9ae01
2 parents a2ea8d5 + d0441f5
commit 8a9ae01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 30 deletions.
diff --git a/docs/pages/components/select.md b/docs/pages/components/select.md
@@ -395,54 +395,30 @@ const App = () => (
 );
 ```
 
-### Prefix Icons
+### Prefix & Suffix
 
-Use the `prefix` slot to prepend an icon to the control.
+Use the `prefix` and `suffix` slots to add presentational icons and text. Avoid slotting in interactive elements, such as buttons, links, etc.
 
 ```html:preview
 <sl-select placeholder="Small" size="small" clearable>
   <sl-icon name="house" slot="prefix"></sl-icon>
+  <sl-badge slot="suffix">New</sl-badge>
   <sl-option value="option-1">Option 1</sl-option>
   <sl-option value="option-2">Option 2</sl-option>
   <sl-option value="option-3">Option 3</sl-option>
 </sl-select>
 <br />
 <sl-select placeholder="Medium" size="medium" clearable>
   <sl-icon name="house" slot="prefix"></sl-icon>
+  <sl-badge slot="suffix">New</sl-badge>
   <sl-option value="option-1">Option 1</sl-option>
   <sl-option value="option-2">Option 2</sl-option>
   <sl-option value="option-3">Option 3</sl-option>
 </sl-select>
 <br />
 <sl-select placeholder="Large" size="large" clearable>
   <sl-icon name="house" slot="prefix"></sl-icon>
-  <sl-option value="option-1">Option 1</sl-option>
-  <sl-option value="option-2">Option 2</sl-option>
-  <sl-option value="option-3">Option 3</sl-option>
-</sl-select>
-```
-
-### Suffix Icons
-
-Use the `suffix` slot to append an icon to the control.
-
-```html:preview
-<sl-select placeholder="Small" size="small" clearable>
-  <sl-icon name="house" slot="suffix"></sl-icon>
-  <sl-option value="option-1">Option 1</sl-option>
-  <sl-option value="option-2">Option 2</sl-option>
-  <sl-option value="option-3">Option 3</sl-option>
-</sl-select>
-<br />
-<sl-select placeholder="Medium" size="medium" clearable>
-  <sl-icon name="house" slot="suffix"></sl-icon>
-  <sl-option value="option-1">Option 1</sl-option>
-  <sl-option value="option-2">Option 2</sl-option>
-  <sl-option value="option-3">Option 3</sl-option>
-</sl-select>
-<br />
-<sl-select placeholder="Large" size="large" clearable>
-  <sl-icon name="house" slot="suffix"></sl-icon>
+  <sl-badge slot="suffix">New</sl-badge>
   <sl-option value="option-1">Option 1</sl-option>
   <sl-option value="option-2">Option 2</sl-option>
   <sl-option value="option-3">Option 3</sl-option>

diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md
@@ -12,7 +12,7 @@ Components with the <sl-badge variant="warning" pill>Experimental</sl-badge> bad
 
 New versions of Shoelace are released as-needed and generally occur when a critical mass of changes have accumulated. At any time, you can see what's coming in the next release by visiting [next.shoelace.style](https://next.shoelace.style).
 
-## Next
+## 2.16.0
 
 - Added the Czech translation [#2084]
 - Added the `base__popup` part to `<sl-dropdown>` [#2078]