From a81f93822fd141915d835aed4c5e639573175c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 7 Nov 2023 13:32:19 +0100 Subject: [PATCH] MOBILE-3947 chore: Change import to use on Sass --- .../components/onlineusers/onlineusers.scss | 2 +- .../recentactivity/recentactivity.scss | 2 +- .../recentlyaccesseditems.scss | 2 +- .../timeline/components/events/events.scss | 2 +- src/addons/calendar/calendar-common.scss | 2 +- .../components/calendar/calendar.scss | 2 +- .../calendar/components/filter/filter.scss | 2 +- src/addons/messages/messages-common.scss | 2 +- .../messages/pages/discussion/discussion.scss | 3 +- .../messages/pages/discussion/discussion.ts | 2 +- src/addons/mod/chat/pages/chat/chat.scss | 2 -- src/addons/mod/chat/pages/chat/chat.ts | 2 +- .../session-messages/session-messages.scss | 2 -- .../session-messages/session-messages.ts | 2 +- src/addons/mod/data/data-forms.scss | 2 +- src/addons/mod/data/data.scss | 2 +- .../mod/forum/components/index/index.scss | 2 +- .../mod/forum/components/post/post.scss | 2 +- .../pages/new-discussion/new-discussion.scss | 2 +- .../attempt-results/attempt-results.scss | 2 +- .../lesson/pages/user-retake/user-retake.scss | 2 +- .../mod/resource/components/index/index.scss | 2 +- .../mod/scorm/components/index/index.scss | 2 +- .../mod/wiki/components/index/index.scss | 2 +- src/addons/notifications/notifications.scss | 2 +- src/addons/notifications/pages/list/list.scss | 2 +- .../pages/notification/notification.scss | 2 +- .../component/ddimageortext.scss | 2 +- .../ddimageortext/component/ddimageortext.ts | 2 +- src/addons/qtype/ddwtos/component/ddwtos.scss | 2 +- src/addons/qtype/ddwtos/component/ddwtos.ts | 2 +- .../pages/course-storage/course-storage.scss | 2 +- .../checkbox/component/checkbox.scss | 2 +- src/core/components/combobox/combobox.scss | 2 +- .../context-menu/context-menu-popover.scss | 2 +- .../components/course-image/course-image.scss | 2 +- src/core/components/empty-box/empty-box.scss | 2 +- src/core/components/loading/loading.scss | 2 +- .../mark-required/mark-required.scss | 2 +- src/core/components/message/message.scss | 2 +- src/core/components/mod-icon/mod-icon.scss | 2 +- .../navigation-bar/navigation-bar.scss | 2 +- .../components/progress-bar/progress-bar.scss | 2 +- .../refresh-button-modal.scss | 2 +- .../components/sheet-modal/sheet-modal.scss | 2 +- .../show-password/show-password.scss | 2 +- .../components/split-view/split-view.scss | 2 +- src/core/components/tabs/tabs.scss | 2 +- .../components/user-avatar/user-avatar.scss | 2 +- .../side-blocks-button.scss | 2 +- .../components/side-blocks/side-blocks.scss | 2 +- .../comments/pages/viewer/viewer.scss | 2 -- .../features/comments/pages/viewer/viewer.ts | 2 +- .../components/course-index/course-index.scss | 2 +- .../module-info/course-module-info.scss | 2 +- .../module-navigation/module-navigation.scss | 2 +- .../module-summary/module-summary.scss | 2 +- .../course/components/module/module.scss | 2 +- .../pages/course-summary/course-summary.scss | 2 +- .../features/course/pages/index/index.scss | 2 +- .../pages/module-preview/module-preview.scss | 2 +- .../course-list-item/course-list-item.scss | 2 +- .../rich-text-editor/rich-text-editor.scss | 2 +- .../features/grades/pages/course/course.scss | 2 +- .../site-onboarding/site-onboarding.scss | 2 +- src/core/features/login/login.scss | 2 +- src/core/features/login/pages/site/site.scss | 2 +- .../components/user-menu/user-menu.scss | 2 +- .../features/mainmenu/pages/menu/menu.scss | 2 +- src/core/features/question/question.scss | 2 +- .../reminders/components/date/date.scss | 2 +- .../report-column/report-column.scss | 2 +- .../report-detail/report-detail.scss | 2 +- .../report-summary/report-summary.scss | 2 +- .../features/sitehome/pages/index/index.scss | 2 +- .../features/tag/components/list/list.scss | 2 +- src/theme/components/discussion.scss | 2 +- src/theme/components/format-text.scss | 18 ++++++------ src/theme/theme.scss | 28 +++++++++---------- 79 files changed, 97 insertions(+), 104 deletions(-) diff --git a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss index 1de16d878..678e73a3f 100644 --- a/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss +++ b/src/addons/block/onlineusers/components/onlineusers/onlineusers.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --core-avatar-size: 30px; diff --git a/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss b/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss index a72a303fb..14537fe1c 100644 --- a/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss +++ b/src/addons/block/recentactivity/components/recentactivity/recentactivity.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host .core-block-content ::ng-deep { .activitydate, .activityhead { diff --git a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss index 77fad00dd..9f161779f 100644 --- a/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss +++ b/src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .core-horizontal-scroll div.core-horizontal-scroll-item { diff --git a/src/addons/block/timeline/components/events/events.scss b/src/addons/block/timeline/components/events/events.scss index 07634e1d5..68e7378f5 100644 --- a/src/addons/block/timeline/components/events/events.scss +++ b/src/addons/block/timeline/components/events/events.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; h3 { font-weight: bold; diff --git a/src/addons/calendar/calendar-common.scss b/src/addons/calendar/calendar-common.scss index 3746e7872..8b3f5108f 100644 --- a/src/addons/calendar/calendar-common.scss +++ b/src/addons/calendar/calendar-common.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { diff --git a/src/addons/calendar/components/calendar/calendar.scss b/src/addons/calendar/components/calendar/calendar.scss index 0df183e40..f3d27322f 100644 --- a/src/addons/calendar/components/calendar/calendar.scss +++ b/src/addons/calendar/components/calendar/calendar.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --addon-calendar-blank-day-background-color: var(--light); diff --git a/src/addons/calendar/components/filter/filter.scss b/src/addons/calendar/components/filter/filter.scss index 29e652dd0..dd51360a8 100644 --- a/src/addons/calendar/components/filter/filter.scss +++ b/src/addons/calendar/components/filter/filter.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { ion-item { diff --git a/src/addons/messages/messages-common.scss b/src/addons/messages/messages-common.scss index 255a9a156..da75d7348 100644 --- a/src/addons/messages/messages-common.scss +++ b/src/addons/messages/messages-common.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .addon-messages-conversation-item, diff --git a/src/addons/messages/pages/discussion/discussion.scss b/src/addons/messages/pages/discussion/discussion.scss index 0c82d4a87..2de83952c 100644 --- a/src/addons/messages/pages/discussion/discussion.scss +++ b/src/addons/messages/pages/discussion/discussion.scss @@ -1,5 +1,4 @@ -@import "~theme/components/discussion.scss"; -@import "~theme/globals.scss"; +@use "theme/globals" as *; :host { diff --git a/src/addons/messages/pages/discussion/discussion.ts b/src/addons/messages/pages/discussion/discussion.ts index 74e817bc7..6f36ec0f9 100644 --- a/src/addons/messages/pages/discussion/discussion.ts +++ b/src/addons/messages/pages/discussion/discussion.ts @@ -51,7 +51,7 @@ import { CoreDom } from '@singletons/dom'; @Component({ selector: 'page-addon-messages-discussion', templateUrl: 'discussion.html', - styleUrls: ['discussion.scss'], + styleUrls: ['../../../../theme/components/discussion.scss', 'discussion.scss'], }) export class AddonMessagesDiscussionPage implements OnInit, OnDestroy, AfterViewInit { diff --git a/src/addons/mod/chat/pages/chat/chat.scss b/src/addons/mod/chat/pages/chat/chat.scss index 79a0b6be9..2ee6b3c8c 100644 --- a/src/addons/mod/chat/pages/chat/chat.scss +++ b/src/addons/mod/chat/pages/chat/chat.scss @@ -1,5 +1,3 @@ -@import "~theme/components/discussion.scss"; - :host { .addon-mod_chat-notice { margin-top: 8px; diff --git a/src/addons/mod/chat/pages/chat/chat.ts b/src/addons/mod/chat/pages/chat/chat.ts index e1c168c10..bbba13c00 100644 --- a/src/addons/mod/chat/pages/chat/chat.ts +++ b/src/addons/mod/chat/pages/chat/chat.ts @@ -37,7 +37,7 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics'; @Component({ selector: 'page-addon-mod-chat-chat', templateUrl: 'chat.html', - styleUrls: ['chat.scss'], + styleUrls: ['../../../../../theme/components/discussion.scss', 'chat.scss'], }) export class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave { diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.scss b/src/addons/mod/chat/pages/session-messages/session-messages.scss index 79a0b6be9..2ee6b3c8c 100644 --- a/src/addons/mod/chat/pages/session-messages/session-messages.scss +++ b/src/addons/mod/chat/pages/session-messages/session-messages.scss @@ -1,5 +1,3 @@ -@import "~theme/components/discussion.scss"; - :host { .addon-mod_chat-notice { margin-top: 8px; diff --git a/src/addons/mod/chat/pages/session-messages/session-messages.ts b/src/addons/mod/chat/pages/session-messages/session-messages.ts index fa94740e1..8401d485d 100644 --- a/src/addons/mod/chat/pages/session-messages/session-messages.ts +++ b/src/addons/mod/chat/pages/session-messages/session-messages.ts @@ -31,7 +31,7 @@ import { CoreTime } from '@singletons/time'; @Component({ selector: 'page-addon-mod-chat-session-messages', templateUrl: 'session-messages.html', - styleUrls: ['session-messages.scss'], + styleUrls: ['../../../../../theme/components/discussion.scss', 'session-messages.scss'], }) export class AddonModChatSessionMessagesPage implements OnInit { diff --git a/src/addons/mod/data/data-forms.scss b/src/addons/mod/data/data-forms.scss index 1ee47a8c0..92f6ff9fa 100644 --- a/src/addons/mod/data/data-forms.scss +++ b/src/addons/mod/data/data-forms.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; // Edit and search modal. :host { diff --git a/src/addons/mod/data/data.scss b/src/addons/mod/data/data.scss index b844da080..d96d7035c 100644 --- a/src/addons/mod/data/data.scss +++ b/src/addons/mod/data/data.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; /// @prop - The padding for the grid column $grid-column-padding: var(--ion-grid-column-padding, 5px) !default; diff --git a/src/addons/mod/forum/components/index/index.scss b/src/addons/mod/forum/components/index/index.scss index c89233e8f..be5046279 100644 --- a/src/addons/mod/forum/components/index/index.scss +++ b/src/addons/mod/forum/components/index/index.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { diff --git a/src/addons/mod/forum/components/post/post.scss b/src/addons/mod/forum/components/post/post.scss index b4a5b0092..4dfb6f53a 100644 --- a/src/addons/mod/forum/components/post/post.scss +++ b/src/addons/mod/forum/components/post/post.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host .addon-mod_forum-post { background-color: var(--ion-item-background); diff --git a/src/addons/mod/forum/pages/new-discussion/new-discussion.scss b/src/addons/mod/forum/pages/new-discussion/new-discussion.scss index 9ddfaed1c..92b171fe7 100644 --- a/src/addons/mod/forum/pages/new-discussion/new-discussion.scss +++ b/src/addons/mod/forum/pages/new-discussion/new-discussion.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .addon-forum-group-info { diff --git a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss index 09e782178..a9021111d 100644 --- a/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss +++ b/src/addons/mod/h5pactivity/pages/attempt-results/attempt-results.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .core-warning-item { diff --git a/src/addons/mod/lesson/pages/user-retake/user-retake.scss b/src/addons/mod/lesson/pages/user-retake/user-retake.scss index 8c364a127..7ff927840 100644 --- a/src/addons/mod/lesson/pages/user-retake/user-retake.scss +++ b/src/addons/mod/lesson/pages/user-retake/user-retake.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .button-disabled { diff --git a/src/addons/mod/resource/components/index/index.scss b/src/addons/mod/resource/components/index/index.scss index 9874efd46..88b63eec0 100644 --- a/src/addons/mod/resource/components/index/index.scss +++ b/src/addons/mod/resource/components/index/index.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .addon-mod_resource-outdated { diff --git a/src/addons/mod/scorm/components/index/index.scss b/src/addons/mod/scorm/components/index/index.scss index f8fc150a1..2bda23817 100644 --- a/src/addons/mod/scorm/components/index/index.scss +++ b/src/addons/mod/scorm/components/index/index.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .addon-mod_scorm-attempt-summary ion-item > p { diff --git a/src/addons/mod/wiki/components/index/index.scss b/src/addons/mod/wiki/components/index/index.scss index 9bbc1c0ed..e2a7ffaac 100644 --- a/src/addons/mod/wiki/components/index/index.scss +++ b/src/addons/mod/wiki/components/index/index.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; $addon-mod-wiki-toc-level-padding: 12px !default; diff --git a/src/addons/notifications/notifications.scss b/src/addons/notifications/notifications.scss index 60caa6312..9dc8d2b0b 100644 --- a/src/addons/notifications/notifications.scss +++ b/src/addons/notifications/notifications.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --extra-icon-size: 16px; diff --git a/src/addons/notifications/pages/list/list.scss b/src/addons/notifications/pages/list/list.scss index cc83595d1..a5e92ddc2 100644 --- a/src/addons/notifications/pages/list/list.scss +++ b/src/addons/notifications/pages/list/list.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; ion-item { ion-label { diff --git a/src/addons/notifications/pages/notification/notification.scss b/src/addons/notifications/pages/notification/notification.scss index 7b0943218..c1c58d5ab 100644 --- a/src/addons/notifications/pages/notification/notification.scss +++ b/src/addons/notifications/pages/notification/notification.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { diff --git a/src/addons/qtype/ddimageortext/component/ddimageortext.scss b/src/addons/qtype/ddimageortext/component/ddimageortext.scss index dfb6f7f01..de99dcda6 100644 --- a/src/addons/qtype/ddimageortext/component/ddimageortext.scss +++ b/src/addons/qtype/ddimageortext/component/ddimageortext.scss @@ -1,4 +1,4 @@ -@import "~core/features/question/question"; +@use "theme/globals" as *; // Style ddimageortext content a bit. Almost all these styles are copied from Moodle. :host { diff --git a/src/addons/qtype/ddimageortext/component/ddimageortext.ts b/src/addons/qtype/ddimageortext/component/ddimageortext.ts index 6550c2c38..2fbf0b746 100644 --- a/src/addons/qtype/ddimageortext/component/ddimageortext.ts +++ b/src/addons/qtype/ddimageortext/component/ddimageortext.ts @@ -24,7 +24,7 @@ import { AddonQtypeDdImageOrTextQuestion } from '../classes/ddimageortext'; @Component({ selector: 'addon-qtype-ddimageortext', templateUrl: 'addon-qtype-ddimageortext.html', - styleUrls: ['ddimageortext.scss'], + styleUrls: ['../../../../core/features/question/question.scss', 'ddimageortext.scss'], }) export class AddonQtypeDdImageOrTextComponent extends CoreQuestionBaseComponent diff --git a/src/addons/qtype/ddwtos/component/ddwtos.scss b/src/addons/qtype/ddwtos/component/ddwtos.scss index 9c7bed139..557fc3f76 100644 --- a/src/addons/qtype/ddwtos/component/ddwtos.scss +++ b/src/addons/qtype/ddwtos/component/ddwtos.scss @@ -1,4 +1,4 @@ -@import "~core/features/question/question"; +@use "theme/globals" as *; // Style ddwtos content a bit. Almost all these styles are copied from Moodle. .addon-qtype-ddwtos-container { diff --git a/src/addons/qtype/ddwtos/component/ddwtos.ts b/src/addons/qtype/ddwtos/component/ddwtos.ts index 3d76a2747..c3f8631d5 100644 --- a/src/addons/qtype/ddwtos/component/ddwtos.ts +++ b/src/addons/qtype/ddwtos/component/ddwtos.ts @@ -25,7 +25,7 @@ import { AddonQtypeDdwtosQuestion } from '../classes/ddwtos'; @Component({ selector: 'addon-qtype-ddwtos', templateUrl: 'addon-qtype-ddwtos.html', - styleUrls: ['ddwtos.scss'], + styleUrls: ['../../../../core/features/question/question.scss', 'ddwtos.scss'], }) export class AddonQtypeDdwtosComponent extends CoreQuestionBaseComponent implements OnDestroy { diff --git a/src/addons/storagemanager/pages/course-storage/course-storage.scss b/src/addons/storagemanager/pages/course-storage/course-storage.scss index becd7cebb..640d75a3e 100644 --- a/src/addons/storagemanager/pages/course-storage/course-storage.scss +++ b/src/addons/storagemanager/pages/course-storage/course-storage.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --course-storage-max-activity-height: 120px; diff --git a/src/addons/userprofilefield/checkbox/component/checkbox.scss b/src/addons/userprofilefield/checkbox/component/checkbox.scss index 7306a701f..1fe09f21c 100644 --- a/src/addons/userprofilefield/checkbox/component/checkbox.scss +++ b/src/addons/userprofilefield/checkbox/component/checkbox.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --text-overflow: initial; diff --git a/src/core/components/combobox/combobox.scss b/src/core/components/combobox/combobox.scss index 3afd8c316..80c9379ad 100644 --- a/src/core/components/combobox/combobox.scss +++ b/src/core/components/combobox/combobox.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { max-width: 100%; diff --git a/src/core/components/context-menu/context-menu-popover.scss b/src/core/components/context-menu/context-menu-popover.scss index 6461e72ef..128643a79 100644 --- a/src/core/components/context-menu/context-menu-popover.scss +++ b/src/core/components/context-menu/context-menu-popover.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; ion-list { padding: 0; diff --git a/src/core/components/course-image/course-image.scss b/src/core/components/course-image/course-image.scss index 5bd16990d..c530efbd0 100644 --- a/src/core/components/course-image/course-image.scss +++ b/src/core/components/course-image/course-image.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --core-image-radius: var(--core-courseimage-radius); diff --git a/src/core/components/empty-box/empty-box.scss b/src/core/components/empty-box/empty-box.scss index 86fe96d48..7c57385ea 100644 --- a/src/core/components/empty-box/empty-box.scss +++ b/src/core/components/empty-box/empty-box.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --image-size: 120px; diff --git a/src/core/components/loading/loading.scss b/src/core/components/loading/loading.scss index ff665fdf2..6b2b08ffe 100644 --- a/src/core/components/loading/loading.scss +++ b/src/core/components/loading/loading.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; @mixin inline() { &:not(.core-loading-loaded) { diff --git a/src/core/components/mark-required/mark-required.scss b/src/core/components/mark-required/mark-required.scss index 1c05a77f4..51535396a 100644 --- a/src/core/components/mark-required/mark-required.scss +++ b/src/core/components/mark-required/mark-required.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .core-input-required-asterisk { diff --git a/src/core/components/message/message.scss b/src/core/components/message/message.scss index 3ece454ac..f179df22d 100644 --- a/src/core/components/message/message.scss +++ b/src/core/components/message/message.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --message-background: var(--core-messages-message-bg); diff --git a/src/core/components/mod-icon/mod-icon.scss b/src/core/components/mod-icon/mod-icon.scss index 0be4daed3..37913a25e 100644 --- a/src/core/components/mod-icon/mod-icon.scss +++ b/src/core/components/mod-icon/mod-icon.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { display: inline-block; diff --git a/src/core/components/navigation-bar/navigation-bar.scss b/src/core/components/navigation-bar/navigation-bar.scss index 6579ff761..bdc0220d6 100644 --- a/src/core/components/navigation-bar/navigation-bar.scss +++ b/src/core/components/navigation-bar/navigation-bar.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --height: var(--core-navigation-max-height); diff --git a/src/core/components/progress-bar/progress-bar.scss b/src/core/components/progress-bar/progress-bar.scss index 0246fad88..7937c4595 100644 --- a/src/core/components/progress-bar/progress-bar.scss +++ b/src/core/components/progress-bar/progress-bar.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { display: flex; diff --git a/src/core/components/refresh-button-modal/refresh-button-modal.scss b/src/core/components/refresh-button-modal/refresh-button-modal.scss index 5541fba16..93102a126 100644 --- a/src/core/components/refresh-button-modal/refresh-button-modal.scss +++ b/src/core/components/refresh-button-modal/refresh-button-modal.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { ion-chip { diff --git a/src/core/components/sheet-modal/sheet-modal.scss b/src/core/components/sheet-modal/sheet-modal.scss index a03fd57e8..b1170cfcd 100644 --- a/src/core/components/sheet-modal/sheet-modal.scss +++ b/src/core/components/sheet-modal/sheet-modal.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --backdrop-opacity: var(--ion-backdrop-opacity, 0.4); diff --git a/src/core/components/show-password/show-password.scss b/src/core/components/show-password/show-password.scss index 07280df85..c866c89cd 100644 --- a/src/core/components/show-password/show-password.scss +++ b/src/core/components/show-password/show-password.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { display: contents; diff --git a/src/core/components/split-view/split-view.scss b/src/core/components/split-view/split-view.scss index ab8692946..1024e55a1 100644 --- a/src/core/components/split-view/split-view.scss +++ b/src/core/components/split-view/split-view.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --menu-min-width: 270px; diff --git a/src/core/components/tabs/tabs.scss b/src/core/components/tabs/tabs.scss index 26eebb6a9..66a57c342 100644 --- a/src/core/components/tabs/tabs.scss +++ b/src/core/components/tabs/tabs.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --tabs-background: var(--core-tabs-background); diff --git a/src/core/components/user-avatar/user-avatar.scss b/src/core/components/user-avatar/user-avatar.scss index 2b6e28aa9..1ffc913c8 100644 --- a/src/core/components/user-avatar/user-avatar.scss +++ b/src/core/components/user-avatar/user-avatar.scss @@ -1,4 +1,4 @@ -@import '~theme/globals.scss'; +@use "theme/globals" as *; :host { position: relative; diff --git a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss index f8f4f8250..cd1537e63 100644 --- a/src/core/features/block/components/side-blocks-button/side-blocks-button.scss +++ b/src/core/features/block/components/side-blocks-button/side-blocks-button.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { @include position(50%, 0px, null, null); diff --git a/src/core/features/block/components/side-blocks/side-blocks.scss b/src/core/features/block/components/side-blocks/side-blocks.scss index fc2f730f2..17669c03e 100644 --- a/src/core/features/block/components/side-blocks/side-blocks.scss +++ b/src/core/features/block/components/side-blocks/side-blocks.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host ::ng-deep core-block { @include media-breakpoint-up(md) { diff --git a/src/core/features/comments/pages/viewer/viewer.scss b/src/core/features/comments/pages/viewer/viewer.scss index cf231da48..e8297c249 100644 --- a/src/core/features/comments/pages/viewer/viewer.scss +++ b/src/core/features/comments/pages/viewer/viewer.scss @@ -1,5 +1,3 @@ -@import "~theme/components/discussion.scss"; - ion-badge { margin: 8px auto; } diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts index ba750924b..f1401ecb6 100644 --- a/src/core/features/comments/pages/viewer/viewer.ts +++ b/src/core/features/comments/pages/viewer/viewer.ts @@ -51,7 +51,7 @@ import { CoreAnimations } from '@components/animations'; selector: 'page-core-comments-viewer', templateUrl: 'viewer.html', animations: [CoreAnimations.SLIDE_IN_OUT], - styleUrls: ['viewer.scss'], + styleUrls: ['../../../../../theme/components/discussion.scss', 'viewer.scss'], }) export class CoreCommentsViewerPage implements OnInit, OnDestroy { diff --git a/src/core/features/course/components/course-index/course-index.scss b/src/core/features/course/components/course-index/course-index.scss index 2c169c852..2b2aa5de0 100644 --- a/src/core/features/course/components/course-index/course-index.scss +++ b/src/core/features/course/components/course-index/course-index.scss @@ -1,4 +1,4 @@ -@import '~theme/globals.scss'; +@use "theme/globals" as *; core-progress-bar { --bar-margin: 8px 0 4px 0; --line-height: 20px; diff --git a/src/core/features/course/components/module-info/course-module-info.scss b/src/core/features/course/components/module-info/course-module-info.scss index 389a72714..013704204 100644 --- a/src/core/features/course/components/module-info/course-module-info.scss +++ b/src/core/features/course/components/module-info/course-module-info.scss @@ -1,4 +1,4 @@ -@import '~theme/globals.scss'; +@use "theme/globals" as *; :host { display: block; diff --git a/src/core/features/course/components/module-navigation/module-navigation.scss b/src/core/features/course/components/module-navigation/module-navigation.scss index 95d039bfb..8e4d48343 100644 --- a/src/core/features/course/components/module-navigation/module-navigation.scss +++ b/src/core/features/course/components/module-navigation/module-navigation.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --height: var(--core-navigation-max-height); diff --git a/src/core/features/course/components/module-summary/module-summary.scss b/src/core/features/course/components/module-summary/module-summary.scss index e524c4757..3594fb7eb 100644 --- a/src/core/features/course/components/module-summary/module-summary.scss +++ b/src/core/features/course/components/module-summary/module-summary.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host ::ng-deep ion-item[collapsible] ion-label { margin-top: 12px; diff --git a/src/core/features/course/components/module/module.scss b/src/core/features/course/components/module/module.scss index 3e96dbc1f..8bed4a7a9 100644 --- a/src/core/features/course/components/module/module.scss +++ b/src/core/features/course/components/module/module.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --horizontal-margin: 12px; diff --git a/src/core/features/course/pages/course-summary/course-summary.scss b/src/core/features/course/pages/course-summary/course-summary.scss index 03c882ad9..b26938458 100644 --- a/src/core/features/course/pages/course-summary/course-summary.scss +++ b/src/core/features/course/pages/course-summary/course-summary.scss @@ -1,4 +1,4 @@ -@import '~theme/globals.scss'; +@use "theme/globals" as *; :host { --thumb-height: 180px; diff --git a/src/core/features/course/pages/index/index.scss b/src/core/features/course/pages/index/index.scss index 216c0eb75..32907c9a4 100644 --- a/src/core/features/course/pages/index/index.scss +++ b/src/core/features/course/pages/index/index.scss @@ -1,4 +1,4 @@ -@import '~theme/globals.scss'; +@use "theme/globals" as *; :host { .core-format-progress-list { diff --git a/src/core/features/course/pages/module-preview/module-preview.scss b/src/core/features/course/pages/module-preview/module-preview.scss index 1481b21b3..5e34beb75 100644 --- a/src/core/features/course/pages/module-preview/module-preview.scss +++ b/src/core/features/course/pages/module-preview/module-preview.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; .core-module-availabilityinfo { background: var(--light); diff --git a/src/core/features/courses/components/course-list-item/course-list-item.scss b/src/core/features/courses/components/course-list-item/course-list-item.scss index 31cbcadc2..6ede3c36d 100644 --- a/src/core/features/courses/components/course-list-item/course-list-item.scss +++ b/src/core/features/courses/components/course-list-item/course-list-item.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { @for $i from 0 to length($core-course-image-background) { diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss index b009050e0..150441cdf 100644 --- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss +++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --placeholder-color: var(--ion-placeholder-color); --toobar-background: var(--white); diff --git a/src/core/features/grades/pages/course/course.scss b/src/core/features/grades/pages/course/course.scss index 388f624e4..3e1cd42bc 100644 --- a/src/core/features/grades/pages/course/course.scss +++ b/src/core/features/grades/pages/course/course.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --header-background: var(--white); diff --git a/src/core/features/login/components/site-onboarding/site-onboarding.scss b/src/core/features/login/components/site-onboarding/site-onboarding.scss index 084eee0f2..a03301739 100644 --- a/src/core/features/login/components/site-onboarding/site-onboarding.scss +++ b/src/core/features/login/components/site-onboarding/site-onboarding.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .core-login-onboarding-step { diff --git a/src/core/features/login/login.scss b/src/core/features/login/login.scss index 785732e0a..1c9514390 100644 --- a/src/core/features/login/login.scss +++ b/src/core/features/login/login.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { ion-content, diff --git a/src/core/features/login/pages/site/site.scss b/src/core/features/login/pages/site/site.scss index ddb292de2..8bf0224bf 100644 --- a/src/core/features/login/pages/site/site.scss +++ b/src/core/features/login/pages/site/site.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --list-item-max-width: 600px; diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.scss b/src/core/features/mainmenu/components/user-menu/user-menu.scss index a42d797cd..0c871f3f0 100644 --- a/src/core/features/mainmenu/components/user-menu/user-menu.scss +++ b/src/core/features/mainmenu/components/user-menu/user-menu.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { .core-user-menu-preferences { diff --git a/src/core/features/mainmenu/pages/menu/menu.scss b/src/core/features/mainmenu/pages/menu/menu.scss index 637457cc4..d72dfe76c 100644 --- a/src/core/features/mainmenu/pages/menu/menu.scss +++ b/src/core/features/mainmenu/pages/menu/menu.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { ion-tabs { diff --git a/src/core/features/question/question.scss b/src/core/features/question/question.scss index 7c94d2f05..4ae53140a 100644 --- a/src/core/features/question/question.scss +++ b/src/core/features/question/question.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host ::ng-deep { .core-question-answer-correct { diff --git a/src/core/features/reminders/components/date/date.scss b/src/core/features/reminders/components/date/date.scss index 8d16930b4..7b32f1d09 100644 --- a/src/core/features/reminders/components/date/date.scss +++ b/src/core/features/reminders/components/date/date.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { display: flex; diff --git a/src/core/features/reportbuilder/components/report-column/report-column.scss b/src/core/features/reportbuilder/components/report-column/report-column.scss index 65df0f953..31767c74f 100644 --- a/src/core/features/reportbuilder/components/report-column/report-column.scss +++ b/src/core/features/reportbuilder/components/report-column/report-column.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --rotate-expandable: rotate(180deg); diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.scss b/src/core/features/reportbuilder/components/report-detail/report-detail.scss index 1f9dcd143..02f8bd52a 100644 --- a/src/core/features/reportbuilder/components/report-detail/report-detail.scss +++ b/src/core/features/reportbuilder/components/report-detail/report-detail.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { --header-background: var(--white); diff --git a/src/core/features/reportbuilder/components/report-summary/report-summary.scss b/src/core/features/reportbuilder/components/report-summary/report-summary.scss index 32bb1fe4e..1512f8e33 100644 --- a/src/core/features/reportbuilder/components/report-summary/report-summary.scss +++ b/src/core/features/reportbuilder/components/report-summary/report-summary.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; .filters-info { padding-bottom: 1rem; diff --git a/src/core/features/sitehome/pages/index/index.scss b/src/core/features/sitehome/pages/index/index.scss index 8a8e71e12..9c849123b 100644 --- a/src/core/features/sitehome/pages/index/index.scss +++ b/src/core/features/sitehome/pages/index/index.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; ion-item ion-icon { display: inline-block; diff --git a/src/core/features/tag/components/list/list.scss b/src/core/features/tag/components/list/list.scss index 1f8205861..861b4a9c4 100644 --- a/src/core/features/tag/components/list/list.scss +++ b/src/core/features/tag/components/list/list.scss @@ -1,4 +1,4 @@ -@import "~theme/globals"; +@use "theme/globals" as *; :host { line-height: 1.6; diff --git a/src/theme/components/discussion.scss b/src/theme/components/discussion.scss index fcb653a9d..c2cc72133 100644 --- a/src/theme/components/discussion.scss +++ b/src/theme/components/discussion.scss @@ -1,4 +1,4 @@ -@import "~theme/globals.scss"; +@use "theme/globals" as *; :host-context(.ios) { ion-footer .toolbar:last-child { diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss index bf2f2d4cd..2b937a7d8 100644 --- a/src/theme/components/format-text.scss +++ b/src/theme/components/format-text.scss @@ -1,6 +1,6 @@ /** Format Text - Show more styles. */ /** Styles of elements inside the directive should be placed in format-text.scss */ -@import "~theme/globals"; +@use "theme/globals.variables" as global; core-format-text { --core-format-text-background: var(--background, var(--ion-item-background)); @@ -42,7 +42,7 @@ core-format-text { } } - @if ($core-format-text-never-shorten) { + @if (global.$core-format-text-never-shorten) { &.collapsible-enabled { --display-toggle: none !important; --collapsible-height: auto !important; @@ -200,7 +200,7 @@ core-format-text { .embed-responsive-1by1 { &::before { - padding-top: percentage(1 / 1); + padding-top: percentage(1); } } @@ -474,7 +474,7 @@ core-rich-text-editor .core-rte-editor { font-weight: 400; } - @each $color-name, $unused in $colors { + @each $color-name, $unused in global.$colors { .alert-#{$color-name} { --color-base: var(--#{$color-name}); color: var(--#{$color-name}-shade); @@ -504,7 +504,7 @@ core-rich-text-editor .core-rte-editor { &[disabled] ~ .form-check-label, &:disabled ~ .form-check-label { - color: $gray-600; + color: global.$gray-600; } } @@ -549,7 +549,7 @@ core-rich-text-editor .core-rte-editor { .border-bottom-0 { border-bottom: 0 !important; } .border-left-0 { border-left: 0 !important; } - @each $color-name, $unused in $colors { + @each $color-name, $unused in global.$colors { .border-#{$color-name} { border-color: var(--#{$color-name}) !important; } @@ -633,7 +633,7 @@ core-rich-text-editor .core-rte-editor { .font-italic { font-style: italic !important; } .text-white { color: var(--white) !important; } - @each $color-name, $unused in $colors { + @each $color-name, $unused in global.$colors { .text-#{$color-name} { color: var(--#{$color-name}); } @@ -669,7 +669,7 @@ core-rich-text-editor .core-rte-editor { background-color: var(--danger); } - @each $color-name, $unused in $colors { + @each $color-name, $unused in global.$colors { .label-#{$color-name} { color: var(--#{$color-name}-contrast); background-color: var(--#{$color-name}); @@ -690,7 +690,7 @@ core-rich-text-editor .core-rte-editor { } } - @each $color-name, $unused in $colors { + @each $color-name, $unused in global.$colors { .btn.btn-#{$color-name} { --color-base: var(--#{$color-name}); color: var(--#{$color-name}-shade); diff --git a/src/theme/theme.scss b/src/theme/theme.scss index 5baa55e42..af644c972 100644 --- a/src/theme/theme.scss +++ b/src/theme/theme.scss @@ -10,26 +10,26 @@ */ /* Global variables */ -@import "./globals.scss"; +@import "globals.scss"; /* Application styles */ -@import "./theme.light.scss"; -@import "./theme.dark.scss"; -@import "./theme.custom.scss"; -@import "./theme.design-system.scss"; -@import "./theme.base.scss"; +@import "theme.light.scss"; +@import "theme.dark.scss"; +@import "theme.custom.scss"; +@import "theme.design-system.scss"; +@import "theme.base.scss"; /* Components */ -@import "./components/collapsible-header.scss"; -@import "./components/collapsible-item.scss"; -@import "./components/format-text.scss"; -@import "./components/rubrics.scss"; -@import "./components/mod-label.scss"; +@import "components/collapsible-header.scss"; +@import "components/collapsible-item.scss"; +@import "components/format-text.scss"; +@import "components/rubrics.scss"; +@import "components/mod-label.scss"; @import "../core/components/error-info/error-info.scss"; -@import "./components/videojs.scss"; +@import "components/videojs.scss"; /* Some styles from 3rd party libraries. */ -@import "./bootstrap.scss"; +@import "bootstrap.scss"; /* Core CSS required for Ionic components to work properly */ @import "~@ionic/angular/css/core.css"; @@ -38,7 +38,7 @@ @import "~@ionic/angular/css/normalize.css"; @import "~@ionic/angular/css/structure.css"; @import "~@ionic/angular/css/typography.css"; -@import '~@ionic/angular/css/display.css'; +@import "~@ionic/angular/css/display.css"; /* Optional CSS utils that can be commented out */ @import "~@ionic/angular/css/padding.css";