diff --git a/frontend/.stylelintrc.cjs b/frontend/.stylelintrc.cjs index 04163d0d7e..cde029223c 100644 --- a/frontend/.stylelintrc.cjs +++ b/frontend/.stylelintrc.cjs @@ -40,7 +40,5 @@ module.exports = { } ], "scss/at-rule-no-unknown": true, - "scss/at-import-partial-extension": null, - "scss/at-import-partial-extension-allowed-list": "scss" } }; diff --git a/frontend/src/components/Banner.module.scss b/frontend/src/components/Banner.module.scss index 9f773ee8da..ee0856ab33 100644 --- a/frontend/src/components/Banner.module.scss +++ b/frontend/src/components/Banner.module.scss @@ -1,6 +1,6 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; -@import "../styles/tokens.scss"; +@import "../styles/tokens"; .banner { border-radius: $border-radius-md; diff --git a/frontend/src/components/Button.module.scss b/frontend/src/components/Button.module.scss index 2c24c728d3..357d6bea4d 100644 --- a/frontend/src/components/Button.module.scss +++ b/frontend/src/components/Button.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/mixins/typography"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/CountdownTimer.module.scss b/frontend/src/components/CountdownTimer.module.scss index 8286b29de7..599f271472 100644 --- a/frontend/src/components/CountdownTimer.module.scss +++ b/frontend/src/components/CountdownTimer.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../styles/tokens.scss"; +@import "../styles/tokens"; .countdown-timer { dl { diff --git a/frontend/src/components/InfoModal.module.scss b/frontend/src/components/InfoModal.module.scss index 0a5c8a3044..a07385747d 100644 --- a/frontend/src/components/InfoModal.module.scss +++ b/frontend/src/components/InfoModal.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .underlay { diff --git a/frontend/src/components/InfoTooltip.module.scss b/frontend/src/components/InfoTooltip.module.scss index ff71cfbc6c..b34970cff5 100644 --- a/frontend/src/components/InfoTooltip.module.scss +++ b/frontend/src/components/InfoTooltip.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/dashboard/CornerNotification.module.scss b/frontend/src/components/dashboard/CornerNotification.module.scss index 637cd9bd33..5cb1685589 100644 --- a/frontend/src/components/dashboard/CornerNotification.module.scss +++ b/frontend/src/components/dashboard/CornerNotification.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/dashboard/EmailForwardingModal.module.scss b/frontend/src/components/dashboard/EmailForwardingModal.module.scss index 55da7b1a4d..086bc1e8cd 100644 --- a/frontend/src/components/dashboard/EmailForwardingModal.module.scss +++ b/frontend/src/components/dashboard/EmailForwardingModal.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .underlay { diff --git a/frontend/src/components/dashboard/FreeOnboarding.module.scss b/frontend/src/components/dashboard/FreeOnboarding.module.scss index a3d57d4189..234d2ec4aa 100644 --- a/frontend/src/components/dashboard/FreeOnboarding.module.scss +++ b/frontend/src/components/dashboard/FreeOnboarding.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/dashboard/Onboarding.module.scss b/frontend/src/components/dashboard/Onboarding.module.scss index 1f0158d9bb..4061c54ab8 100644 --- a/frontend/src/components/dashboard/Onboarding.module.scss +++ b/frontend/src/components/dashboard/Onboarding.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/dashboard/PremiumOnboarding.module.scss b/frontend/src/components/dashboard/PremiumOnboarding.module.scss index 1b01f6031a..84a0bf99e6 100644 --- a/frontend/src/components/dashboard/PremiumOnboarding.module.scss +++ b/frontend/src/components/dashboard/PremiumOnboarding.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/dashboard/ProfileBanners.module.scss b/frontend/src/components/dashboard/ProfileBanners.module.scss index 2568ca366e..5c423c5feb 100644 --- a/frontend/src/components/dashboard/ProfileBanners.module.scss +++ b/frontend/src/components/dashboard/ProfileBanners.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; .profile-banners { display: flex; diff --git a/frontend/src/components/dashboard/SubdomainPicker.module.scss b/frontend/src/components/dashboard/SubdomainPicker.module.scss index ece17eaab4..d3bd1346a5 100644 --- a/frontend/src/components/dashboard/SubdomainPicker.module.scss +++ b/frontend/src/components/dashboard/SubdomainPicker.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/dashboard/aliases/AddressPickerModal.module.scss b/frontend/src/components/dashboard/aliases/AddressPickerModal.module.scss index c5d2411c46..f7c25456dc 100644 --- a/frontend/src/components/dashboard/aliases/AddressPickerModal.module.scss +++ b/frontend/src/components/dashboard/aliases/AddressPickerModal.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/dashboard/aliases/Alias.module.scss b/frontend/src/components/dashboard/aliases/Alias.module.scss index bfe5a6a55b..48db779548 100644 --- a/frontend/src/components/dashboard/aliases/Alias.module.scss +++ b/frontend/src/components/dashboard/aliases/Alias.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; $toggleTransitionDuration: 200ms; diff --git a/frontend/src/components/dashboard/aliases/AliasDeletionButton.module.scss b/frontend/src/components/dashboard/aliases/AliasDeletionButton.module.scss index 7feddcee33..f6711f31c7 100644 --- a/frontend/src/components/dashboard/aliases/AliasDeletionButton.module.scss +++ b/frontend/src/components/dashboard/aliases/AliasDeletionButton.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/dashboard/aliases/AliasDeletionButtonPermanent.module.scss b/frontend/src/components/dashboard/aliases/AliasDeletionButtonPermanent.module.scss index 1b6b9b0c1f..474c9e53ae 100644 --- a/frontend/src/components/dashboard/aliases/AliasDeletionButtonPermanent.module.scss +++ b/frontend/src/components/dashboard/aliases/AliasDeletionButtonPermanent.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/dashboard/aliases/AliasGenerationButton.module.scss b/frontend/src/components/dashboard/aliases/AliasGenerationButton.module.scss index 523c288dd3..d61644427b 100644 --- a/frontend/src/components/dashboard/aliases/AliasGenerationButton.module.scss +++ b/frontend/src/components/dashboard/aliases/AliasGenerationButton.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .button-wrapper { position: relative; diff --git a/frontend/src/components/dashboard/aliases/AliasList.module.scss b/frontend/src/components/dashboard/aliases/AliasList.module.scss index ef976e859d..d4d06413f2 100644 --- a/frontend/src/components/dashboard/aliases/AliasList.module.scss +++ b/frontend/src/components/dashboard/aliases/AliasList.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/dashboard/aliases/BlockLevelSlider.module.scss b/frontend/src/components/dashboard/aliases/BlockLevelSlider.module.scss index bc426df0e6..09c909618f 100644 --- a/frontend/src/components/dashboard/aliases/BlockLevelSlider.module.scss +++ b/frontend/src/components/dashboard/aliases/BlockLevelSlider.module.scss @@ -1,4 +1,4 @@ -@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index.scss"; +@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; $stopLabelHeight: 2rem; diff --git a/frontend/src/components/dashboard/aliases/CategoryFilter.module.scss b/frontend/src/components/dashboard/aliases/CategoryFilter.module.scss index 34be73def2..120fd2a7f6 100644 --- a/frontend/src/components/dashboard/aliases/CategoryFilter.module.scss +++ b/frontend/src/components/dashboard/aliases/CategoryFilter.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .filter-button { background-color: transparent; diff --git a/frontend/src/components/dashboard/aliases/CustomAddressGenerationModal.module.scss b/frontend/src/components/dashboard/aliases/CustomAddressGenerationModal.module.scss index 9ac60d57ca..843b722508 100644 --- a/frontend/src/components/dashboard/aliases/CustomAddressGenerationModal.module.scss +++ b/frontend/src/components/dashboard/aliases/CustomAddressGenerationModal.module.scss @@ -1,6 +1,6 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .underlay { position: fixed; diff --git a/frontend/src/components/dashboard/aliases/LabelEditor.module.scss b/frontend/src/components/dashboard/aliases/LabelEditor.module.scss index a147964bb0..eb8de8efa3 100644 --- a/frontend/src/components/dashboard/aliases/LabelEditor.module.scss +++ b/frontend/src/components/dashboard/aliases/LabelEditor.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .label-form { position: relative; diff --git a/frontend/src/components/dashboard/aliases/MaskCard.module.scss b/frontend/src/components/dashboard/aliases/MaskCard.module.scss index 464d589b01..961892acf2 100644 --- a/frontend/src/components/dashboard/aliases/MaskCard.module.scss +++ b/frontend/src/components/dashboard/aliases/MaskCard.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .card { background-color: $color-white; diff --git a/frontend/src/components/dashboard/subdomain/ConfirmationForm.module.scss b/frontend/src/components/dashboard/subdomain/ConfirmationForm.module.scss index 9a1530e7c7..0b0dd64aac 100644 --- a/frontend/src/components/dashboard/subdomain/ConfirmationForm.module.scss +++ b/frontend/src/components/dashboard/subdomain/ConfirmationForm.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .permanence-warning { diff --git a/frontend/src/components/dashboard/subdomain/ConfirmationModal.module.scss b/frontend/src/components/dashboard/subdomain/ConfirmationModal.module.scss index 3105fdc954..d87a4a51cd 100644 --- a/frontend/src/components/dashboard/subdomain/ConfirmationModal.module.scss +++ b/frontend/src/components/dashboard/subdomain/ConfirmationModal.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .underlay { diff --git a/frontend/src/components/dashboard/subdomain/SubdomainInfoTooltip.module.scss b/frontend/src/components/dashboard/subdomain/SubdomainInfoTooltip.module.scss index b66df8c56a..d975c17246 100644 --- a/frontend/src/components/dashboard/subdomain/SubdomainInfoTooltip.module.scss +++ b/frontend/src/components/dashboard/subdomain/SubdomainInfoTooltip.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/mixins/typography"; diff --git a/frontend/src/components/dashboard/tips/CustomAliasTip.module.scss b/frontend/src/components/dashboard/tips/CustomAliasTip.module.scss index b332634657..c31074a7ab 100644 --- a/frontend/src/components/dashboard/tips/CustomAliasTip.module.scss +++ b/frontend/src/components/dashboard/tips/CustomAliasTip.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .custom-alias-tip { diff --git a/frontend/src/components/dashboard/tips/GenericTip.module.scss b/frontend/src/components/dashboard/tips/GenericTip.module.scss index f58213714e..938f9401f9 100644 --- a/frontend/src/components/dashboard/tips/GenericTip.module.scss +++ b/frontend/src/components/dashboard/tips/GenericTip.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .generic-tip { diff --git a/frontend/src/components/dashboard/tips/Tips.module.scss b/frontend/src/components/dashboard/tips/Tips.module.scss index 2f45c03341..c09340d00c 100644 --- a/frontend/src/components/dashboard/tips/Tips.module.scss +++ b/frontend/src/components/dashboard/tips/Tips.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/landing/BundleBanner.module.scss b/frontend/src/components/landing/BundleBanner.module.scss index 076d1ef106..6e33464597 100644 --- a/frontend/src/components/landing/BundleBanner.module.scss +++ b/frontend/src/components/landing/BundleBanner.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .bundle-banner-wrapper { diff --git a/frontend/src/components/landing/DemoPhone.module.scss b/frontend/src/components/landing/DemoPhone.module.scss index 5df933875a..141ef2e0c7 100644 --- a/frontend/src/components/landing/DemoPhone.module.scss +++ b/frontend/src/components/landing/DemoPhone.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; .container { position: relative; diff --git a/frontend/src/components/landing/FaqAccordion.module.scss b/frontend/src/components/landing/FaqAccordion.module.scss index 7fdf3f4d9b..7a354c14b4 100644 --- a/frontend/src/components/landing/FaqAccordion.module.scss +++ b/frontend/src/components/landing/FaqAccordion.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .entry { diff --git a/frontend/src/components/landing/HighlightedFeatures.module.scss b/frontend/src/components/landing/HighlightedFeatures.module.scss index 41d2c57e70..13f700a7d4 100644 --- a/frontend/src/components/landing/HighlightedFeatures.module.scss +++ b/frontend/src/components/landing/HighlightedFeatures.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .highlighted-feature-wrapper { diff --git a/frontend/src/components/landing/PlanMatrix.module.scss b/frontend/src/components/landing/PlanMatrix.module.scss index 056d546af2..6eeceb9796 100644 --- a/frontend/src/components/landing/PlanMatrix.module.scss +++ b/frontend/src/components/landing/PlanMatrix.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/landing/Reviews.module.scss b/frontend/src/components/landing/Reviews.module.scss index 6eedc49f6c..02679fa87a 100644 --- a/frontend/src/components/landing/Reviews.module.scss +++ b/frontend/src/components/landing/Reviews.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .reviews { diff --git a/frontend/src/components/layout/Layout.module.scss b/frontend/src/components/layout/Layout.module.scss index afcadef4d3..566085bef1 100644 --- a/frontend/src/components/layout/Layout.module.scss +++ b/frontend/src/components/layout/Layout.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .patch3701 { diff --git a/frontend/src/components/layout/navigation/AppPicker.module.scss b/frontend/src/components/layout/navigation/AppPicker.module.scss index 3f57d98068..27270e5515 100644 --- a/frontend/src/components/layout/navigation/AppPicker.module.scss +++ b/frontend/src/components/layout/navigation/AppPicker.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/layout/navigation/DashboardSwitcher.module.scss b/frontend/src/components/layout/navigation/DashboardSwitcher.module.scss index 77d9caec50..7ef2e65398 100644 --- a/frontend/src/components/layout/navigation/DashboardSwitcher.module.scss +++ b/frontend/src/components/layout/navigation/DashboardSwitcher.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .nav-mask-phone { width: 100%; diff --git a/frontend/src/components/layout/navigation/MenuToggle.module.scss b/frontend/src/components/layout/navigation/MenuToggle.module.scss index 6804058c30..21ed32ab8b 100644 --- a/frontend/src/components/layout/navigation/MenuToggle.module.scss +++ b/frontend/src/components/layout/navigation/MenuToggle.module.scss @@ -1 +1 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; diff --git a/frontend/src/components/layout/navigation/MobileNavigation.module.scss b/frontend/src/components/layout/navigation/MobileNavigation.module.scss index aa88e6317d..b3c0ec5c13 100644 --- a/frontend/src/components/layout/navigation/MobileNavigation.module.scss +++ b/frontend/src/components/layout/navigation/MobileNavigation.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .mobile-menu { diff --git a/frontend/src/components/layout/navigation/Navigation.module.scss b/frontend/src/components/layout/navigation/Navigation.module.scss index a878f16f72..f5cde0e051 100644 --- a/frontend/src/components/layout/navigation/Navigation.module.scss +++ b/frontend/src/components/layout/navigation/Navigation.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .site-nav { display: flex; diff --git a/frontend/src/components/layout/navigation/SignInButton.module.scss b/frontend/src/components/layout/navigation/SignInButton.module.scss index 8c9be9161e..30e79e6c0a 100644 --- a/frontend/src/components/layout/navigation/SignInButton.module.scss +++ b/frontend/src/components/layout/navigation/SignInButton.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .sign-in-button { // We're using CSS's `currentColor` here because the colour diff --git a/frontend/src/components/layout/navigation/SignUpButton.module.scss b/frontend/src/components/layout/navigation/SignUpButton.module.scss index e734a4255e..8ed58ca2d8 100644 --- a/frontend/src/components/layout/navigation/SignUpButton.module.scss +++ b/frontend/src/components/layout/navigation/SignUpButton.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .sign-up-button { color: currentColor; diff --git a/frontend/src/components/layout/navigation/UpgradeButton.module.scss b/frontend/src/components/layout/navigation/UpgradeButton.module.scss index cb81c51519..f8260eff19 100644 --- a/frontend/src/components/layout/navigation/UpgradeButton.module.scss +++ b/frontend/src/components/layout/navigation/UpgradeButton.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; #upgrade-button { diff --git a/frontend/src/components/layout/navigation/UserMenu.module.scss b/frontend/src/components/layout/navigation/UserMenu.module.scss index 4a6d86dfde..6a40c6806c 100644 --- a/frontend/src/components/layout/navigation/UserMenu.module.scss +++ b/frontend/src/components/layout/navigation/UserMenu.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/layout/navigation/whatsnew/WhatsNewContent.module.scss b/frontend/src/components/layout/navigation/whatsnew/WhatsNewContent.module.scss index 32b14ed193..cb9c03fc77 100644 --- a/frontend/src/components/layout/navigation/whatsnew/WhatsNewContent.module.scss +++ b/frontend/src/components/layout/navigation/whatsnew/WhatsNewContent.module.scss @@ -1,4 +1,4 @@ -@import "../../../../styles/tokens.scss"; +@import "../../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/layout/navigation/whatsnew/WhatsNewDashboard.module.scss b/frontend/src/components/layout/navigation/whatsnew/WhatsNewDashboard.module.scss index a6c729a57f..3dc216f9d0 100644 --- a/frontend/src/components/layout/navigation/whatsnew/WhatsNewDashboard.module.scss +++ b/frontend/src/components/layout/navigation/whatsnew/WhatsNewDashboard.module.scss @@ -1,4 +1,4 @@ -@import "../../../../styles/tokens.scss"; +@import "../../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/layout/navigation/whatsnew/WhatsNewList.module.scss b/frontend/src/components/layout/navigation/whatsnew/WhatsNewList.module.scss index 0899de4805..5de0d20a86 100644 --- a/frontend/src/components/layout/navigation/whatsnew/WhatsNewList.module.scss +++ b/frontend/src/components/layout/navigation/whatsnew/WhatsNewList.module.scss @@ -1,4 +1,4 @@ -@import "../../../../styles/tokens.scss"; +@import "../../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .empty-message { diff --git a/frontend/src/components/layout/navigation/whatsnew/WhatsNewMenu.module.scss b/frontend/src/components/layout/navigation/whatsnew/WhatsNewMenu.module.scss index f2230fecd2..cbce3e8b15 100644 --- a/frontend/src/components/layout/navigation/whatsnew/WhatsNewMenu.module.scss +++ b/frontend/src/components/layout/navigation/whatsnew/WhatsNewMenu.module.scss @@ -1,4 +1,4 @@ -@import "../../../../styles/tokens.scss"; +@import "../../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/layout/topmessage/CsatSurvey.module.scss b/frontend/src/components/layout/topmessage/CsatSurvey.module.scss index 58d7ca420d..c3c098f233 100644 --- a/frontend/src/components/layout/topmessage/CsatSurvey.module.scss +++ b/frontend/src/components/layout/topmessage/CsatSurvey.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/layout/topmessage/HolidayPromoBanner.module.scss b/frontend/src/components/layout/topmessage/HolidayPromoBanner.module.scss index 46583f6953..b553c54580 100644 --- a/frontend/src/components/layout/topmessage/HolidayPromoBanner.module.scss +++ b/frontend/src/components/layout/topmessage/HolidayPromoBanner.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; // Hardcoding #5015cd after talking with design, no token for this color exists yet in Nebula. diff --git a/frontend/src/components/layout/topmessage/InterviewRecruitment.module.scss b/frontend/src/components/layout/topmessage/InterviewRecruitment.module.scss index 3e89c2c916..03338de1f7 100644 --- a/frontend/src/components/layout/topmessage/InterviewRecruitment.module.scss +++ b/frontend/src/components/layout/topmessage/InterviewRecruitment.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; $dismissButtonWidth: 30px; diff --git a/frontend/src/components/layout/topmessage/NpsSurvey.module.scss b/frontend/src/components/layout/topmessage/NpsSurvey.module.scss index be09719623..569a9cc0d9 100644 --- a/frontend/src/components/layout/topmessage/NpsSurvey.module.scss +++ b/frontend/src/components/layout/topmessage/NpsSurvey.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/components/layout/topmessage/PhoneSurvey.module.scss b/frontend/src/components/layout/topmessage/PhoneSurvey.module.scss index 3e89c2c916..03338de1f7 100644 --- a/frontend/src/components/layout/topmessage/PhoneSurvey.module.scss +++ b/frontend/src/components/layout/topmessage/PhoneSurvey.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; $dismissButtonWidth: 30px; diff --git a/frontend/src/components/phones/dashboard/PhoneDashboard.module.scss b/frontend/src/components/phones/dashboard/PhoneDashboard.module.scss index aabc38490c..4448de053d 100644 --- a/frontend/src/components/phones/dashboard/PhoneDashboard.module.scss +++ b/frontend/src/components/phones/dashboard/PhoneDashboard.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .main-phone-wrapper { height: 100%; diff --git a/frontend/src/components/phones/dashboard/PhoneWelcomeView.module.scss b/frontend/src/components/phones/dashboard/PhoneWelcomeView.module.scss index e3f3962fa6..9591174877 100644 --- a/frontend/src/components/phones/dashboard/PhoneWelcomeView.module.scss +++ b/frontend/src/components/phones/dashboard/PhoneWelcomeView.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .main-wrapper { display: flex; diff --git a/frontend/src/components/phones/onboarding/PurchasePhonesPlan.module.scss b/frontend/src/components/phones/onboarding/PurchasePhonesPlan.module.scss index 8bd8211070..a8de81b40e 100644 --- a/frontend/src/components/phones/onboarding/PurchasePhonesPlan.module.scss +++ b/frontend/src/components/phones/onboarding/PurchasePhonesPlan.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .wrapper { display: flex; diff --git a/frontend/src/components/phones/onboarding/RealPhoneSetup.module.scss b/frontend/src/components/phones/onboarding/RealPhoneSetup.module.scss index 922757c3cf..a191d02efc 100644 --- a/frontend/src/components/phones/onboarding/RealPhoneSetup.module.scss +++ b/frontend/src/components/phones/onboarding/RealPhoneSetup.module.scss @@ -1,6 +1,6 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .step { flex: 1 0 auto; diff --git a/frontend/src/components/phones/onboarding/RelayNumberConfirmationModal.module.scss b/frontend/src/components/phones/onboarding/RelayNumberConfirmationModal.module.scss index 123a328974..318e0575e7 100644 --- a/frontend/src/components/phones/onboarding/RelayNumberConfirmationModal.module.scss +++ b/frontend/src/components/phones/onboarding/RelayNumberConfirmationModal.module.scss @@ -1,4 +1,4 @@ -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/components/phones/onboarding/RelayNumberPicker.module.scss b/frontend/src/components/phones/onboarding/RelayNumberPicker.module.scss index a87b5e2107..ca5951668c 100644 --- a/frontend/src/components/phones/onboarding/RelayNumberPicker.module.scss +++ b/frontend/src/components/phones/onboarding/RelayNumberPicker.module.scss @@ -1,6 +1,6 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; -@import "../../../styles/tokens.scss"; +@import "../../../styles/tokens"; .step, .controls { diff --git a/frontend/src/components/waitlist/WaitlistPage.module.scss b/frontend/src/components/waitlist/WaitlistPage.module.scss index bd913edace..abb1796bc1 100644 --- a/frontend/src/components/waitlist/WaitlistPage.module.scss +++ b/frontend/src/components/waitlist/WaitlistPage.module.scss @@ -1,4 +1,4 @@ -@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index.scss"; +@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/forms/lib"; diff --git a/frontend/src/pages/accounts/profile.module.scss b/frontend/src/pages/accounts/profile.module.scss index cf2c08f83e..eea9419873 100644 --- a/frontend/src/pages/accounts/profile.module.scss +++ b/frontend/src/pages/accounts/profile.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; @import "~@mozilla-protocol/core/protocol/css/includes/mixins/typography"; diff --git a/frontend/src/pages/accounts/settings.module.scss b/frontend/src/pages/accounts/settings.module.scss index f0f8c77629..342d4d2bfd 100644 --- a/frontend/src/pages/accounts/settings.module.scss +++ b/frontend/src/pages/accounts/settings.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; .settings-page { display: flex; diff --git a/frontend/src/pages/contains-tracker-warning.module.scss b/frontend/src/pages/contains-tracker-warning.module.scss index ca5dcdaf06..6346a9670a 100644 --- a/frontend/src/pages/contains-tracker-warning.module.scss +++ b/frontend/src/pages/contains-tracker-warning.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .contains-tracker-container { diff --git a/frontend/src/pages/faq.module.scss b/frontend/src/pages/faq.module.scss index bbdaf45a45..76a76461d6 100644 --- a/frontend/src/pages/faq.module.scss +++ b/frontend/src/pages/faq.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .faq-page { diff --git a/frontend/src/pages/flags.module.scss b/frontend/src/pages/flags.module.scss index 3c6653806c..728a3e59ea 100644 --- a/frontend/src/pages/flags.module.scss +++ b/frontend/src/pages/flags.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/pages/index.module.scss b/frontend/src/pages/index.module.scss index 0fd08f19a6..cd80426535 100644 --- a/frontend/src/pages/index.module.scss +++ b/frontend/src/pages/index.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .hero { diff --git a/frontend/src/pages/mock/mockSession.module.scss b/frontend/src/pages/mock/mockSession.module.scss index 7bca482105..80bbc80214 100644 --- a/frontend/src/pages/mock/mockSession.module.scss +++ b/frontend/src/pages/mock/mockSession.module.scss @@ -1,4 +1,4 @@ -@import "../../styles/tokens.scss"; +@import "../../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .mock-session { diff --git a/frontend/src/pages/premium.module.scss b/frontend/src/pages/premium.module.scss index 27a3f0e6c5..f4b457ee36 100644 --- a/frontend/src/pages/premium.module.scss +++ b/frontend/src/pages/premium.module.scss @@ -1,5 +1,5 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../styles/tokens.scss"; +@import "../styles/tokens"; .hero { display: flex; diff --git a/frontend/src/pages/tracker-report.module.scss b/frontend/src/pages/tracker-report.module.scss index dc299ae69e..6a4ba6723e 100644 --- a/frontend/src/pages/tracker-report.module.scss +++ b/frontend/src/pages/tracker-report.module.scss @@ -1,4 +1,4 @@ -@import "../styles/tokens.scss"; +@import "../styles/tokens"; @import "~@mozilla-protocol/core/protocol/css/includes/lib"; .wrapper { diff --git a/frontend/src/pages/vpn-relay-welcome.module.scss b/frontend/src/pages/vpn-relay-welcome.module.scss index fa3e8ac0b9..3ef25159c7 100644 --- a/frontend/src/pages/vpn-relay-welcome.module.scss +++ b/frontend/src/pages/vpn-relay-welcome.module.scss @@ -1,6 +1,6 @@ @import "~@mozilla-protocol/core/protocol/css/includes/lib"; -@import "../styles/tokens.scss"; -@import "../../src/components/Button.module.scss"; +@import "../styles/tokens"; +@import "../../src/components/Button.module"; .content-container { display: flex; diff --git a/frontend/src/styles/globals.scss b/frontend/src/styles/globals.scss index eaa90d593f..f3bbd4cf0d 100644 --- a/frontend/src/styles/globals.scss +++ b/frontend/src/styles/globals.scss @@ -1,7 +1,7 @@ -@import "./fonts/inter-ui.scss"; -@import "./fonts/metropolis.scss"; -@import "./fonts/zilla-slab.scss"; -@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index.scss"; +@import "./fonts/inter-ui"; +@import "./fonts/metropolis"; +@import "./fonts/zilla-slab"; +@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index"; @import "~@mozilla-protocol/core/protocol/css/base/elements/reset"; /* diff --git a/frontend/src/styles/tokens.scss b/frontend/src/styles/tokens.scss index 3596b26bdc..9e6a419c9b 100644 --- a/frontend/src/styles/tokens.scss +++ b/frontend/src/styles/tokens.scss @@ -1,4 +1,4 @@ -@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index.scss"; +@import "~@mozilla-protocol/core/protocol/css/includes/tokens/dist/index"; /* next.js will rename the file if any of the content changes (after processing