From b839af4e8b04cfcaac515f0352adefcf709d5eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A9sor=20ILOYI?= Date: Thu, 5 Jan 2023 10:24:04 +0100 Subject: [PATCH] feat(styles/settings): delete the import of the tokens file inside the all-settings (#1322) --- .../src/components/McButton/styles.scss | 3 +-- .../src/components/McCheckbox/styles.scss | 3 +-- .../src/components/McTextInput/styles.scss | 7 +++---- .../src/components/McToggle/styles.scss | 3 +-- .../gatsby-theme-styleguide/src/pages/index.scss | 13 +++++++------ packages/styles/settings-tools/_all-settings.scss | 3 --- .../Form/Autocomplete/previews/invalid.preview.scss | 2 +- .../Datepicker/previews/datetime-local.preview.scss | 1 + .../Form/Datepicker/previews/month.preview.scss | 1 + .../Form/Datepicker/previews/time.preview.scss | 1 + .../Form/Datepicker/previews/week.preview.scss | 1 + .../Form/Dropdown/previews/invalid.preview.scss | 1 + .../Modals/previews/header-with-icon.preview.scss | 1 + .../OptionCard/previews/withcontent.preview.scss | 1 + 14 files changed, 21 insertions(+), 20 deletions(-) diff --git a/packages/gatsby-theme-styleguide/src/components/McButton/styles.scss b/packages/gatsby-theme-styleguide/src/components/McButton/styles.scss index 81ccd6506..f26aa2a6c 100644 --- a/packages/gatsby-theme-styleguide/src/components/McButton/styles.scss +++ b/packages/gatsby-theme-styleguide/src/components/McButton/styles.scss @@ -1,5 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; - @include import-font-families(); - @import "components/c.button"; diff --git a/packages/gatsby-theme-styleguide/src/components/McCheckbox/styles.scss b/packages/gatsby-theme-styleguide/src/components/McCheckbox/styles.scss index c4e707dbf..448e4fb2e 100644 --- a/packages/gatsby-theme-styleguide/src/components/McCheckbox/styles.scss +++ b/packages/gatsby-theme-styleguide/src/components/McCheckbox/styles.scss @@ -1,7 +1,6 @@ +@import "tokens"; @import "settings-tools/all-settings"; - @include import-font-families(); - @import "components/c.checkbox"; .mc-checkbox { diff --git a/packages/gatsby-theme-styleguide/src/components/McTextInput/styles.scss b/packages/gatsby-theme-styleguide/src/components/McTextInput/styles.scss index 3a1c1d398..77c9034be 100644 --- a/packages/gatsby-theme-styleguide/src/components/McTextInput/styles.scss +++ b/packages/gatsby-theme-styleguide/src/components/McTextInput/styles.scss @@ -1,8 +1,7 @@ -@import '_all-settings.scss'; - +@import "tokens"; +@import "all-settings"; @include import-font-families(); - -@import '_c.text-input.scss'; +@import "c.text-input"; .mc-text-input { color: $color-grey-999; diff --git a/packages/gatsby-theme-styleguide/src/components/McToggle/styles.scss b/packages/gatsby-theme-styleguide/src/components/McToggle/styles.scss index 0272d9897..4acb86623 100644 --- a/packages/gatsby-theme-styleguide/src/components/McToggle/styles.scss +++ b/packages/gatsby-theme-styleguide/src/components/McToggle/styles.scss @@ -1,7 +1,6 @@ +@import "tokens"; @import "settings-tools/all-settings"; - @include import-font-families(); - @import "components/c.toggle"; .mc-toggle { diff --git a/packages/gatsby-theme-styleguide/src/pages/index.scss b/packages/gatsby-theme-styleguide/src/pages/index.scss index c8be7acd3..d839687c8 100644 --- a/packages/gatsby-theme-styleguide/src/pages/index.scss +++ b/packages/gatsby-theme-styleguide/src/pages/index.scss @@ -1,12 +1,13 @@ -@import url('https://fonts.googleapis.com/css?family=Karla:400,400i,700,700i&display=swap&subset=latin-ext'); -@import '_all-settings.scss'; -@import '_l.flexy.scss'; +@import "https://fonts.googleapis.com/css?family=Karla:400,400i,700,700i&display=swap&subset=latin-ext"; +@import "tokens"; +@import "settings-tools/all-settings"; +@import "l.flexy"; body, html { box-sizing: border-box; color: #000; - font-family: 'Karla', sans-serif !important; + font-family: Karla, sans-serif !important; font-size: 16px !important; font-weight: 400; line-height: 1.45; @@ -22,7 +23,7 @@ html { input, select { - font-family: 'Karla', sans-serif; + font-family: Karla, sans-serif; } .button { @@ -38,7 +39,7 @@ select { text-align: center; &:hover { - background: rgba(0, 0, 0, 0.1); + background: rgb(0 0 0 / 0.1); } &__menu { diff --git a/packages/styles/settings-tools/_all-settings.scss b/packages/styles/settings-tools/_all-settings.scss index df32cb47f..9965fd354 100644 --- a/packages/styles/settings-tools/_all-settings.scss +++ b/packages/styles/settings-tools/_all-settings.scss @@ -1,6 +1,3 @@ -/* stylelint-disable */ -@import "_tokens.scss"; -/* stylelint-enable */ @import "./t.map-tools"; @import "./t.selectors"; @import "./t.colors"; diff --git a/src/docs/Components/Form/Autocomplete/previews/invalid.preview.scss b/src/docs/Components/Form/Autocomplete/previews/invalid.preview.scss index 8399f338c..678162477 100644 --- a/src/docs/Components/Form/Autocomplete/previews/invalid.preview.scss +++ b/src/docs/Components/Form/Autocomplete/previews/invalid.preview.scss @@ -1,10 +1,10 @@ +@import "tokens"; @import "settings-tools/all-settings"; @import "components/c.left-icon-input"; @import "components/c.text-input"; @import "components/c.tag"; @import "components/c.listbox"; @import "components/c.autocomplete"; - @include import-font-families(); .example { diff --git a/src/docs/Components/Form/Datepicker/previews/datetime-local.preview.scss b/src/docs/Components/Form/Datepicker/previews/datetime-local.preview.scss index 1eef2b24d..f3138f34d 100644 --- a/src/docs/Components/Form/Datepicker/previews/datetime-local.preview.scss +++ b/src/docs/Components/Form/Datepicker/previews/datetime-local.preview.scss @@ -1,3 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; @include import-font-families(); @import "components/c.text-input"; diff --git a/src/docs/Components/Form/Datepicker/previews/month.preview.scss b/src/docs/Components/Form/Datepicker/previews/month.preview.scss index 1eef2b24d..f3138f34d 100644 --- a/src/docs/Components/Form/Datepicker/previews/month.preview.scss +++ b/src/docs/Components/Form/Datepicker/previews/month.preview.scss @@ -1,3 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; @include import-font-families(); @import "components/c.text-input"; diff --git a/src/docs/Components/Form/Datepicker/previews/time.preview.scss b/src/docs/Components/Form/Datepicker/previews/time.preview.scss index 1eef2b24d..f3138f34d 100644 --- a/src/docs/Components/Form/Datepicker/previews/time.preview.scss +++ b/src/docs/Components/Form/Datepicker/previews/time.preview.scss @@ -1,3 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; @include import-font-families(); @import "components/c.text-input"; diff --git a/src/docs/Components/Form/Datepicker/previews/week.preview.scss b/src/docs/Components/Form/Datepicker/previews/week.preview.scss index 1eef2b24d..f3138f34d 100644 --- a/src/docs/Components/Form/Datepicker/previews/week.preview.scss +++ b/src/docs/Components/Form/Datepicker/previews/week.preview.scss @@ -1,3 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; @include import-font-families(); @import "components/c.text-input"; diff --git a/src/docs/Components/Form/Dropdown/previews/invalid.preview.scss b/src/docs/Components/Form/Dropdown/previews/invalid.preview.scss index 708302589..83b083f11 100644 --- a/src/docs/Components/Form/Dropdown/previews/invalid.preview.scss +++ b/src/docs/Components/Form/Dropdown/previews/invalid.preview.scss @@ -1,3 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; @include import-font-families(); @import "components/c.select"; diff --git a/src/docs/Components/Modals/previews/header-with-icon.preview.scss b/src/docs/Components/Modals/previews/header-with-icon.preview.scss index 999b69354..ccfde6bd0 100644 --- a/src/docs/Components/Modals/previews/header-with-icon.preview.scss +++ b/src/docs/Components/Modals/previews/header-with-icon.preview.scss @@ -1,3 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; @include import-font-families(); @import "typography/t.bodys"; diff --git a/src/docs/Components/OptionGroup/OptionCard/previews/withcontent.preview.scss b/src/docs/Components/OptionGroup/OptionCard/previews/withcontent.preview.scss index 635271176..001d4083a 100644 --- a/src/docs/Components/OptionGroup/OptionCard/previews/withcontent.preview.scss +++ b/src/docs/Components/OptionGroup/OptionCard/previews/withcontent.preview.scss @@ -1,3 +1,4 @@ +@import "tokens"; @import "settings-tools/all-settings"; @import "typography/t.bodys"; @include import-font-families();