Merge branch 'master' into trails-aubrey

3 files changed, 14 insertions, 14 deletions

diff --git a/src/client/views/linking/LinkEditor.scss b/src/client/views/linking/LinkEditor.scss
index 7e6999cdc..839ebf894 100644
--- a/src/client/views/linking/LinkEditor.scss
+++ b/src/client/views/linking/LinkEditor.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .linkEditor {
     width: 100%;
@@ -20,7 +20,7 @@
 }
 
 .linkEditor-info {
-    //border-bottom: 0.5px solid $light-color-secondary;
+    //border-bottom: 0.5px solid $light-gray;
     //padding-bottom: 1px;
     padding-top: 5px;
     padding-left: 5px;
@@ -195,7 +195,7 @@
 }
 
 .linkEditor-group {
-    background-color: $light-color-secondary;
+    background-color: $light-gray;
     padding: 6px;
     margin: 3px 0;
     border-radius: 3px;
@@ -254,8 +254,8 @@
     }
 
     .linkEditor-option {
-        background-color: $light-color-secondary;
-        border: 1px solid $intermediate-color;
+        background-color: $light-gray;
+        border: 1px solid $medium-gray;
         border-top: 0;
         padding: 3px;
         cursor: pointer;
@@ -272,7 +272,7 @@
 
 .linkEditor-typeButton {
     background-color: transparent;
-    color: $dark-color;
+    color: $dark-gray;
     height: 20px;
     padding: 0 3px;
     padding-bottom: 2px;
@@ -285,7 +285,7 @@
     width: calc(100% - 40px);
 
     &:hover {
-        background-color: $light-color;
+        background-color: $white;
     }
 }
 
diff --git a/src/client/views/linking/LinkMenu.scss b/src/client/views/linking/LinkMenu.scss
index a90bf8b0a..a2ea42999 100644
--- a/src/client/views/linking/LinkMenu.scss
+++ b/src/client/views/linking/LinkMenu.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .linkMenu {
     width: auto;
diff --git a/src/client/views/linking/LinkMenuItem.scss b/src/client/views/linking/LinkMenuItem.scss
index 4e13ef8c8..4f9881565 100644
--- a/src/client/views/linking/LinkMenuItem.scss
+++ b/src/client/views/linking/LinkMenuItem.scss
@@ -1,7 +1,7 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .linkMenu-item {
-    // border-top: 0.5px solid $main-accent; 
+    // border-top: 0.5px solid $medium-gray; 
     position: relative;
     display: flex;
     border-bottom: 0.5px solid black;
@@ -102,7 +102,7 @@
     .link-metadata {
         padding: 0 10px 0 16px;
         margin-bottom: 4px;
-        color: $main-accent;
+        color: $medium-gray;
         font-style: italic;
         font-size: 10.5px;
     }
@@ -143,8 +143,8 @@
         padding-right: 6px;
         border-radius: 50%;
         pointer-events: auto;
-        background-color: $dark-color;
-        color: $light-color;
+        background-color: $dark-gray;
+        color: $white;
         font-size: 65%;
         transition: transform 0.2s;
         text-align: center;
@@ -162,7 +162,7 @@
         }
 
         &:hover {
-            background: $main-accent;
+            background: $medium-gray;
             cursor: pointer;
         }
     }