SCSS refactor complete but broken

Eunomiac · Feb 29, 2024 · fc1ba81 · fc1ba81
1 parent 231b29b
commit fc1ba81
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 34 deletions.
diff --git a/src/scss/components/_clocks-overlay.scss b/src/scss/components/_clocks-overlay.scss
@@ -35,7 +35,7 @@
 
   .clock-key-container:nth-child(2n+1) { top: var(--alternating-top-shift) }
 
-  @import './clocks';
+  // @import './clocks';
 
   .clock-key-container {
     height: calc(0.5 * var(--key-height));

diff --git a/src/scss/core/_components.scss b/src/scss/core/_components.scss
@@ -5,4 +5,8 @@
   @import "../components/comps";
   @import "../components/buttons-toggles";
   @import "../components/dotlines";
+  @import "../components/clocks";
+  @import "../components/turf-block";
+  @import "../components/cohort-block";
+  @import "../components/accordian-block";
 }
diff --git a/src/scss/core/_reset.scss b/src/scss/core/_reset.scss
@@ -192,6 +192,4 @@
       }
     }
   }
-
-  @import "./components";
 }
diff --git a/src/scss/overlay/_blades-overlay.scss b/src/scss/overlay/_blades-overlay.scss
@@ -24,7 +24,7 @@
     }
   }
 
-  @import "../components/clocks";
+  // @import "../components/clocks";
 
   /* Sizing the Keys for Overlay Display */
   .clock-key-container {

diff --git a/src/scss/sheets/_crew-playbook-sheet.scss b/src/scss/sheets/_crew-playbook-sheet.scss
@@ -4,7 +4,7 @@
   --turf-block-height: 125px;
   --turf-block-gap: 10px;
   max-height: 600px;
-  @import "../components/turf-block";
+  // @import "../components/turf-block";
 
   .turf-list {
       scale: 0.8;

diff --git a/src/scss/sheets/_crew-sheet.scss b/src/scss/sheets/_crew-sheet.scss
@@ -116,7 +116,7 @@
           }
         }
 
-        .turf-list { @import "../components/turf-block" }
+        // .turf-list { @import "../components/turf-block" }
       }
     }
   }

diff --git a/src/scss/sheets/_sheets.scss b/src/scss/sheets/_sheets.scss
@@ -27,7 +27,7 @@
     // max-height: calc(100% - var(--sheet-header-height));
 
     form {
-      @import "../core/globals";
+      // @import "../core/globals";
 
       justify-content: flex-start;
       max-height: 800px;
@@ -172,7 +172,7 @@
               gap: 0 5px;
 
               &, .half-panel {
-                @import "../components/cohort-block";
+                // @import "../components/cohort-block";
               }
             }
           }
@@ -233,7 +233,7 @@
       position: relative;
       pointer-events: none;
 
-      @import "../components/clocks";
+      // @import "../components/clocks";
 
       // .clock {
       //   top: 50%;

diff --git a/src/scss/style.scss b/src/scss/style.scss
@@ -1,9 +1,8 @@
-@import './core/normalize.scss';
+// @import './core/normalize.scss';
 
 // Utility imports
 @import './core/functions';
 @import './core/mixins';
-// @import './fonts';
 
 
 
@@ -36,6 +35,10 @@
   * {
     @import './core/vars';
     @import './core/components';
+    @import './core/globals';
+
+    // @import './components/clocks';
+    // @import "./components/accordian-block";
   }
 
   body.vtt.game.system-eunos-blades {
@@ -59,15 +62,11 @@
     }
 
     #blades-overlay {
-      @import "./core/reset";
-      @import "./core/globals";
       @import './overlay/blades-overlay';
     }
 
     #clocks-overlay {
       margin-top: toRem(4px);
-      @import "./core/reset";
-      @import "./core/globals";
       @import './components/clocks-overlay';
     }
 
@@ -88,7 +87,6 @@
     #navigation,
     #hotbar,
     #players {
-      @import "./core/reset";
 
       &,
       * {
@@ -105,10 +103,6 @@
       }
 
       #chat {
-        // background: rgba(255, 180, 0, 0.25) !important;
-
-        @import "./core/reset";
-        @import './core/globals';
 
         #chat-form { display: none }
         #chat-controls {
@@ -149,12 +143,8 @@
     }
 
     .app.window-app {
-      @import "./core/reset";
-      @import './core/globals';
-
       // General App Window Styles
       @import "./core/app";
-      @import "./components/accordian-block";
 
       // Third-Party Library Inputs
       // > TAGIFY
@@ -163,8 +153,6 @@
       // > TAGIFY CUSTOM CONFIG
       @import './tagify-custom';
 
-      @import './components/clocks';
-
 
 
       .editor:not(.tinymce) {
@@ -204,11 +192,8 @@
 
         .editor-content {
           position: relative;
-          // width: calc(100% + (2 * var(--content-padding)));
-          // left: calc(-1 * var(--content-padding));
           padding-left: var(--content-padding);
           padding-right: var(--content-padding);
-          // @import './tinymce/tinymce-content';
         }
       }
 
@@ -217,14 +202,9 @@
       .editor.tinymce {
         position: relative;
         max-width: unset;
-        // width: calc(100% + (2 * var(--content-padding)));
         width: 100%;
-        // height: 100%;
         min-height: 100px;
 
-        .editor-content {
-          // @import './tinymce/tinymce-content';
-        }
       }
 
       &.sheet {
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,6 +192,4 @@ @@
           }
         }
       }
-      @import "./components";
     }