MAGETWO-91923: Jenkins - Static Test Failures

tjwiebell · tjwiebell · commit 87a0910a0d17 · 2018-05-21T10:02:07.000-05:00
- Replace redundant color variables with core Magento vars
- Move PageBuilder defined colors to _vars file
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less
@@ -3,8 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@color-black: #000;
-
 [data-role='modal'] {
     .action-pagebuilder-cancel,
     .action-pagebuilder-cancel:hover {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less
@@ -4,8 +4,6 @@
 //  */
 
 @border-size: 2px;
-@color-white: #fff;
-@color-black: #000;
 
 .pagebuilder-header {
     text-align: right;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less
@@ -29,6 +29,11 @@
 @entity-color: #243743;
 @text-color: #545454;
 @entity-background-color: #7e7e7e;
+@color-pagebuilder-dark-gray: #534d49;
+@color-pagebuilder-light-gray: #f8f3eb;
+@color-pagebuilder-darker-gray: #2b2625;
+@color-pagebuilder-darkest-gray: #1c1918;
+@color-pagebuilder-light-blue: #bfe2f0;
 
 //
 //  Fonts
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less
@@ -3,13 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@color-white: #fff;
-@f8f8f8: #f8f8f8;
-@eee: #eee;
-@dark-gray: #534d49;
-@light-gray: #f8f3eb;
-@darker-gray: #2b2625;
-
 .pagebuilder-content-type {
     [contenteditable=true] {
         -webkit-user-select: text;
@@ -128,7 +121,7 @@
 
         &.pagebuilder-image {
             .pagebuilder-image-placeholder {
-                background: @f8f8f8;
+                background: @color-white-fog;
                 cursor: pointer;
                 font-size: 12px;
                 padding: 30px 0 16px;
@@ -416,7 +409,7 @@
             text-decoration: none;
 
             &:hover {
-                background-color: @eee;
+                background-color: @color-gray-darken0;
             }
         }
 
@@ -480,7 +473,7 @@
                     }
 
                     &:hover:not(&.option-title) {
-                        background-color: @eee;
+                        background-color: @color-gray-darken0;
                         color: @color-very-dark-gray-black;
                     }
                 }
@@ -575,11 +568,11 @@
 .pagebuilder-live-edit-wrapper {
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
-    background: @darker-gray;
+    background: @color-pagebuilder-darker-gray;
     border: none;
     border-radius: 3px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, .25);
-    color: @light-gray;
+    color: @color-pagebuilder-light-gray;
     display: none;
     left: 10px !important;
     overflow: hidden;
@@ -621,16 +614,16 @@
                         padding: 0 14px;
 
                         &:hover {
-                            background: @dark-gray;
-                            color: @light-gray;
+                            background: @color-pagebuilder-dark-gray;
+                            color: @color-pagebuilder-light-gray;
                             text-decoration: none;
                         }
                     }
 
                     &.active {
                         a {
-                            background: @dark-gray;
-                            color: @light-gray;
+                            background: @color-pagebuilder-dark-gray;
+                            color: @color-pagebuilder-light-gray;
                             text-decoration: none;
                         }
                     }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/accordion/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/accordion/_default.less
@@ -3,15 +3,13 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@light-gray: #ccc;
-
 //
 //  Default appearance styles
 //  _____________________________________________
 
 .pagebuilder-accordion {
     .accordion-collapsible {
-        border-bottom: 1px solid @light-gray;
+        border-bottom: 1px solid @color-gray80;
         cursor: pointer;
         font-weight: bold;
         padding: 14px 8px;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less
@@ -3,17 +3,14 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@light-gray: #fafafa;
-@dark-gray: #aaa6a0;
-
 //
 //  Default appearance styles
 //  _____________________________________________
 
 .pagebuilder-banner {
-    background-color: @light-gray;
+    background-color: @color-gray98;
     .pagebuilder-empty-banner {
-        color: @dark-gray;
+        color: @color-gray65-lighten;
         font-size: 20px;
         font-weight: lighter;
     }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less
@@ -3,8 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@light-blue: #bfe2f0;
-
 //
 //  Default appearance styles
 //  _____________________________________________
@@ -87,7 +85,7 @@
         }
 
         .resize-ghost {
-            border-right: 15px solid @light-blue;
+            border-right: 15px solid @color-pagebuilder-light-blue;
             box-sizing: border-box;
             height: 100%;
             left: 0;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less
@@ -3,8 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@light-blue: #bfe2f0;
-
 //
 //  Default appearance styles
 //  _____________________________________________
@@ -26,7 +24,7 @@
     }
 
     .pagebuilder-column-resize-handle {
-        background: @light-blue;
+        background: @color-pagebuilder-light-blue;
         bottom: 0;
         cursor: col-resize;
         opacity: 0;
@@ -48,7 +46,7 @@
         -ms-user-select: none;
         -webkit-touch-callout: none;
         -webkit-user-select: none;
-        background: @light-blue;
+        background: @color-pagebuilder-light-blue;
         height: 100%;
         left: 0;
         opacity: 0;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less
@@ -3,9 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@light-gray: #f8f8f8;
-@dark-gray: #aaa;
-
 //
 //  Default appearance styles
 //  _____________________________________________
@@ -20,14 +17,14 @@
 
         div.pagebuilder-image-empty-preview {
             align-items: center;
-            background: @light-gray;
+            background: @color-white-fog;
             display: flex;
             height: 300px;
             justify-content: center;
             width: 100%;
 
             span {
-                color: @dark-gray;
+                color: @color-gray65-lighten;
             }
         }
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less
@@ -3,23 +3,20 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@light-gray: #fafafa;
-@dark-gray: #aaa6a0;
-
 //
 //  Default appearance styles
 //  _____________________________________________
 
 .pagebuilder-slide {
-    background-color: @light-gray;
+    background-color: @color-gray98;
 
     .pagebuilder-options {
         left: 100%;
         transform: translate(-100%, 0);
     }
 
     .pagebuilder-empty-slide {
-        color: @dark-gray;
+        color: @color-gray65-lighten;
         font-size: 20px;
         font-weight: lighter;
     }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less
@@ -3,16 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@color-gray: #aaa6a0;
-@color-white: #fff;
-@color-yellow: #fffbbb;
-@light-gray: #afadac;
-@c-gray: #ccc;
-@dark-gray: #373330;
-@color-blue: #007bdb;
-@b3: #b3b3b3;
-@darker-gray: #1c1918;
-
 //
 //  Default appearance styles
 //  _____________________________________________
@@ -54,7 +44,7 @@
 
     .slider-empty {
         align-items: flex-end;
-        color: @color-gray;
+        color: @color-gray65-lighten;
         display: flex;
         font-size: 20px;
         font-weight: lighter;
@@ -91,8 +81,8 @@
                 );
 
                 .tooltip-content {
-                    background: @color-yellow;
-                    border: 1px solid @light-gray;
+                    background: @color-lazy-sun;
+                    border: 1px solid @color-dark-grayish-orange;
                     border-radius: 1px;
                     bottom: 97.5%;
                     box-shadow: 0 2px 8px 0 rgba(0, 0, 0, .3);
@@ -118,12 +108,12 @@
                         width: 0;
                     }
                     &:before {
-                        border-top-color: @light-gray;
+                        border-top-color: @color-dark-grayish-orange;
                         margin-top: 1px;
                         z-index: 3;
                     }
                     &:after {
-                        border-top-color: @color-yellow;
+                        border-top-color: @color-lazy-sun;
                         z-index: 4;
                     }
                 }
@@ -143,7 +133,7 @@
 
                     &:after {
                         background: @color-white;
-                        border: 1px solid @c-gray;
+                        border: 1px solid @color-gray80;
                         border-radius: 10px;
                         content: ' ';
                         display: inline-block;
@@ -187,7 +177,7 @@
 
                 &.sortable-placeholder {
                     &:after {
-                        background-color: @dark-gray;
+                        background-color: @color-very-dark-grayish-orange;
                         border: none;
                         border-radius: 10px;
                         content: ' ';
@@ -205,14 +195,14 @@
 
                 &.active {
                     .navigation-dot-anchor:after {
-                        background: @dark-gray;
+                        background: @color-very-dark-grayish-orange;
                         border: none;
                         transition: all .3s;
                     }
                 }
 
                 &:focus {
-                    outline: 1px solid @color-blue;
+                    outline: 1px solid @color-blue-pure;
 
                     .pagebuilder-options {
                         .pagebuilder-options-visible;
@@ -234,11 +224,11 @@
                     }
 
                     .navigation-dot-anchor:after {
-                        border: 1px solid @b3;
+                        border: 1px solid @color-gray75;
                     }
 
                     &.active .navigation-dot-anchor:after {
-                        background: @darker-gray;
+                        background: @color-pagebuilder-darkest-gray;
                         border: none;
                     }
                 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less
@@ -3,11 +3,6 @@
 //  * See COPYING.txt for license details.
 //  */
 
-@f6: #f6f6f6;
-@ccc: #ccc;
-@color-black: #000;
-@color-white: #fff;
-
 //
 //  Default appearance styles
 //  _____________________________________________
@@ -24,8 +19,8 @@
         }
 
         li.tab-header {
-            background: @f6;
-            border: 1px solid @ccc;
+            background: @color-gray-light0;
+            border: 1px solid @color-gray80;
             border-bottom: 0 !important;
             border-bottom-left-radius: 0 !important;
             border-bottom-right-radius: 0 !important;
@@ -114,7 +109,7 @@
             }
 
             &:last-child {
-                border-right: 1px solid @ccc;
+                border-right: 1px solid @color-gray80;
             }
 
             &.ui-state-active {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_margins-and-padding.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_margins-and-padding.less
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/slick/_slick.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/slick/_slick.less
