diff --git a/packages/web/DEPRECATIONS-v2.md b/packages/web/DEPRECATIONS-v2.md index 5854e04374..6cac0d7340 100644 --- a/packages/web/DEPRECATIONS-v2.md +++ b/packages/web/DEPRECATIONS-v2.md @@ -1,20 +1,11 @@ # Deprecations List -Following deprecations and feature flags will be removed in version 2 of the _spirit-web_ package. +Following deprecations will be removed in version 2 of the _spirit-web_ package. > Please follow these steps to safely upgrade your design system to Spirit Design System v2 components. [What are deprecations?][readme-deprecations] -[What are feature flags?][readme-feature-flags] - -## Feature Flags - -### Alert Bordered - -The feature flag enabling the bordered variant of alert will be removed and the bordered variant will -be enabled by default. - ## Deprecations ### Tooltip and Dropdown Placements diff --git a/packages/web/src/scss/components/Alert/README.md b/packages/web/src/scss/components/Alert/README.md index b1e119b7a3..4dff034fbc 100644 --- a/packages/web/src/scss/components/Alert/README.md +++ b/packages/web/src/scss/components/Alert/README.md @@ -67,20 +67,3 @@ Variants:
Data update failed due to missing internet connection
``` - -## Feature Flag: Bordered Alert - -The Alert border feature flag is not disabled by default. To enable it, either set the -`$alert-enable-bordered` Sass feature flag to `true` or use the `spirit-feature-alert-enable-bordered` -CSS class on any parent of the Alert. - -For more info, see main [README][readme-feature-flags]. - -### ⚠️ DEPRECATION NOTICE - -The Alert will be bordered by default in the next major release. - -[What are deprecations?][readme-deprecations] - -[readme-deprecations]: https://github.com/lmc-eu/spirit-design-system/tree/main/packages/web/README.md#deprecations -[readme-feature-flags]: https://github.com/lmc-eu/spirit-design-system/tree/main/packages/web/README.md#feature-flags diff --git a/packages/web/src/scss/components/Alert/_Alert.scss b/packages/web/src/scss/components/Alert/_Alert.scss index 36b8c8dbe0..d15509f6ba 100644 --- a/packages/web/src/scss/components/Alert/_Alert.scss +++ b/packages/web/src/scss/components/Alert/_Alert.scss @@ -1,5 +1,4 @@ @use 'theme'; -@use '../../settings/feature-flags'; @use '../../tools/dictionaries'; @use '../../tools/typography'; @@ -12,19 +11,8 @@ justify-content: flex-start; width: 100%; padding: theme.$padding; - border-radius: theme.$border-radius; - - // @deprecated The feature flag will be removed in the next major version. - // Migration: delete this feature flag and make the bordered version the default. - @if feature-flags.$alert-enable-bordered { - border: theme.$border-width theme.$border-style var(--alert-color); - } -} - -// @deprecated The feature flag will be removed in the next major version. -// Migration: delete this feature flag and make the bordered version the default. -.spirit-feature-alert-enable-bordered .Alert { border: theme.$border-width theme.$border-style var(--alert-color); + border-radius: theme.$border-radius; } .Alert strong { diff --git a/packages/web/src/scss/components/Alert/index.html b/packages/web/src/scss/components/Alert/index.html index f1ac1b1860..fb158f1782 100644 --- a/packages/web/src/scss/components/Alert/index.html +++ b/packages/web/src/scss/components/Alert/index.html @@ -123,47 +123,4 @@

Alert Icons

-
-
-

Feature Flag: Bordered Alert

- -
- - - - - - - - - -
- -
-
- {{/web/layout/plain }} diff --git a/packages/web/src/scss/components/Dropdown/_Dropdown.scss b/packages/web/src/scss/components/Dropdown/_Dropdown.scss index 50ce53c6f1..d9edebe8e8 100644 --- a/packages/web/src/scss/components/Dropdown/_Dropdown.scss +++ b/packages/web/src/scss/components/Dropdown/_Dropdown.scss @@ -1,5 +1,4 @@ @use 'sass:map'; -@use '../../settings/feature-flags'; @use '../../tools/breakpoint'; @use '../../tools/dictionaries'; @use '../../tools/placement'; diff --git a/packages/web/src/scss/components/Modal/_ModalDialog.scss b/packages/web/src/scss/components/Modal/_ModalDialog.scss index f51ee51cb0..312dcb7121 100644 --- a/packages/web/src/scss/components/Modal/_ModalDialog.scss +++ b/packages/web/src/scss/components/Modal/_ModalDialog.scss @@ -5,7 +5,6 @@ // 4. Override bottom padding of parent `.Modal` in the docked variant. @use 'sass:map'; -@use '../../settings/feature-flags'; @use '../../tools/breakpoint'; @use '../../tools/typography'; @use 'theme'; diff --git a/packages/web/src/scss/components/Tooltip/_Tooltip.scss b/packages/web/src/scss/components/Tooltip/_Tooltip.scss index a8093f28b7..47a0c41680 100644 --- a/packages/web/src/scss/components/Tooltip/_Tooltip.scss +++ b/packages/web/src/scss/components/Tooltip/_Tooltip.scss @@ -5,7 +5,6 @@ // 2. Reuse already generated custom properties to allow overriding the arrow appearance live in the browser. @use 'sass:math'; -@use '../../settings/feature-flags'; @use '../../tools/dictionaries'; @use '../../tools/placement'; @use '../../tools/reset'; diff --git a/packages/web/src/scss/settings/_feature-flags.scss b/packages/web/src/scss/settings/_feature-flags.scss deleted file mode 100644 index d96d4fbf91..0000000000 --- a/packages/web/src/scss/settings/_feature-flags.scss +++ /dev/null @@ -1 +0,0 @@ -$alert-enable-bordered: false !default; diff --git a/tests/e2e/demo-components-compare.spec.ts-snapshots/alert-chromium-linux.png b/tests/e2e/demo-components-compare.spec.ts-snapshots/alert-chromium-linux.png index 5d15ade945..9348445614 100644 Binary files a/tests/e2e/demo-components-compare.spec.ts-snapshots/alert-chromium-linux.png and b/tests/e2e/demo-components-compare.spec.ts-snapshots/alert-chromium-linux.png differ