refactor: inject variables to scss and sass files

Signed-off-by: Pedro Lamas <[email protected]>
fluidd-core · Dec 7, 2023 · b07c098 · b07c098
1 parent 7dcf21d
commit b07c098
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 16 deletions.
diff --git a/src/components/common/ManualProbeDialog.vue b/src/components/common/ManualProbeDialog.vue
@@ -187,7 +187,6 @@ export default class ManualProbeDialog extends Mixins(StateMixin, ToolheadMixin)
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   .bysect-row > .col {

diff --git a/src/components/layout/AppBar.vue b/src/components/layout/AppBar.vue
@@ -434,7 +434,6 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   .toolbar-logo {

diff --git a/src/components/layout/AppNotificationMenu.vue b/src/components/layout/AppNotificationMenu.vue
@@ -250,7 +250,6 @@ export default class AppNotificationMenu extends Mixins(BrowserMixin) {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   :deep(.app-notifications .v-list-item__action.notification-suffix),

diff --git a/src/components/settings/VersionInformationDialog.vue b/src/components/settings/VersionInformationDialog.vue
@@ -120,7 +120,6 @@ export default class VersionInformationDialog extends Vue {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   ol.commit-history {

diff --git a/src/components/ui/AppBtnGroup.vue b/src/components/ui/AppBtnGroup.vue
@@ -28,7 +28,6 @@ export default class AppBtnGroup extends Vue {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   @include theme(app-btn-group) using ($material) {

diff --git a/src/components/ui/AppCodeView.vue b/src/components/ui/AppCodeView.vue
@@ -64,7 +64,6 @@ export default class AppCodeView extends Vue {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   .theme--light .code-view {

diff --git a/src/components/ui/AppColorPicker.vue b/src/components/ui/AppColorPicker.vue
@@ -336,7 +336,6 @@ export default class AppColorPicker extends Vue {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   .color-input div {

diff --git a/src/components/ui/AppNavItem.vue b/src/components/ui/AppNavItem.vue
@@ -71,7 +71,6 @@ export default class AppNavItem extends Mixins(StateMixin, BrowserMixin) {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   button {

diff --git a/src/components/widgets/filesystem/FileSystemBrowser.vue b/src/components/widgets/filesystem/FileSystemBrowser.vue
@@ -535,7 +535,6 @@ export default class FileSystemBrowser extends Mixins(FilesMixin) {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   // Lighten up dark mode checkboxes.

diff --git a/src/components/widgets/job-queue/JobQueueBrowser.vue b/src/components/widgets/job-queue/JobQueueBrowser.vue
@@ -121,7 +121,6 @@ export default class JobQueueBrowser extends Mixins(StateMixin) {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   // Lighten up dark mode checkboxes.

diff --git a/src/components/widgets/thermals/TemperatureTargets.vue b/src/components/widgets/thermals/TemperatureTargets.vue
@@ -336,7 +336,6 @@ export default class TemperatureTargets extends Mixins(StateMixin) {
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   .theme--light :deep(.v-data-table.temperature-table > .v-data-table__wrapper > table) {

diff --git a/src/components/widgets/toolhead/ToolheadControlCircle.vue b/src/components/widgets/toolhead/ToolheadControlCircle.vue
@@ -924,7 +924,6 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
 </script>
 
 <style lang="scss" scoped>
-  @import '@/scss/variables';
   @import 'vuetify/src/styles/styles.sass';
 
   @include theme(app-circle-control) using ($material) {

diff --git a/vite.config.ts b/vite.config.ts
@@ -130,11 +130,11 @@ export default defineConfig({
   css: {
     preprocessorOptions: {
       css: { charset: false },
+      scss: {
+        additionalData: '@import "@/scss/variables";\n'
+      },
       sass: {
-        additionalData: [
-          '@import "@/scss/variables.scss"',
-          ''
-        ].join('\n')
+        additionalData: '@import "@/scss/variables.scss"\n'
       }
     }
   },