From 913f95acb6ce066274a6f601ef0323f419caf6b2 Mon Sep 17 00:00:00 2001 From: Allan Sham Date: Thu, 8 Jun 2023 12:20:39 +0100 Subject: [PATCH 1/3] remove tildes from core/scss and icons/scss --- core/scss/components/accordion/module.scss | 2 +- core/scss/components/alert/module.scss | 2 +- core/scss/components/avatar/module.scss | 4 ++-- core/scss/components/badge/module.scss | 2 +- core/scss/components/breadcrumbs/module.scss | 2 +- core/scss/components/checkbox/module.scss | 4 ++-- core/scss/components/close/module.scss | 2 +- core/scss/components/date-picker/module.scss | 2 +- core/scss/components/input/module.scss | 4 ++-- core/scss/components/list-item/module.scss | 2 +- core/scss/components/loader/module.scss | 2 +- core/scss/components/loading/module.scss | 2 +- core/scss/components/modal/module.scss | 4 ++-- core/scss/components/panel/module.scss | 2 +- core/scss/components/popover/module.scss | 4 ++-- core/scss/components/radio/module.scss | 2 +- core/scss/components/space-list/module.scss | 2 +- core/scss/components/top-bar/module.scss | 2 +- core/scss/icons/icons.scss | 2 +- core/scss/momentum-ui-components.scss | 6 +++--- core/scss/momentum-ui-ng.scss | 8 ++++---- core/scss/momentum-ui.scss | 2 +- core/scss/ng/accordion.scss | 2 +- core/scss/ng/messagebox.scss | 2 +- core/scss/ng/notification.scss | 2 +- core/scss/ng/select.scss | 2 +- core/scss/ng/settings/settings.scss | 12 ++++++------ core/scss/ng/side-panel.scss | 4 ++-- core/scss/ng/topbar.scss | 2 +- core/scss/ng/topnav.scss | 2 +- core/scss/ng/typeahead.scss | 2 +- core/scss/settings/core.scss | 4 ++-- core/scss/settings/settings.scss | 10 +++++----- core/scss/typography/settings.scss | 2 +- icons/scss/variables.scss | 2 +- 35 files changed, 56 insertions(+), 56 deletions(-) diff --git a/core/scss/components/accordion/module.scss b/core/scss/components/accordion/module.scss index 93e81e8146..e3cf0ef358 100644 --- a/core/scss/components/accordion/module.scss +++ b/core/scss/components/accordion/module.scss @@ -8,7 +8,7 @@ @import '../../tools/mixins/core'; @import '../../tools/mixins/focus'; @import '../../typography/mixins'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; @import 'settings'; @import 'mixins'; diff --git a/core/scss/components/alert/module.scss b/core/scss/components/alert/module.scss index 23c8ca7d60..d1e26b1da9 100644 --- a/core/scss/components/alert/module.scss +++ b/core/scss/components/alert/module.scss @@ -1,7 +1,7 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/avatar/module.scss b/core/scss/components/avatar/module.scss index c2e73b6386..9035f499e0 100644 --- a/core/scss/components/avatar/module.scss +++ b/core/scss/components/avatar/module.scss @@ -1,8 +1,8 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '~@momentum-ui/icons/scss/mixins'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/variables'; // Settings @import "../../colors/settings-base.scss"; diff --git a/core/scss/components/badge/module.scss b/core/scss/components/badge/module.scss index 11f3935699..bd2fa18d5f 100644 --- a/core/scss/components/badge/module.scss +++ b/core/scss/components/badge/module.scss @@ -2,7 +2,7 @@ @import '../../tools/mixins/core'; // Icons -@import '~@momentum-ui/icons/scss/momentum-ui-icons'; +@import '@momentum-ui/icons/scss/momentum-ui-icons'; // Settings @import "../../colors/settings-base.scss"; diff --git a/core/scss/components/breadcrumbs/module.scss b/core/scss/components/breadcrumbs/module.scss index 71b155d45c..51227388e4 100644 --- a/core/scss/components/breadcrumbs/module.scss +++ b/core/scss/components/breadcrumbs/module.scss @@ -16,7 +16,7 @@ @import '../../typography/placeholders'; // Elements -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; // Typography @include brand-font-face-regular; diff --git a/core/scss/components/checkbox/module.scss b/core/scss/components/checkbox/module.scss index 05a66905d3..d0e52e7093 100644 --- a/core/scss/components/checkbox/module.scss +++ b/core/scss/components/checkbox/module.scss @@ -2,8 +2,8 @@ @import '../../tools/mixins/core'; // Icons -@import '~@momentum-ui/icons/scss/mixins'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/variables'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/close/module.scss b/core/scss/components/close/module.scss index d8dff47f9c..edde766039 100644 --- a/core/scss/components/close/module.scss +++ b/core/scss/components/close/module.scss @@ -6,7 +6,7 @@ @import '../../typography/settings'; @import 'settings'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; @import '../../tools/mixins/easing'; @import 'close'; diff --git a/core/scss/components/date-picker/module.scss b/core/scss/components/date-picker/module.scss index 9e68501fdf..53c66312e7 100644 --- a/core/scss/components/date-picker/module.scss +++ b/core/scss/components/date-picker/module.scss @@ -1,7 +1,7 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; // Settings @import '../../colors/settings'; diff --git a/core/scss/components/input/module.scss b/core/scss/components/input/module.scss index fb27c7027f..b6eefd6b13 100644 --- a/core/scss/components/input/module.scss +++ b/core/scss/components/input/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/variables'; @import '../../colors/settings'; @import '../../settings/core'; @import '../../settings/media'; @@ -16,7 +16,7 @@ @import '../../tools/mixins/focus'; @import '../../tools/mixins/flex'; @import '../../tools/mixins/spacing'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; @import 'mixins'; @import 'input'; diff --git a/core/scss/components/list-item/module.scss b/core/scss/components/list-item/module.scss index 30fe8932ae..8a54c3a10e 100644 --- a/core/scss/components/list-item/module.scss +++ b/core/scss/components/list-item/module.scss @@ -1,7 +1,7 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/variables'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/loader/module.scss b/core/scss/components/loader/module.scss index 1582337578..3f77a4a46f 100644 --- a/core/scss/components/loader/module.scss +++ b/core/scss/components/loader/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/variables'; @import "../../colors/settings-base.scss"; @import '../../settings/core'; diff --git a/core/scss/components/loading/module.scss b/core/scss/components/loading/module.scss index 7595c1bead..541122d080 100644 --- a/core/scss/components/loading/module.scss +++ b/core/scss/components/loading/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; @import '../../colors/settings.scss'; @import '../../settings/core'; @import '../../tools/mixins/flex'; diff --git a/core/scss/components/modal/module.scss b/core/scss/components/modal/module.scss index 5148136668..693262e7bc 100644 --- a/core/scss/components/modal/module.scss +++ b/core/scss/components/modal/module.scss @@ -2,8 +2,8 @@ @import '../../tools/mixins/core'; // Icons -@import '~@momentum-ui/icons/scss/variables'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/mixins'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/panel/module.scss b/core/scss/components/panel/module.scss index 79a5ab9d8b..082eb5142b 100644 --- a/core/scss/components/panel/module.scss +++ b/core/scss/components/panel/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/variables'; @import '../../colors/settings'; @import '../../settings/core'; @import '../../settings/media'; diff --git a/core/scss/components/popover/module.scss b/core/scss/components/popover/module.scss index 37d1dbcff7..b94b04042c 100644 --- a/core/scss/components/popover/module.scss +++ b/core/scss/components/popover/module.scss @@ -2,8 +2,8 @@ @import "../../tools/mixins/core"; // Icons -@import '~@momentum-ui/icons/scss/mixins'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/variables'; // Settings @import "../../colors/settings-base.scss"; diff --git a/core/scss/components/radio/module.scss b/core/scss/components/radio/module.scss index 854c694623..579a266f9b 100644 --- a/core/scss/components/radio/module.scss +++ b/core/scss/components/radio/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; @import '../../colors/settings'; @import '../../settings/core'; diff --git a/core/scss/components/space-list/module.scss b/core/scss/components/space-list/module.scss index 65c939ba96..7c0adeefef 100644 --- a/core/scss/components/space-list/module.scss +++ b/core/scss/components/space-list/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/variables'; @import '../../colors/settings'; @import '../../settings/core'; @import '../../settings/media'; diff --git a/core/scss/components/top-bar/module.scss b/core/scss/components/top-bar/module.scss index f7c5cb919a..bb20fe3218 100644 --- a/core/scss/components/top-bar/module.scss +++ b/core/scss/components/top-bar/module.scss @@ -2,7 +2,7 @@ @import '../../tools/mixins/core'; // Icons -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/variables'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/icons/icons.scss b/core/scss/icons/icons.scss index 1b2ad98707..386ac4afb9 100644 --- a/core/scss/icons/icons.scss +++ b/core/scss/icons/icons.scss @@ -1 +1 @@ -@import '~@momentum-ui/icons/scss/momentum-ui-icons'; +@import '@momentum-ui/icons/scss/momentum-ui-icons'; diff --git a/core/scss/momentum-ui-components.scss b/core/scss/momentum-ui-components.scss index ae13288b34..ad6c48b560 100644 --- a/core/scss/momentum-ui-components.scss +++ b/core/scss/momentum-ui-components.scss @@ -2,11 +2,11 @@ @import 'tools/mixins/core'; // Settings -@import '~@momentum-ui/icons/scss/variables'; +@import '@momentum-ui/icons/scss/variables'; @import 'settings/settings'; // Tools -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; @import 'tools/mixins/background-variant'; @import 'tools/mixins/baseline'; @import 'tools/mixins/border-radius'; @@ -67,7 +67,7 @@ @import 'typography/placeholders'; @import 'components/loader/placeholders'; -@import '~@momentum-ui/icons/scss/momentum-ui-icons'; +@import '@momentum-ui/icons/scss/momentum-ui-icons'; @import 'generic/components'; diff --git a/core/scss/momentum-ui-ng.scss b/core/scss/momentum-ui-ng.scss index fc557b4d6e..1051603fc3 100644 --- a/core/scss/momentum-ui-ng.scss +++ b/core/scss/momentum-ui-ng.scss @@ -5,7 +5,7 @@ @import 'ng/settings/settings'; // Tools -@import '~@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/mixins'; @import 'tools/mixins/background-variant'; @import 'tools/mixins/baseline'; @import 'tools/mixins/border-radius'; @@ -84,8 +84,8 @@ @import 'layouts/layout-grid/layout-grid'; // Icons -@import '~@momentum-ui/icons/scss/momentum-ui-icons'; -@import '~@momentum-ui/icons/scss/symphony/icon-mapping'; +@import '@momentum-ui/icons/scss/momentum-ui-icons'; +@import '@momentum-ui/icons/scss/symphony/icon-mapping'; // Components @import 'components/accordion/accordion'; @@ -149,7 +149,7 @@ @import 'components/top-bar/top-bar'; // ng specific styles -@import '~@momentum-ui/icons/scss/symphony/placeholder-mapping'; +@import '@momentum-ui/icons/scss/symphony/placeholder-mapping'; @import 'settings/dropdown'; @import 'ng/settings/slider'; @import 'ng/settings/sidepanel'; diff --git a/core/scss/momentum-ui.scss b/core/scss/momentum-ui.scss index a72e6142ac..66f5aae0a3 100644 --- a/core/scss/momentum-ui.scss +++ b/core/scss/momentum-ui.scss @@ -2,7 +2,7 @@ @import 'tools/mixins/core'; // Icons -@import '~@momentum-ui/icons/scss/momentum-ui-icons'; +@import '@momentum-ui/icons/scss/momentum-ui-icons'; // Settings @import 'settings/settings'; diff --git a/core/scss/ng/accordion.scss b/core/scss/ng/accordion.scss index 8b7ca84e5c..a69ca86189 100644 --- a/core/scss/ng/accordion.scss +++ b/core/scss/ng/accordion.scss @@ -2,7 +2,7 @@ // @import '../settings/core'; // @import '../typography/settings'; // @import '../tools/mixins/core'; -// @import '~@momentum-ui/icons/scss/mixins'; +// @import '@momentum-ui/icons/scss/mixins'; $accordion-navigation-padding: rem-calc(16) !default; $accordion-navigation-bg-color: $md-gray-20 !default; diff --git a/core/scss/ng/messagebox.scss b/core/scss/ng/messagebox.scss index f9f2729cb4..c06cd178be 100644 --- a/core/scss/ng/messagebox.scss +++ b/core/scss/ng/messagebox.scss @@ -1,7 +1,7 @@ // @import '../colors/settings'; // @import '../tools/mixins/spacing'; // @import '../typography/placeholders'; -// @import '~@momentum-ui/icons/scss/mixins'; +// @import '@momentum-ui/icons/scss/mixins'; @include exports('ng-messagebox') { .messagebox-backdrop { diff --git a/core/scss/ng/notification.scss b/core/scss/ng/notification.scss index 95237540a0..4db7c89971 100644 --- a/core/scss/ng/notification.scss +++ b/core/scss/ng/notification.scss @@ -4,7 +4,7 @@ // @import '../typography/settings'; // @import '../alert/settings'; // @import '../tools/mixins/spacing'; -// @import '~@momentum-ui/icons/scss/mixins'; +// @import '@momentum-ui/icons/scss/mixins'; @include exports('ng-notifications') { #toast-container { diff --git a/core/scss/ng/select.scss b/core/scss/ng/select.scss index 3ae278c88c..8d4967bdfc 100644 --- a/core/scss/ng/select.scss +++ b/core/scss/ng/select.scss @@ -11,7 +11,7 @@ // @import '../components/list-item/mixins'; // @import '../tools/mixins/nav-divider'; // @import '../tools/mixins/spacing'; -// @import '~@momentum-ui/icons/scss/mixins'; +// @import '@momentum-ui/icons/scss/mixins'; @include exports('ng-select') { .hidden-select { diff --git a/core/scss/ng/settings/settings.scss b/core/scss/ng/settings/settings.scss index 557508141a..7910356c70 100644 --- a/core/scss/ng/settings/settings.scss +++ b/core/scss/ng/settings/settings.scss @@ -3,7 +3,7 @@ } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '~@momentum-ui/icons/fonts' !default; +$icon-font-path: '@momentum-ui/icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 @@ -3480,7 +3480,7 @@ $icon-zoom-out: $icon-zoom-out_16 !default; } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '~@momentum-ui/icons/fonts' !default; +$icon-font-path: '@momentum-ui/icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 @@ -6957,7 +6957,7 @@ $icon-zoom-out: $icon-zoom-out_16 !default; // generated from the individual scss settings files. //------------------------------------------------------ -@import '~@momentum-ui/core/scss/tools/functions/core'; +@import '@momentum-ui/core/scss/tools/functions/core'; //------------------------------------------------------ // Do not edit this file directly. These variables are @@ -7781,7 +7781,7 @@ $brand-shadow: rgba(0, 0, 0, 0.2); $brand-shadow-dark: rgba(0, 0, 0, 0.45); // Icons Variables -$icon-font-path: '~@momentum-ui/icons/fonts' !default; +$icon-font-path: '@momentum-ui/icons/fonts' !default; $icon-font-name: 'momentum-ui-icons' !default; // define default font weights @@ -7804,7 +7804,7 @@ $cursor-disabled: not-allowed; $brand-default: $md-gray-90; // legacy bootstrap - used in Atlas -$images-path: '~@momentum-ui/core/images' !default; +$images-path: '@momentum-ui/core/images' !default; // Dropdown Max Height for Select/Menu/SubMenu $dropdown-height: rem-calc(308); @@ -8019,7 +8019,7 @@ $f-dropdown-radius: $global-radius !default; $f-dropdown-z-index: 501 !default; // We use these to define default font stacks -$brand-font-folder: '~@momentum-ui/core/fonts' !default; +$brand-font-folder: '@momentum-ui/core/fonts' !default; $font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif; $font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif; $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; diff --git a/core/scss/ng/side-panel.scss b/core/scss/ng/side-panel.scss index 3e7b368ef3..89027289b8 100644 --- a/core/scss/ng/side-panel.scss +++ b/core/scss/ng/side-panel.scss @@ -9,8 +9,8 @@ // @import '../tools/mixins/text-hide'; // @import '../tools/mixins/text-overflow'; // @import '../utilities/core'; -// @import '~@momentum-ui/icons/scss/mixins'; -@import '~@momentum-ui/icons/scss/symphony/variable-mapping'; +// @import '@momentum-ui/icons/scss/mixins'; +@import '@momentum-ui/icons/scss/symphony/variable-mapping'; $sidepanel-header-content-height: rem-calc(40); diff --git a/core/scss/ng/topbar.scss b/core/scss/ng/topbar.scss index dbdec5943d..262d9789ab 100644 --- a/core/scss/ng/topbar.scss +++ b/core/scss/ng/topbar.scss @@ -7,7 +7,7 @@ // @import '../tools/mixins/text-overflow'; // @import '../tools/mixins/spacing'; // @import '../typography/placeholders'; -// @import '~@momentum-ui/icons/scss/mixins'; +// @import '@momentum-ui/icons/scss/mixins'; // @import '../../colors/settings'; // @import '../../typography/settings'; // @import '../../tools/functions/core'; diff --git a/core/scss/ng/topnav.scss b/core/scss/ng/topnav.scss index 95ad11d812..e252dcbc00 100644 --- a/core/scss/ng/topnav.scss +++ b/core/scss/ng/topnav.scss @@ -1,7 +1,7 @@ // @import '../colors/settings'; // @import '../typography/settings'; // @import '../tools/mixins/spacing'; -// @import '~@momentum-ui/icons/scss/mixins'; +// @import '@momentum-ui/icons/scss/mixins'; $top-nav-font-size-desktop: rem-calc(12); $top-nav-font-size-mobile: rem-calc(14); diff --git a/core/scss/ng/typeahead.scss b/core/scss/ng/typeahead.scss index 06415e9d9d..df3f21c0b2 100644 --- a/core/scss/ng/typeahead.scss +++ b/core/scss/ng/typeahead.scss @@ -1,7 +1,7 @@ // @import '../colors/settings'; // @import '../typography/settings'; // @import '../tools/mixins/spacing'; -// @import '~@momentum-ui/icons/scss/mixins'; +// @import '@momentum-ui/icons/scss/mixins'; @include exports('ng-typeahead') { .typeahead-group { diff --git a/core/scss/settings/core.scss b/core/scss/settings/core.scss index 97f589fb77..0501052de9 100644 --- a/core/scss/settings/core.scss +++ b/core/scss/settings/core.scss @@ -94,7 +94,7 @@ $brand-shadow: rgba(0, 0, 0, 0.2); $brand-shadow-dark: rgba(0, 0, 0, 0.45); // Icons Variables -$icon-font-path: '~@momentum-ui/icons/fonts' !default; +$icon-font-path: '@momentum-ui/icons/fonts' !default; $icon-font-name: 'momentum-ui-icons' !default; // define default font weights @@ -117,7 +117,7 @@ $cursor-disabled: not-allowed; $brand-default: $md-gray-90; // legacy bootstrap - used in Atlas -$images-path: '~@momentum-ui/core/images' !default; +$images-path: '@momentum-ui/core/images' !default; // Dropdown Max Height for Select/Menu/SubMenu $dropdown-height: rem-calc(308); diff --git a/core/scss/settings/settings.scss b/core/scss/settings/settings.scss index 281e613318..0c45910d5d 100644 --- a/core/scss/settings/settings.scss +++ b/core/scss/settings/settings.scss @@ -3,7 +3,7 @@ } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '~@momentum-ui/icons/fonts' !default; +$icon-font-path: '@momentum-ui/icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 @@ -3480,7 +3480,7 @@ $icon-zoom-out: $icon-zoom-out_16 !default; // generated from the individual scss settings files. //------------------------------------------------------ -@import '~@momentum-ui/core/scss/tools/functions/core'; +@import '@momentum-ui/core/scss/tools/functions/core'; //------------------------------------------------------ // Do not edit this file directly. These variables are @@ -4304,7 +4304,7 @@ $brand-shadow: rgba(0, 0, 0, 0.2); $brand-shadow-dark: rgba(0, 0, 0, 0.45); // Icons Variables -$icon-font-path: '~@momentum-ui/icons/fonts' !default; +$icon-font-path: '@momentum-ui/icons/fonts' !default; $icon-font-name: 'momentum-ui-icons' !default; // define default font weights @@ -4327,7 +4327,7 @@ $cursor-disabled: not-allowed; $brand-default: $md-gray-90; // legacy bootstrap - used in Atlas -$images-path: '~@momentum-ui/core/images' !default; +$images-path: '@momentum-ui/core/images' !default; // Dropdown Max Height for Select/Menu/SubMenu $dropdown-height: rem-calc(308); @@ -4542,7 +4542,7 @@ $f-dropdown-radius: $global-radius !default; $f-dropdown-z-index: 501 !default; // We use these to define default font stacks -$brand-font-folder: '~@momentum-ui/core/fonts' !default; +$brand-font-folder: '@momentum-ui/core/fonts' !default; $font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif; $font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif; $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; diff --git a/core/scss/typography/settings.scss b/core/scss/typography/settings.scss index 4e2054be69..2a21c77c27 100644 --- a/core/scss/typography/settings.scss +++ b/core/scss/typography/settings.scss @@ -1,5 +1,5 @@ // We use these to define default font stacks -$brand-font-folder: '~@momentum-ui/core/fonts' !default; +$brand-font-folder: '@momentum-ui/core/fonts' !default; $font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif; $font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif; $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; diff --git a/icons/scss/variables.scss b/icons/scss/variables.scss index 1c479aa3d7..4ee79eafdf 100644 --- a/icons/scss/variables.scss +++ b/icons/scss/variables.scss @@ -3,7 +3,7 @@ } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '~@momentum-ui/icons/fonts' !default; +$icon-font-path: '@momentum-ui/icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 From 1a416f817dc676b5474f6921ee39cdde709b899e Mon Sep 17 00:00:00 2001 From: Allan Sham Date: Mon, 12 Jun 2023 17:03:06 +0100 Subject: [PATCH 2/3] fix(core): use relative path --- core/scss/components/accordion/module.scss | 2 +- core/scss/components/alert/module.scss | 2 +- core/scss/components/avatar/module.scss | 4 ++-- core/scss/components/badge/module.scss | 2 +- core/scss/components/breadcrumbs/module.scss | 2 +- core/scss/components/checkbox/module.scss | 4 ++-- core/scss/components/close/module.scss | 2 +- core/scss/components/date-picker/module.scss | 2 +- core/scss/components/input/module.scss | 4 ++-- core/scss/components/list-item/module.scss | 2 +- core/scss/components/loader/module.scss | 2 +- core/scss/components/loading/module.scss | 2 +- core/scss/components/modal/module.scss | 4 ++-- core/scss/components/panel/module.scss | 2 +- core/scss/components/popover/module.scss | 4 ++-- core/scss/components/radio/module.scss | 2 +- core/scss/components/space-list/module.scss | 2 +- core/scss/components/top-bar/module.scss | 2 +- core/scss/icons/icons.scss | 2 +- core/scss/momentum-ui-components.scss | 6 +++--- core/scss/momentum-ui-ng.scss | 8 ++++---- core/scss/momentum-ui.scss | 2 +- core/scss/ng/accordion.scss | 2 +- core/scss/ng/messagebox.scss | 2 +- core/scss/ng/notification.scss | 2 +- core/scss/ng/select.scss | 2 +- core/scss/ng/settings/settings.scss | 12 ++++++------ core/scss/ng/side-panel.scss | 4 ++-- core/scss/ng/topbar.scss | 2 +- core/scss/ng/topnav.scss | 2 +- core/scss/ng/typeahead.scss | 2 +- core/scss/settings/core.scss | 4 ++-- core/scss/settings/settings.scss | 11 ++++++----- core/scss/typography/settings.scss | 2 +- icons/scss/variables.scss | 2 +- 35 files changed, 57 insertions(+), 56 deletions(-) diff --git a/core/scss/components/accordion/module.scss b/core/scss/components/accordion/module.scss index e3cf0ef358..502f85385e 100644 --- a/core/scss/components/accordion/module.scss +++ b/core/scss/components/accordion/module.scss @@ -8,7 +8,7 @@ @import '../../tools/mixins/core'; @import '../../tools/mixins/focus'; @import '../../typography/mixins'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; @import 'settings'; @import 'mixins'; diff --git a/core/scss/components/alert/module.scss b/core/scss/components/alert/module.scss index d1e26b1da9..f7d2cb5cff 100644 --- a/core/scss/components/alert/module.scss +++ b/core/scss/components/alert/module.scss @@ -1,7 +1,7 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/avatar/module.scss b/core/scss/components/avatar/module.scss index 9035f499e0..46a701d36e 100644 --- a/core/scss/components/avatar/module.scss +++ b/core/scss/components/avatar/module.scss @@ -1,8 +1,8 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '@momentum-ui/icons/scss/mixins'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/mixins'; +@import '../../../../icons/scss/variables'; // Settings @import "../../colors/settings-base.scss"; diff --git a/core/scss/components/badge/module.scss b/core/scss/components/badge/module.scss index bd2fa18d5f..cb0606615f 100644 --- a/core/scss/components/badge/module.scss +++ b/core/scss/components/badge/module.scss @@ -2,7 +2,7 @@ @import '../../tools/mixins/core'; // Icons -@import '@momentum-ui/icons/scss/momentum-ui-icons'; +@import '../../../../icons/scss/momentum-ui-icons'; // Settings @import "../../colors/settings-base.scss"; diff --git a/core/scss/components/breadcrumbs/module.scss b/core/scss/components/breadcrumbs/module.scss index 51227388e4..77a1e1c028 100644 --- a/core/scss/components/breadcrumbs/module.scss +++ b/core/scss/components/breadcrumbs/module.scss @@ -16,7 +16,7 @@ @import '../../typography/placeholders'; // Elements -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; // Typography @include brand-font-face-regular; diff --git a/core/scss/components/checkbox/module.scss b/core/scss/components/checkbox/module.scss index d0e52e7093..1bfee3a2af 100644 --- a/core/scss/components/checkbox/module.scss +++ b/core/scss/components/checkbox/module.scss @@ -2,8 +2,8 @@ @import '../../tools/mixins/core'; // Icons -@import '@momentum-ui/icons/scss/mixins'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/mixins'; +@import '../../../../icons/scss/variables'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/close/module.scss b/core/scss/components/close/module.scss index edde766039..cfac18b4f5 100644 --- a/core/scss/components/close/module.scss +++ b/core/scss/components/close/module.scss @@ -6,7 +6,7 @@ @import '../../typography/settings'; @import 'settings'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; @import '../../tools/mixins/easing'; @import 'close'; diff --git a/core/scss/components/date-picker/module.scss b/core/scss/components/date-picker/module.scss index 53c66312e7..311b7a22e9 100644 --- a/core/scss/components/date-picker/module.scss +++ b/core/scss/components/date-picker/module.scss @@ -1,7 +1,7 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; // Settings @import '../../colors/settings'; diff --git a/core/scss/components/input/module.scss b/core/scss/components/input/module.scss index b6eefd6b13..0e24f76a86 100644 --- a/core/scss/components/input/module.scss +++ b/core/scss/components/input/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/variables'; @import '../../colors/settings'; @import '../../settings/core'; @import '../../settings/media'; @@ -16,7 +16,7 @@ @import '../../tools/mixins/focus'; @import '../../tools/mixins/flex'; @import '../../tools/mixins/spacing'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; @import 'mixins'; @import 'input'; diff --git a/core/scss/components/list-item/module.scss b/core/scss/components/list-item/module.scss index 8a54c3a10e..ca80fa1972 100644 --- a/core/scss/components/list-item/module.scss +++ b/core/scss/components/list-item/module.scss @@ -1,7 +1,7 @@ @import '../../tools/functions/core'; @import '../../tools/mixins/core'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/variables'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/loader/module.scss b/core/scss/components/loader/module.scss index 3f77a4a46f..59bb6b97e1 100644 --- a/core/scss/components/loader/module.scss +++ b/core/scss/components/loader/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/variables'; @import "../../colors/settings-base.scss"; @import '../../settings/core'; diff --git a/core/scss/components/loading/module.scss b/core/scss/components/loading/module.scss index 541122d080..d2c3df7c43 100644 --- a/core/scss/components/loading/module.scss +++ b/core/scss/components/loading/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; @import '../../colors/settings.scss'; @import '../../settings/core'; @import '../../tools/mixins/flex'; diff --git a/core/scss/components/modal/module.scss b/core/scss/components/modal/module.scss index 693262e7bc..6db797315a 100644 --- a/core/scss/components/modal/module.scss +++ b/core/scss/components/modal/module.scss @@ -2,8 +2,8 @@ @import '../../tools/mixins/core'; // Icons -@import '@momentum-ui/icons/scss/variables'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/variables'; +@import '../../../../icons/scss/mixins'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/components/panel/module.scss b/core/scss/components/panel/module.scss index 082eb5142b..6b935e1ed3 100644 --- a/core/scss/components/panel/module.scss +++ b/core/scss/components/panel/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/variables'; @import '../../colors/settings'; @import '../../settings/core'; @import '../../settings/media'; diff --git a/core/scss/components/popover/module.scss b/core/scss/components/popover/module.scss index b94b04042c..506f17e900 100644 --- a/core/scss/components/popover/module.scss +++ b/core/scss/components/popover/module.scss @@ -2,8 +2,8 @@ @import "../../tools/mixins/core"; // Icons -@import '@momentum-ui/icons/scss/mixins'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/mixins'; +@import '../../../../icons/scss/variables'; // Settings @import "../../colors/settings-base.scss"; diff --git a/core/scss/components/radio/module.scss b/core/scss/components/radio/module.scss index 579a266f9b..d9c64c06f7 100644 --- a/core/scss/components/radio/module.scss +++ b/core/scss/components/radio/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '@momentum-ui/icons/scss/mixins'; +@import '../../../../icons/scss/mixins'; @import '../../colors/settings'; @import '../../settings/core'; diff --git a/core/scss/components/space-list/module.scss b/core/scss/components/space-list/module.scss index 7c0adeefef..ad2d56e442 100644 --- a/core/scss/components/space-list/module.scss +++ b/core/scss/components/space-list/module.scss @@ -1,6 +1,6 @@ @import '../../tools/functions/core'; -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/variables'; @import '../../colors/settings'; @import '../../settings/core'; @import '../../settings/media'; diff --git a/core/scss/components/top-bar/module.scss b/core/scss/components/top-bar/module.scss index bb20fe3218..a235f5fd25 100644 --- a/core/scss/components/top-bar/module.scss +++ b/core/scss/components/top-bar/module.scss @@ -2,7 +2,7 @@ @import '../../tools/mixins/core'; // Icons -@import '@momentum-ui/icons/scss/variables'; +@import '../../../../icons/scss/variables'; // Settings @import '../../colors/settings-base.scss'; diff --git a/core/scss/icons/icons.scss b/core/scss/icons/icons.scss index 386ac4afb9..ef8ef05f9b 100644 --- a/core/scss/icons/icons.scss +++ b/core/scss/icons/icons.scss @@ -1 +1 @@ -@import '@momentum-ui/icons/scss/momentum-ui-icons'; +@import '../../../icons/scss/momentum-ui-icons'; diff --git a/core/scss/momentum-ui-components.scss b/core/scss/momentum-ui-components.scss index ad6c48b560..a6bfb3322d 100644 --- a/core/scss/momentum-ui-components.scss +++ b/core/scss/momentum-ui-components.scss @@ -2,11 +2,11 @@ @import 'tools/mixins/core'; // Settings -@import '@momentum-ui/icons/scss/variables'; +@import '../../icons/scss/variables'; @import 'settings/settings'; // Tools -@import '@momentum-ui/icons/scss/mixins'; +@import '../../icons/scss/mixins'; @import 'tools/mixins/background-variant'; @import 'tools/mixins/baseline'; @import 'tools/mixins/border-radius'; @@ -67,7 +67,7 @@ @import 'typography/placeholders'; @import 'components/loader/placeholders'; -@import '@momentum-ui/icons/scss/momentum-ui-icons'; +@import '../../icons/scss/momentum-ui-icons'; @import 'generic/components'; diff --git a/core/scss/momentum-ui-ng.scss b/core/scss/momentum-ui-ng.scss index 1051603fc3..b25546ad28 100644 --- a/core/scss/momentum-ui-ng.scss +++ b/core/scss/momentum-ui-ng.scss @@ -5,7 +5,7 @@ @import 'ng/settings/settings'; // Tools -@import '@momentum-ui/icons/scss/mixins'; +@import '../../icons/scss/mixins'; @import 'tools/mixins/background-variant'; @import 'tools/mixins/baseline'; @import 'tools/mixins/border-radius'; @@ -84,8 +84,8 @@ @import 'layouts/layout-grid/layout-grid'; // Icons -@import '@momentum-ui/icons/scss/momentum-ui-icons'; -@import '@momentum-ui/icons/scss/symphony/icon-mapping'; +@import '../../icons/scss/momentum-ui-icons'; +@import '../../icons/scss/symphony/icon-mapping'; // Components @import 'components/accordion/accordion'; @@ -149,7 +149,7 @@ @import 'components/top-bar/top-bar'; // ng specific styles -@import '@momentum-ui/icons/scss/symphony/placeholder-mapping'; +@import '../../icons/scss/symphony/placeholder-mapping'; @import 'settings/dropdown'; @import 'ng/settings/slider'; @import 'ng/settings/sidepanel'; diff --git a/core/scss/momentum-ui.scss b/core/scss/momentum-ui.scss index 66f5aae0a3..01f06fbc7e 100644 --- a/core/scss/momentum-ui.scss +++ b/core/scss/momentum-ui.scss @@ -2,7 +2,7 @@ @import 'tools/mixins/core'; // Icons -@import '@momentum-ui/icons/scss/momentum-ui-icons'; +@import '../../icons/scss/momentum-ui-icons'; // Settings @import 'settings/settings'; diff --git a/core/scss/ng/accordion.scss b/core/scss/ng/accordion.scss index a69ca86189..59371f7f31 100644 --- a/core/scss/ng/accordion.scss +++ b/core/scss/ng/accordion.scss @@ -2,7 +2,7 @@ // @import '../settings/core'; // @import '../typography/settings'; // @import '../tools/mixins/core'; -// @import '@momentum-ui/icons/scss/mixins'; +// @import '../../../icons/scss/mixins'; $accordion-navigation-padding: rem-calc(16) !default; $accordion-navigation-bg-color: $md-gray-20 !default; diff --git a/core/scss/ng/messagebox.scss b/core/scss/ng/messagebox.scss index c06cd178be..53a6d4713b 100644 --- a/core/scss/ng/messagebox.scss +++ b/core/scss/ng/messagebox.scss @@ -1,7 +1,7 @@ // @import '../colors/settings'; // @import '../tools/mixins/spacing'; // @import '../typography/placeholders'; -// @import '@momentum-ui/icons/scss/mixins'; +// @import '../../../icons/scss/mixins'; @include exports('ng-messagebox') { .messagebox-backdrop { diff --git a/core/scss/ng/notification.scss b/core/scss/ng/notification.scss index 4db7c89971..bf9c3b7901 100644 --- a/core/scss/ng/notification.scss +++ b/core/scss/ng/notification.scss @@ -4,7 +4,7 @@ // @import '../typography/settings'; // @import '../alert/settings'; // @import '../tools/mixins/spacing'; -// @import '@momentum-ui/icons/scss/mixins'; +// @import '../../../icons/scss/mixins'; @include exports('ng-notifications') { #toast-container { diff --git a/core/scss/ng/select.scss b/core/scss/ng/select.scss index 8d4967bdfc..0c42dfa6c2 100644 --- a/core/scss/ng/select.scss +++ b/core/scss/ng/select.scss @@ -11,7 +11,7 @@ // @import '../components/list-item/mixins'; // @import '../tools/mixins/nav-divider'; // @import '../tools/mixins/spacing'; -// @import '@momentum-ui/icons/scss/mixins'; +// @import '../../../icons/scss/mixins'; @include exports('ng-select') { .hidden-select { diff --git a/core/scss/ng/settings/settings.scss b/core/scss/ng/settings/settings.scss index 7910356c70..510da34b72 100644 --- a/core/scss/ng/settings/settings.scss +++ b/core/scss/ng/settings/settings.scss @@ -3,7 +3,7 @@ } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '@momentum-ui/icons/fonts' !default; +$icon-font-path: '../../../../icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 @@ -3480,7 +3480,7 @@ $icon-zoom-out: $icon-zoom-out_16 !default; } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '@momentum-ui/icons/fonts' !default; +$icon-font-path: '../../../../icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 @@ -6957,7 +6957,7 @@ $icon-zoom-out: $icon-zoom-out_16 !default; // generated from the individual scss settings files. //------------------------------------------------------ -@import '@momentum-ui/core/scss/tools/functions/core'; +@import '../../../../core/scss/tools/functions/core'; //------------------------------------------------------ // Do not edit this file directly. These variables are @@ -7781,7 +7781,7 @@ $brand-shadow: rgba(0, 0, 0, 0.2); $brand-shadow-dark: rgba(0, 0, 0, 0.45); // Icons Variables -$icon-font-path: '@momentum-ui/icons/fonts' !default; +$icon-font-path: '../../../../icons/fonts' !default; $icon-font-name: 'momentum-ui-icons' !default; // define default font weights @@ -7804,7 +7804,7 @@ $cursor-disabled: not-allowed; $brand-default: $md-gray-90; // legacy bootstrap - used in Atlas -$images-path: '@momentum-ui/core/images' !default; +$images-path: '../../../../core/images' !default; // Dropdown Max Height for Select/Menu/SubMenu $dropdown-height: rem-calc(308); @@ -8019,7 +8019,7 @@ $f-dropdown-radius: $global-radius !default; $f-dropdown-z-index: 501 !default; // We use these to define default font stacks -$brand-font-folder: '@momentum-ui/core/fonts' !default; +$brand-font-folder: '../../../../core/fonts' !default; $font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif; $font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif; $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; diff --git a/core/scss/ng/side-panel.scss b/core/scss/ng/side-panel.scss index 89027289b8..ff363a4298 100644 --- a/core/scss/ng/side-panel.scss +++ b/core/scss/ng/side-panel.scss @@ -9,8 +9,8 @@ // @import '../tools/mixins/text-hide'; // @import '../tools/mixins/text-overflow'; // @import '../utilities/core'; -// @import '@momentum-ui/icons/scss/mixins'; -@import '@momentum-ui/icons/scss/symphony/variable-mapping'; +// @import '../../../icons/scss/mixins'; +@import '../../../icons/scss/symphony/variable-mapping'; $sidepanel-header-content-height: rem-calc(40); diff --git a/core/scss/ng/topbar.scss b/core/scss/ng/topbar.scss index 262d9789ab..9817b228b0 100644 --- a/core/scss/ng/topbar.scss +++ b/core/scss/ng/topbar.scss @@ -7,7 +7,7 @@ // @import '../tools/mixins/text-overflow'; // @import '../tools/mixins/spacing'; // @import '../typography/placeholders'; -// @import '@momentum-ui/icons/scss/mixins'; +// @import '../../../icons/scss/mixins'; // @import '../../colors/settings'; // @import '../../typography/settings'; // @import '../../tools/functions/core'; diff --git a/core/scss/ng/topnav.scss b/core/scss/ng/topnav.scss index e252dcbc00..ca31985d94 100644 --- a/core/scss/ng/topnav.scss +++ b/core/scss/ng/topnav.scss @@ -1,7 +1,7 @@ // @import '../colors/settings'; // @import '../typography/settings'; // @import '../tools/mixins/spacing'; -// @import '@momentum-ui/icons/scss/mixins'; +@import '../../../icons/scss/mixins'; $top-nav-font-size-desktop: rem-calc(12); $top-nav-font-size-mobile: rem-calc(14); diff --git a/core/scss/ng/typeahead.scss b/core/scss/ng/typeahead.scss index df3f21c0b2..c2bcc725ed 100644 --- a/core/scss/ng/typeahead.scss +++ b/core/scss/ng/typeahead.scss @@ -1,7 +1,7 @@ // @import '../colors/settings'; // @import '../typography/settings'; // @import '../tools/mixins/spacing'; -// @import '@momentum-ui/icons/scss/mixins'; +// @import '../../../icons/scss/mixins'; @include exports('ng-typeahead') { .typeahead-group { diff --git a/core/scss/settings/core.scss b/core/scss/settings/core.scss index 0501052de9..5769458fb5 100644 --- a/core/scss/settings/core.scss +++ b/core/scss/settings/core.scss @@ -94,7 +94,7 @@ $brand-shadow: rgba(0, 0, 0, 0.2); $brand-shadow-dark: rgba(0, 0, 0, 0.45); // Icons Variables -$icon-font-path: '@momentum-ui/icons/fonts' !default; +$icon-font-path: '../../../icons/fonts' !default; $icon-font-name: 'momentum-ui-icons' !default; // define default font weights @@ -117,7 +117,7 @@ $cursor-disabled: not-allowed; $brand-default: $md-gray-90; // legacy bootstrap - used in Atlas -$images-path: '@momentum-ui/core/images' !default; +$images-path: '../../../core/images' !default; // Dropdown Max Height for Select/Menu/SubMenu $dropdown-height: rem-calc(308); diff --git a/core/scss/settings/settings.scss b/core/scss/settings/settings.scss index 0c45910d5d..39fd1dfd2a 100644 --- a/core/scss/settings/settings.scss +++ b/core/scss/settings/settings.scss @@ -3,7 +3,7 @@ } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '@momentum-ui/icons/fonts' !default; +$icon-font-path: '../../../icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 @@ -3480,7 +3480,8 @@ $icon-zoom-out: $icon-zoom-out_16 !default; // generated from the individual scss settings files. //------------------------------------------------------ -@import '@momentum-ui/core/scss/tools/functions/core'; +// @import '~@momentum-ui/core/scss/tools/functions/core'; +@import '../../../core/scss/tools/functions/core'; //------------------------------------------------------ // Do not edit this file directly. These variables are @@ -4304,7 +4305,7 @@ $brand-shadow: rgba(0, 0, 0, 0.2); $brand-shadow-dark: rgba(0, 0, 0, 0.45); // Icons Variables -$icon-font-path: '@momentum-ui/icons/fonts' !default; +$icon-font-path: '../../../icons/fonts' !default; $icon-font-name: 'momentum-ui-icons' !default; // define default font weights @@ -4327,7 +4328,7 @@ $cursor-disabled: not-allowed; $brand-default: $md-gray-90; // legacy bootstrap - used in Atlas -$images-path: '@momentum-ui/core/images' !default; +$images-path: '../../../core/images' !default; // Dropdown Max Height for Select/Menu/SubMenu $dropdown-height: rem-calc(308); @@ -4542,7 +4543,7 @@ $f-dropdown-radius: $global-radius !default; $f-dropdown-z-index: 501 !default; // We use these to define default font stacks -$brand-font-folder: '@momentum-ui/core/fonts' !default; +$brand-font-folder: '../../../core/fonts' !default; $font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif; $font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif; $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; diff --git a/core/scss/typography/settings.scss b/core/scss/typography/settings.scss index 2a21c77c27..1946bd0206 100644 --- a/core/scss/typography/settings.scss +++ b/core/scss/typography/settings.scss @@ -1,5 +1,5 @@ // We use these to define default font stacks -$brand-font-folder: '@momentum-ui/core/fonts' !default; +$brand-font-folder: '../../../core/fonts' !default; $font-family-sans-serif: 'Helvetica Neue', Helvetica, Arial, sans-serif; $font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif; $font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace; diff --git a/icons/scss/variables.scss b/icons/scss/variables.scss index 4ee79eafdf..0802b3e97d 100644 --- a/icons/scss/variables.scss +++ b/icons/scss/variables.scss @@ -3,7 +3,7 @@ } $icon-font-name: 'momentum-ui-icons' !default; -$icon-font-path: '@momentum-ui/icons/fonts' !default; +$icon-font-path: '../../icons/fonts' !default; $icon-css-prefix: icon !default; $icon-border-color: #D2D5D6 !default; // $md-gray-30 $icon-inverse-color: #FFFFFF !default; // $md-white-100 From 4b106335f1d94b43d564bcbdd52d90c26a9ad2f8 Mon Sep 17 00:00:00 2001 From: Allan Sham Date: Tue, 13 Jun 2023 01:43:35 +0100 Subject: [PATCH 3/3] docs(core): remove comment --- core/scss/settings/settings.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/core/scss/settings/settings.scss b/core/scss/settings/settings.scss index 39fd1dfd2a..995a37fc87 100644 --- a/core/scss/settings/settings.scss +++ b/core/scss/settings/settings.scss @@ -3480,7 +3480,6 @@ $icon-zoom-out: $icon-zoom-out_16 !default; // generated from the individual scss settings files. //------------------------------------------------------ -// @import '~@momentum-ui/core/scss/tools/functions/core'; @import '../../../core/scss/tools/functions/core'; //------------------------------------------------------