Merge pull request #4961 from umbraco/temp8-rename-color-variable-dis…

…grete-to-discreet Renamed LESS variables with disgrete to discreet
umbraco · Mar 22, 2019 · 0acc8e1 · 0acc8e1
2 parents 99ebe13 + e550e5c
commit 0acc8e1
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor.less b/src/Umbraco.Web.UI.Client/src/less/components/editor.less
@@ -167,23 +167,23 @@ a.umb-editor-header__close-split-view:hover {
 	text-decoration: none !important;
 	font-size: 13px;
 	//color: @gray-4;
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 	//background-color: @white;
 }
 
 a.umb-variant-switcher__toggle {
 	transition: color 0.2s ease-in-out;
 	&:hover {
 		//background-color: @gray-10;
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         .umb-variant-switcher__expand {
-            color: @ui-action-disgrete-type-hover;
+            color: @ui-action-discreet-type-hover;
         }
 	}
 }
 
 .umb-variant-switcher__expand {
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
 	margin-top: 3px;
 	margin-left: 5px;
 	margin-right: -5px;

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
@@ -41,13 +41,13 @@
   // file select link
   .file-select {
     font-size: 15px;
-    color: @ui-action-disgrete-type;
+    color: @ui-action-discreet-type;
     cursor: pointer;
 
     margin-top: 10px;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
         text-decoration: none;
     }
   }

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
@@ -218,7 +218,7 @@
     transition: opacity 150ms;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
     }
 }
 

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
@@ -89,16 +89,16 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    border: 1px dashed @ui-action-disgrete-border;
-    color: @ui-action-disgrete-type;
+    border: 1px dashed @ui-action-discreet-border;
+    color: @ui-action-discreet-type;
     font-weight: bold;
     padding: 5px 15px;
     box-sizing: border-box;
 }
 
 .umb-node-preview-add:hover {
-    color: @ui-action-disgrete-type-hover;
-    border-color: @ui-action-disgrete-border-hover;
+    color: @ui-action-discreet-type-hover;
+    border-color: @ui-action-discreet-border-hover;
     text-decoration: none;
 }
 

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
@@ -408,7 +408,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail {
     flex: 0 1 100px;
-    border: 1px solid @ui-action-disgrete-border;
+    border: 1px solid @ui-action-discreet-border;
     border-radius: 3px;
     margin: 5px;
     padding: 10px;
@@ -418,7 +418,7 @@ a.umb-package-details__back-link {
 
 .umb-gallery__thumbnail:hover {
     cursor: pointer;
-    border-color: @ui-action-disgrete-border-hover;
+    border-color: @ui-action-discreet-border-hover;
 }
 
 /* PACKAGE LIST */

diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -239,8 +239,8 @@
 
 .list-view-add-layout {
    margin-top: 10px;
-   color: @ui-action-disgrete-type;
-   border: 1px dashed @ui-action-disgrete-border;
+   color: @ui-action-discreet-type;
+   border: 1px dashed @ui-action-discreet-border;
    display: flex;
    align-items: center;
    justify-content: center;
@@ -250,6 +250,6 @@
 
 .list-view-add-layout:hover {
    text-decoration: none;
-   color: @ui-action-disgrete-type-hover;
-   border-color: @ui-action-disgrete-border-hover;
+   color: @ui-action-discreet-type-hover;
+   border-color: @ui-action-discreet-border-hover;
 }
diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less
@@ -346,15 +346,15 @@
   justify-content: center;
   align-items: center;
   background: @white;
-  border: 1px solid @ui-action-disgrete-border;
+  border: 1px solid @ui-action-discreet-border;
   animation: fadeIn 0.5s;
   border-radius: 3px;
   width: 50px;
   &:hover {
       .icon {
           opacity: 0.8;
       }
-      border-color: @ui-action-disgrete-border-hover;
+      border-color: @ui-action-discreet-border-hover;
   }
 }
 

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -269,8 +269,8 @@
     transition: all 150ms ease-in-out;
 
     &:hover {
-        color: @ui-action-disgrete-type-hover;
-        border-color: @ui-action-disgrete-type-hover;
+        color: @ui-action-discreet-type-hover;
+        border-color: @ui-action-discreet-type-hover;
     }
 }
 

diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less
@@ -166,12 +166,12 @@
 @ui-action-border:             @blueExtraDark;
 @ui-action-border-hover:       @blueMid;
 
-@ui-action-disgrete:              white;
-@ui-action-disgrete-hover:        @sand-7;
-@ui-action-disgrete-type:         @blueExtraDark;
-@ui-action-disgrete-type-hover:   @blueMid;
-@ui-action-disgrete-border:         @gray-7;
-@ui-action-disgrete-border-hover:   @blueMid;
+@ui-action-discreet:              white;
+@ui-action-discreet-hover:        @sand-7;
+@ui-action-discreet-type:         @blueExtraDark;
+@ui-action-discreet-type-hover:   @blueMid;
+@ui-action-discreet-border:         @gray-7;
+@ui-action-discreet-border-hover:   @blueMid;
 
 @type-white:                      @white;
 @type-black:                      @blueNight;