Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove tildes from core/scss and icons/scss #1454

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

remove tildes from core/scss and icons/scss #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
913f95a
remove tildes from core/scss and icons/scss
shammy8 Jun 8, 2023
1a416f8
fix(core): use relative path
shammy8 Jun 12, 2023
4b10633
docs(core): remove comment
shammy8 Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/scss/components/accordion/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/alert/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions core/scss/components/avatar/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/badge/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/breadcrumbs/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@import '../../typography/placeholders';

// Elements
@import '~@momentum-ui/icons/scss/mixins';
@import '../../../../icons/scss/mixins';

// Typography
@include brand-font-face-regular;
Expand Down
4 changes: 2 additions & 2 deletions core/scss/components/checkbox/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/close/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
2 changes: 1 addition & 1 deletion core/scss/components/date-picker/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions core/scss/components/input/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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';
2 changes: 1 addition & 1 deletion core/scss/components/list-item/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/loader/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/loading/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions core/scss/components/modal/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/panel/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions core/scss/components/popover/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/radio/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../../tools/functions/core';

@import '~@momentum-ui/icons/scss/mixins';
@import '../../../../icons/scss/mixins';

@import '../../colors/settings';
@import '../../settings/core';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/space-list/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/components/top-bar/module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/icons/icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import '~@momentum-ui/icons/scss/momentum-ui-icons';
@import '../../../icons/scss/momentum-ui-icons';
6 changes: 3 additions & 3 deletions core/scss/momentum-ui-components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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';

Expand Down
8 changes: 4 additions & 4 deletions core/scss/momentum-ui-ng.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/momentum-ui.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/ng/accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/scss/ng/messagebox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/scss/ng/notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/scss/ng/select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions core/scss/ng/settings/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/scss/ng/side-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion core/scss/ng/topbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion core/scss/ng/topnav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion core/scss/ng/typeahead.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions core/scss/settings/core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down
Loading