From a6d4cea3b71dfdc34a92cc7822d8343edaa80e86 Mon Sep 17 00:00:00 2001 From: Christian Schilling Date: Mon, 23 Sep 2024 17:34:33 +0200 Subject: [PATCH 1/3] Fix for #2145 (#2146) * Fix for #2145 * Fixed misleading comment after css adjustments * Use same spacing for all sizes --------- Co-authored-by: Cory LaViska --- docs/pages/resources/changelog.md | 5 +++++ src/components/select/select.styles.ts | 13 +++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md index 142de763..cabc226c 100644 --- a/docs/pages/resources/changelog.md +++ b/docs/pages/resources/changelog.md @@ -12,6 +12,11 @@ Components with the Experimental 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 + +- Fixed a bug in `` that made the suffix slot collide with the clear button [#2145] + + ## 2.17.0 - Added the `fixed-scroll-controls` attribute to `` [#2128] diff --git a/src/components/select/select.styles.ts b/src/components/select/select.styles.ts index ddc3d3d4..16d1a12c 100644 --- a/src/components/select/select.styles.ts +++ b/src/components/select/select.styles.ts @@ -260,20 +260,17 @@ export default css` border-radius: var(--sl-input-height-large); } - /* Prefix */ - .select__prefix { + /* Prefix and Suffix */ + .select__prefix, + .select__suffix { flex: 0; display: inline-flex; align-items: center; color: var(--sl-input-placeholder-color); } - /* Suffix */ - .select__suffix { - flex: 0; - display: inline-flex; - align-items: center; - color: var(--sl-input-placeholder-color); + .select__suffix::slotted(*) { + margin-inline-start: var(--sl-spacing-small); } /* Clear button */ From c3876a6ecb2dcde9e2ae7237112d06c774f56607 Mon Sep 17 00:00:00 2001 From: Cory LaViska Date: Mon, 23 Sep 2024 11:40:07 -0400 Subject: [PATCH 2/3] prettier --- docs/pages/resources/changelog.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md index cabc226c..7887b679 100644 --- a/docs/pages/resources/changelog.md +++ b/docs/pages/resources/changelog.md @@ -16,7 +16,6 @@ New versions of Shoelace are released as-needed and generally occur when a criti - Fixed a bug in `` that made the suffix slot collide with the clear button [#2145] - ## 2.17.0 - Added the `fixed-scroll-controls` attribute to `` [#2128] From b46b97c5fd9a68e92e56ff8047b50d31e85c704d Mon Sep 17 00:00:00 2001 From: Cory LaViska Date: Mon, 23 Sep 2024 12:16:19 -0400 Subject: [PATCH 3/3] remove unused dep --- cspell.json | 1 - package-lock.json | 17 ----------------- package.json | 1 - 3 files changed, 19 deletions(-) diff --git a/cspell.json b/cspell.json index e4bf8c63..ba7ba2e8 100644 --- a/cspell.json +++ b/cspell.json @@ -78,7 +78,6 @@ "ionicons", "jsDelivr", "jsfiddle", - "jsonata", "keydown", "keyframes", "Kool", diff --git a/package-lock.json b/package-lock.json index f337abe1..acca080f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,6 @@ "globby": "^13.2.2", "husky": "^8.0.3", "jsdom": "^22.1.0", - "jsonata": "^2.0.4", "lint-staged": "^14.0.1", "lunr": "^2.3.9", "markdown-it-container": "^3.0.0", @@ -11311,16 +11310,6 @@ "node": ">=6" } }, - "node_modules/jsonata": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-2.0.5.tgz", - "integrity": "sha512-wEse9+QLIIU5IaCgtJCPsFi/H4F3qcikWzF4bAELZiRz08ohfx3Q6CjDRf4ZPF5P/92RI3KIHtb7u3jqPaHXdQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, "node_modules/jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", @@ -27299,12 +27288,6 @@ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true }, - "jsonata": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/jsonata/-/jsonata-2.0.5.tgz", - "integrity": "sha512-wEse9+QLIIU5IaCgtJCPsFi/H4F3qcikWzF4bAELZiRz08ohfx3Q6CjDRf4ZPF5P/92RI3KIHtb7u3jqPaHXdQ==", - "dev": true - }, "jsonfile": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", diff --git a/package.json b/package.json index c9ceb16a..1adbcb36 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,6 @@ "globby": "^13.2.2", "husky": "^8.0.3", "jsdom": "^22.1.0", - "jsonata": "^2.0.4", "lint-staged": "^14.0.1", "lunr": "^2.3.9", "markdown-it-container": "^3.0.0",