chore(dev): Sass upgrade to avoid deprecated @import (now @use and na…

…mespaces)
edrlab · Oct 25, 2024 · 43abfc6 · 43abfc6
1 parent d7a2fd8
commit 43abfc6
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 41 deletions.
diff --git a/src/renderer/assets/styles/app.scss b/src/renderer/assets/styles/app.scss
@@ -1,4 +1,4 @@
-/* @import './partials/variables'; */
+/* @use './partials/variables'; */
 
 .CSS_START_app {
   display: none;

diff --git a/src/renderer/assets/styles/components/allPublicationsPage.scss b/src/renderer/assets/styles/components/allPublicationsPage.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_allPublicationsPage {
     display: none;
@@ -269,7 +269,7 @@
             }
         }
 
-        @include scrollbar_styling
+        @include mx.scrollbar_styling
     }
 
     &_multi_langs {
@@ -336,7 +336,7 @@
         position: absolute;
         background-color: var(--color-secondary);
 
-        @include scrollbar_styling;
+        @include mx.scrollbar_styling;
 
         &::-webkit-scrollbar {
             width: 10px;

diff --git a/src/renderer/assets/styles/components/annotations.scss b/src/renderer/assets/styles/components/annotations.scss
@@ -1,5 +1,5 @@
-// @import '../focus';
-@import '../partials/mixin';
+// @use '../focus';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_annotations {
   display: none;
@@ -75,7 +75,7 @@
     z-index: 1000;
     border-radius: 5px;
 
-    @include scrollbar_styling;
+    @include mx.scrollbar_styling;
 
     &::-webkit-scrollbar-track {
       background-color: var(--color-extralight-grey);
@@ -115,7 +115,7 @@
       background-color: var(--color-blue);
     }
 
-    @include scrollbar_styling;
+    @include mx.scrollbar_styling;
 
     &::-webkit-scrollbar-track {
       background-color: var(--color-extralight-grey);
@@ -444,7 +444,7 @@
     border-radius: 6px;
 
     &:has(input:focus) {
-      @include R2_MIXIN_FOCUS_OUTLINE;
+      @include mx.R2_MIXIN_FOCUS_OUTLINE;
     }
 
     div {
@@ -479,7 +479,7 @@
   border-radius: 5px;
 
   &:has(input:focus) {
-    @include R2_MIXIN_FOCUS_OUTLINE;
+    @include mx.R2_MIXIN_FOCUS_OUTLINE;
   }
 
   div {

diff --git a/src/renderer/assets/styles/components/breadcrumb.scss b/src/renderer/assets/styles/components/breadcrumb.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_breadcrumbs {
   display: none;
@@ -15,7 +15,7 @@
 }
 
 .breadcrumb_container {
-  @include scrollbar_styling;
+  @include mx.scrollbar_styling;
 }
 
 .breadcrumb {

diff --git a/src/renderer/assets/styles/components/buttons.scss b/src/renderer/assets/styles/components/buttons.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_buttons {
   display: none;
@@ -89,7 +89,7 @@ button {
 }
 
 .button_primary {
-  @include button_primary;
+  @include mx.button_primary;
 
   padding: 10px 15px;
 
@@ -394,7 +394,7 @@ button {
   }
 
   &:focus-within {
-    @include R2_MIXIN_FOCUS_OUTLINE;
+    @include mx.R2_MIXIN_FOCUS_OUTLINE;
 
     outline: var(--color-blue) solid 1px !important;
     outline-offset: 2px;

diff --git a/src/renderer/assets/styles/components/catalogs.scss b/src/renderer/assets/styles/components/catalogs.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_catalogs {
     display: none;
@@ -310,7 +310,7 @@
     //     inset: 330px 20px 30px 30px;
     // }
 
-    @include scrollbar_styling;
+    @include mx.scrollbar_styling;
 
     .loader {
         margin: 20%;

diff --git a/src/renderer/assets/styles/components/combobox.scss b/src/renderer/assets/styles/components/combobox.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_combobox {
   display: none;
@@ -90,7 +90,7 @@
   max-height: 350px!important;
   overflow: hidden auto;
 
-  @include scrollbar_styling;
+  @include mx.scrollbar_styling;
 
   &::-webkit-scrollbar {
     width: 10px;

diff --git a/src/renderer/assets/styles/components/inputs.scss b/src/renderer/assets/styles/components/inputs.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_inputs {
   display: none;
@@ -57,7 +57,7 @@ input[type="color"]:not(.R2_CSS_CLASS__FORCE_NO_FOCUS_OUTLINE),
 input[type="url"]:not(.R2_CSS_CLASS__FORCE_NO_FOCUS_OUTLINE),
 input[type="search"]:not(.R2_CSS_CLASS__FORCE_NO_FOCUS_OUTLINE) {
   &:focus {
-    @include R2_MIXIN_FOCUS_OUTLINE;
+    @include mx.R2_MIXIN_FOCUS_OUTLINE;
   }
 }
 

diff --git a/src/renderer/assets/styles/components/modals.scss b/src/renderer/assets/styles/components/modals.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_modals {
   display: none;
@@ -96,7 +96,7 @@
     justify-content: center;
   }
 
-  @include scrollbar_styling;
+  @include mx.scrollbar_styling;
 }
 
 .modal_dialog_body_cover > img {

diff --git a/src/renderer/assets/styles/components/settings.scss b/src/renderer/assets/styles/components/settings.scss
@@ -1,4 +1,4 @@
-@import '../partials/mixin';
+@use '../partials/mixin' as mx;
 
 .CSS_START_components_settings {
     display: none;
@@ -251,7 +251,7 @@ $setting_color: var(--color-blue);
     margin-top: 50px;
     margin-bottom: 5px;
 
-    @include scrollbar_styling;
+    @include mx.scrollbar_styling;
 
     .button_transparency_icon {
         position: relative;

diff --git a/src/renderer/assets/styles/focus.scss b/src/renderer/assets/styles/focus.scss
@@ -3,7 +3,7 @@
 }
 
 /*
-@import './partials/mixin';
+@use './partials/mixin' as mx;
 
 @mixin R2_MIXIN_FOCUS_OUTLINE {
   outline: var(--color-blue) solid 2px !important;
@@ -19,7 +19,7 @@
 }
 
 :root.R2_CSS_CLASS__KEYBOARD_INTERACT *:focus {
-  @include R2_MIXIN_FOCUS_OUTLINE;
+  @include mx.R2_MIXIN_FOCUS_OUTLINE;
 }
 
 :root:not(.R2_CSS_CLASS__KEYBOARD_INTERACT) #body_element *:focus + label {

diff --git a/src/renderer/assets/styles/global.scss b/src/renderer/assets/styles/global.scss
@@ -1,8 +1,8 @@
 /*** be careful this file is imported in library and reader windows ***/
 
-@import './partials/variables';
-@import './partials/mixin';
-@import './partials/focus';
+@use './partials/variables';
+@use './partials/mixin' as mx;
+@use './partials/focus';
 
 .CSS_START_global {
   display: none;
@@ -99,7 +99,7 @@ section {
     padding-bottom: 100px;
   }
 
-  @include scrollbar_styling;
+  @include mx.scrollbar_styling;
 }
 
 nav + nav + .main {

diff --git a/src/renderer/assets/styles/partials/focus.scss b/src/renderer/assets/styles/partials/focus.scss
@@ -1,4 +1,4 @@
-@import './mixin';
+@use './mixin' as mx;
 
 .CSS_START_partials_focus {
   display: none;
@@ -27,7 +27,7 @@
 /* :global */
 
 :root.R2_CSS_CLASS__KEYBOARD_INTERACT *:focus {
-  @include R2_MIXIN_FOCUS_OUTLINE;
+  @include mx.R2_MIXIN_FOCUS_OUTLINE;
 }
 
 /* :global */

diff --git a/src/renderer/assets/styles/reader-app.scss b/src/renderer/assets/styles/reader-app.scss
@@ -1,6 +1,6 @@
-/* @import './partials/variables'; */
-// @import './focus';
-@import './partials/mixin';
+/* @use './partials/variables'; */
+// @use './focus';
+@use './partials/mixin' as mx;
 
 .CSS_START_readerApp {
   display: none;
@@ -557,7 +557,7 @@ button {
         }
 
         &:focus + label.menu_button {
-          @include R2_MIXIN_FOCUS_OUTLINE;
+          @include mx.R2_MIXIN_FOCUS_OUTLINE;
         }
       }
 
@@ -570,7 +570,7 @@ button {
         }
 
         &:focus + label.menu_button {
-          @include R2_MIXIN_FOCUS_OUTLINE;
+          @include mx.R2_MIXIN_FOCUS_OUTLINE;
         }
       }
     }
@@ -808,7 +808,7 @@ p.chapters_description {
     left: -2000px;
 
     &:focus + label {
-      @include R2_MIXIN_FOCUS_OUTLINE;
+      @include mx.R2_MIXIN_FOCUS_OUTLINE;
     }
 
     &:disabled + label {
@@ -890,7 +890,7 @@ p.chapters_description {
     padding: 10px;
 
     &:focus + input {
-      @include R2_MIXIN_FOCUS_OUTLINE;
+      @include mx.R2_MIXIN_FOCUS_OUTLINE;
     }
   }
 
@@ -921,7 +921,7 @@ p.chapters_description {
     left: -20000px;
 
     &:focus + label {
-      @include R2_MIXIN_FOCUS_OUTLINE;
+      @include mx.R2_MIXIN_FOCUS_OUTLINE;
     }
   }