Standardizing Colors, changing global CSS variables

9 files changed, 30 insertions, 30 deletions

diff --git a/src/client/views/nodes/DocumentLinksButton.scss b/src/client/views/nodes/DocumentLinksButton.scss
index 735aa669f..daffaf9e7 100644
--- a/src/client/views/nodes/DocumentLinksButton.scss
+++ b/src/client/views/nodes/DocumentLinksButton.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables.scss";
+@import "../global/globalCssVariables.scss";
 
 
 .documentLinksButton-cont {
@@ -37,7 +37,7 @@
     font-weight: bold;
 
     &:hover {
-        background: $main-accent;
+        background: $medium-gray;
         transform: scale(1.05);
         cursor: pointer;
     }
diff --git a/src/client/views/nodes/DocumentView.scss b/src/client/views/nodes/DocumentView.scss
index bdbece621..8f86417d6 100644
--- a/src/client/views/nodes/DocumentView.scss
+++ b/src/client/views/nodes/DocumentView.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .documentView-effectsWrapper {
     border-radius: inherit;
@@ -22,7 +22,7 @@
     transition: outline .3s linear;
     cursor: grab;
 
-    // background: $light-color; //overflow: hidden;
+    // background: $white; //overflow: hidden;
     transform-origin: left top;
 
     &.minimized {
@@ -218,6 +218,6 @@
 
     .documentView-node:first-child {
         position: relative;
-        background: "#B59B66"; //$light-color;
+        background: "#B59B66"; //$white;
     }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/KeyValueBox.scss b/src/client/views/nodes/KeyValueBox.scss
index eb7c2f32b..ffcba4981 100644
--- a/src/client/views/nodes/KeyValueBox.scss
+++ b/src/client/views/nodes/KeyValueBox.scss
@@ -1,10 +1,10 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 .keyValueBox-cont {
     overflow-y: scroll;
     width:100%;
     height: 100%;
-    background-color: $light-color;
-    border: 1px solid $intermediate-color;
+    background-color: $white;
+    border: 1px solid $medium-gray;
     border-radius: $border-radius;
     box-sizing: border-box;
     display: inline-block;
@@ -56,8 +56,8 @@ $header-height: 30px;
     width:100%;
     position: relative;
     display: inline-block;
-    background: $intermediate-color;
-    color: $light-color;
+    background: $medium-gray;
+    color: $white;
     text-transform: uppercase;
     letter-spacing: 2px;
     font-size: 12px;
@@ -66,7 +66,7 @@ $header-height: 30px;
     th {
         font-weight: normal;
         &:first-child {
-            border-right: 1px solid $light-color;
+            border-right: 1px solid $white;
         }
     }
 }
@@ -76,9 +76,9 @@ $header-height: 30px;
     display: flex;
     width:100%;
     height:$header-height;
-    background: $light-color;
+    background: $white;
     .formattedTextBox-cont {
-        background: $light-color;
+        background: $white;
     }
 }
 .keyValueBox-cont {
@@ -116,8 +116,8 @@ $header-height: 30px;
     display: flex;
     width:100%;
     height:30px;
-    background: $light-color-secondary;
+    background: $light-gray;
     .formattedTextBox-cont {
-        background: $light-color-secondary;
+        background: $light-gray;
     }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/KeyValuePair.scss b/src/client/views/nodes/KeyValuePair.scss
index f78767234..5b660e582 100644
--- a/src/client/views/nodes/KeyValuePair.scss
+++ b/src/client/views/nodes/KeyValuePair.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 
 .keyValuePair-td-key {
diff --git a/src/client/views/nodes/RadialMenu.scss b/src/client/views/nodes/RadialMenu.scss
index daa620d12..312b51013 100644
--- a/src/client/views/nodes/RadialMenu.scss
+++ b/src/client/views/nodes/RadialMenu.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .radialMenu-cont {
     position: absolute;
@@ -53,7 +53,7 @@ s
     transition: all .1s;
     border-width: .11px;
     border-style: none;
-    border-color: $intermediate-color; //  rgb(187, 186, 186);
+    border-color: $medium-gray; //  rgb(187, 186, 186);
     // padding: 10px 0px 10px 0px;
     white-space: nowrap;
     font-size: 13px;
diff --git a/src/client/views/nodes/WebBox.scss b/src/client/views/nodes/WebBox.scss
index ca82c049c..e206508d3 100644
--- a/src/client/views/nodes/WebBox.scss
+++ b/src/client/views/nodes/WebBox.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables.scss";
+@import "../global/globalCssVariables.scss";
 
 
 .webBox {
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.scss b/src/client/views/nodes/formattedText/FormattedTextBox.scss
index 53aceb533..3cedab1a4 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.scss
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.scss
@@ -1,4 +1,4 @@
-@import "../../globalCssVariables";
+@import "../../global/globalCssVariables";
 
 .ProseMirror {
     width: 100%;
@@ -31,7 +31,7 @@ audiotag:hover {
     padding: 0;
     border-width: 0px;
     border-radius: inherit;
-    border-color: $intermediate-color;
+    border-color: $medium-gray;
     box-sizing: border-box;
     background-color: inherit;
     border-style: solid;
@@ -363,7 +363,7 @@ footnote::after {
 
 
 @media only screen and (max-width: 1000px) {
-    @import "../../globalCssVariables";
+    @import "../../global/globalCssVariables";
 
     .ProseMirror {
         width: 100%;
@@ -381,7 +381,7 @@ footnote::after {
         padding: 0;
         border-width: 0px;
         border-radius: inherit;
-        border-color: $intermediate-color;
+        border-color: $medium-gray;
         box-sizing: border-box;
         background-color: inherit;
         border-style: solid;
diff --git a/src/client/views/nodes/formattedText/RichTextMenu.scss b/src/client/views/nodes/formattedText/RichTextMenu.scss
index 1d24d6833..c94e93541 100644
--- a/src/client/views/nodes/formattedText/RichTextMenu.scss
+++ b/src/client/views/nodes/formattedText/RichTextMenu.scss
@@ -1,4 +1,4 @@
-@import "../../globalCssVariables";
+@import "../../global/globalCssVariables";
 
 .button-dropdown-wrapper {
     position: relative;
@@ -24,7 +24,7 @@
         top: 35px;
         left: 0;
         background-color: #323232;
-        color: $light-color-secondary;
+        color: $light-gray;
         border: 1px solid #4d4d4d;
         border-radius: 0 6px 6px 6px;
         box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.25);
diff --git a/src/client/views/nodes/formattedText/TooltipTextMenu.scss b/src/client/views/nodes/formattedText/TooltipTextMenu.scss
index 0e4b752ac..8c4d77da9 100644
--- a/src/client/views/nodes/formattedText/TooltipTextMenu.scss
+++ b/src/client/views/nodes/formattedText/TooltipTextMenu.scss
@@ -1,4 +1,4 @@
-@import "../views/globalCssVariables";
+@import "../views/global/globalCssVariables";
 .ProseMirror-menu-dropdown-wrap {
     display: inline-block;
     position: relative;
@@ -50,7 +50,7 @@
         padding: 3px;
 
         &:hover {
-            background-color: $light-color-secondary;
+            background-color: $light-gray;
         }
     }
 }
@@ -294,9 +294,9 @@
         top: 31px;
         background-color: #323232;
         border: 1px solid #4d4d4d;
-        color: $light-color-secondary;
+        color: $light-gray;
         // border: none;
-        // border: 1px solid $light-color-secondary;
+        // border: 1px solid $light-gray;
         border-radius: 0 6px 6px 6px;
         padding: 3px;
         box-shadow: 3px 3px 3px rgba(0, 0, 0, 0.25);
@@ -323,7 +323,7 @@
             }
 
             .separated-button {
-                border-top: 1px solid $light-color-secondary;
+                border-top: 1px solid $light-gray;
                 padding-top: 6px;
             }