Merge remote-tracking branch 'origin/MAGETWO-55397' into wcag-pr

undefined-olha · undefined-olha · commit 9bdfbfa8f705 · 2017-05-15T10:13:18.000+03:00
diff --git a/app/code/Magento/Swatches/view/frontend/web/css/swatches.css b/app/code/Magento/Swatches/view/frontend/web/css/swatches.css
@@ -48,19 +48,18 @@
 }
 
 .swatch-option.text {
-    background: #F2F2F2;
-    color: #7F7F7F;
+    background: #F0F0F0;
+    color: #686868;
     font-size: 12px;
     font-weight: 700;
     line-height: 20px;
     padding: 4px 8px;
     min-width: 22px;
     margin-right: 7px;
-    /*background-color: #F2F2F2;*/
 }
 
 .swatch-option.selected {
-    outline: 2px solid #FF5100;
+    outline: 2px solid #ff5501;
     border: 1px solid #fff;
     color: #333;
 }
@@ -96,7 +95,7 @@
 
 .swatch-option.image:not(.disabled):hover,
 .swatch-option.color:not(.disabled):hover {
-    outline: 2px solid #FF5216;
+    outline: 2px solid #ee0000;
     border: 1px solid #fff;
 }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -12,6 +12,7 @@
 
 @product-info-price: @color-gray34;
 @product-h1-margin-bottom-desktop: @indent__s + @indent__xs;
+@product-price__muted__color: @color-gray40;
 
 //
 //  Common
@@ -22,7 +23,7 @@
     //  Category view
     .old-price,
     .old.price {
-        .lib-css(color, @text__color__muted);
+        .lib-css(color, @product-price__muted__color);
     }
 
     .prices-tier {
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -20,6 +20,8 @@
 @product-item__hover__background-color: @color-white;
 @product-item__hover__box-shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);
 
+@product-price__muted__color: @color-gray40;
+
 //
 //  Common
 //  _____________________________________________
@@ -107,7 +109,7 @@
                 }
 
                 .price-label {
-                    .lib-css(color, @text__color__muted);
+                    .lib-css(color, @product-price__muted__color);
                     font-size: @font-size__s;
                 }
             }
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_toolbar.less
@@ -10,6 +10,7 @@
 @toolbar-mode-icon-font-size: 16px;
 @toolbar-background: transparent;
 @toolbar-element-background: @color-gray94;
+@toolbar-element__color: @color-gray37;
 @pager-action__background: @toolbar-element-background;
 @pager-action__hover__background: darken(@toolbar-element-background, 7%);
 @pager__font-weight: @font-weight__bold;
@@ -183,7 +184,7 @@
     .modes-mode {
         .lib-css(background-color, @toolbar-element-background);
         .lib-css(box-shadow, @button__shadow);
-        .lib-css(color, @text__color__muted);
+        .lib-css(color, @toolbar-element__color);
         border: 1px solid @border-color__base;
         border-right: 0;
         float: left;
@@ -197,7 +198,7 @@
         }
 
         &:hover {
-            .lib-css(color, @text__color__muted);
+            .lib-css(color, @toolbar-element__color);
             background: darken(@toolbar-element-background, 2%);
         }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -149,6 +149,12 @@
         }
 
         &:extend(.abs-adjustment-incl-excl-tax all);
+
+        .action {
+            &.multicheckout {
+                color: @color-blue2;
+            }
+        }
     }
 
     //  Totals block
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -142,6 +142,7 @@
                 right: 26px;
             }
         }
+
         .product {
             .actions {
                 float: right;
@@ -207,6 +208,10 @@
                     }
                 }
 
+                .counter-number {
+                    text-shadow: 0 0 7px rgba(0, 0, 0, 1);
+                }
+
                 .counter-label {
                     &:extend(.abs-visually-hidden all);
                 }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_order-summary.less
@@ -11,7 +11,7 @@
 @checkout-summary__padding: 22px @indent__l;
 
 @checkout-summary-title__margin: @indent__s;
-@checkout-summary-mark-value__color: @color-gray60;
+@checkout-summary-mark-value__color: @color-gray40;
 
 @checkout-summary-items__max-height: 370px;
 @checkout-summary-items__padding: 15px;
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less
@@ -13,22 +13,26 @@
 
 @checkout-progress-bar-item__background-color: @color-gray-middle1;
 @checkout-progress-bar-item__border-radius: 6px;
-@checkout-progress-bar-item__color: @primary__color;
+@checkout-progress-bar-item__color: @color-gray40;
 @checkout-progress-bar-item__margin: @indent__s;
 @checkout-progress-bar-item__transition: background .3s;
 @checkout-progress-bar-item__width: 185px;
 
 @checkout-progress-bar-item__active__background-color: @color-orange-red1;
+@checkout-progress-bar-item__active__color: @primary__color;
+@checkout-progress-bar-item__active__font-weight: @font-weight__semibold;
 @checkout-progress-bar-item__complete__color: @link__color;
 @checkout-progress-bar-item__hover__background-color: darken(@checkout-progress-bar-item__background-color, 5%);
 
 @checkout-progress-bar-item-element__height: @checkout-progress-bar-item-element__width;
 @checkout-progress-bar-item-element__width: 38px;
 
 @checkout-progress-bar-item-element-inner__background-color: @page__background-color;
-@checkout-progress-bar-item-element-inner__color: @checkout-progress-bar-item__color;
+@checkout-progress-bar-item-element-inner__border-color: @color-gray80;
+@checkout-progress-bar-item-element-inner__color: @primary__color;
 @checkout-progress-bar-item-element-inner__height: @checkout-progress-bar-item-element-inner__width;
 @checkout-progress-bar-item-element-inner__width: @checkout-progress-bar-item-element__width - ( @checkout-progress-bar-item-element-outer-radius__width*2 );
+@checkout-progress-bar-item-element-inner__active__border-color: @color-orange-red1;
 @checkout-progress-bar-item-element-inner__active__content: @icon-checkmark;
 
 @checkout-progress-bar-item-element-outer-radius__width: 6px;
@@ -72,6 +76,7 @@
 
         &:before { // Horizontal line
             .lib-css(background, @checkout-progress-bar-item__background-color);
+            .lib-css(border, 1px solid @checkout-progress-bar-item-element-inner__border-color);
             .lib-css(top, @checkout-progress-bar-item-element__width/2);
             .lib-css(transition, @checkout-progress-bar-item__transition);
             content: '';
@@ -100,7 +105,7 @@
             word-wrap: break-word;
 
             .lib-typography(
-            @_color: @checkout-progress-bar-item__background-color,
+            @_color: @checkout-progress-bar-item__color,
             @_font-family: false,
             @_font-size: @checkout-progress-bar__font-size,
             @_font-style: false,
@@ -111,6 +116,7 @@
             &:before, // Item element
             &:after {
                 .lib-css(background, @checkout-progress-bar-item__background-color);
+                .lib-css(border, 1px solid @checkout-progress-bar-item-element-inner__border-color);
                 .lib-css(height, @checkout-progress-bar-item-element__height);
                 .lib-css(margin-left, -(@checkout-progress-bar-item-element__width/2));
                 .lib-css(transition, @checkout-progress-bar-item__transition);
@@ -168,19 +174,23 @@
 
         &._active {
             &:before {
-                background: @checkout-progress-bar-item__active__background-color;
+                .lib-css(background, @checkout-progress-bar-item__active__background-color);
+                .lib-css(border-color, @checkout-progress-bar-item-element-inner__active__border-color);
             }
 
             > span {
-                .lib-css(color, @checkout-progress-bar-item__color);
+                .lib-css(color, @checkout-progress-bar-item__active__color);
+                .lib-css(font-weight, @checkout-progress-bar-item__active__font-weight);
 
                 &:before {
                     .lib-css(background, @checkout-progress-bar-item__active__background-color);
+                    .lib-css(border-color, @checkout-progress-bar-item-element-inner__active__border-color);
                 }
 
                 &:after {
-                    .lib-css(font-family, @icons__font-name);
+                    .lib-css(border-color, @checkout-progress-bar-item-element-inner__active__border-color);
                     .lib-css(content, @checkout-progress-bar-item-element-inner__active__content);
+                    .lib-css(font-family, @icons__font-name);
                 }
             }
         }
diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/web/css/source/_module.less
@@ -178,6 +178,8 @@
 
                 .count {
                     .lib-css(color, @filter-quantity);
+                    font-weight: @font-weight__light;
+                    padding-left: 5px;
                     padding-right: 5px;
 
                     &:before {
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less
@@ -25,13 +25,13 @@
 @message-global-caution__border-color: none;
 
 @header__background-color: false;
-@header-panel__background-color: @color-gray-middle3;
+@header-panel__background-color: @color-gray-middle4;
 @header-panel__text-color: @color-white;
-@header-icons-color: @color-gray56;
+@header-icons-color: @color-gray46;
 @header-icons-color-hover: @color-gray20;
 @customer-welcome__z-index: @dropdown-list__z-index + 1;
 
-@addto-color: @color-gray60;
+@addto-color: @color-gray40;
 @addto-hover-color: @primary__color;
 @minicart-icons-color: @header-icons-color;
 @minicart-icons-color-hover: @header-icons-color-hover;
@@ -56,7 +56,7 @@
 @filter-title-background-color: @color-gray94;
 @filter-link: @color-gray-darken4;
 @filter-link-hover: darken(@filter-link, 30%);
-@filter-quantity: @color-gray52;
+@filter-quantity: @color-gray46;
 
 //
 //  Common
diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module/_collapsible_navigation.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/module/_collapsible_navigation.less
@@ -10,7 +10,7 @@
 @collapsible-nav-background: @sidebar__background-color;
 @collapsible-nav-color: @color-gray34;
 @collapsible-nav-current-border: 3px solid transparent;
-@collapsible-nav-current-border-color: @color-orange-red1;
+@collapsible-nav-current-border-color: @active__color;
 @collapsible-nav-current-color: @color-black;
 @collapsible-nav-current-font-weight: @font-weight__semibold;
 @collapsible-nav-delimiter__border-color: @color-gray82;
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -301,7 +301,7 @@
         @_icon-font-size: 12px,
         @_icon-font-line-height: 15px,
         @_icon-font-text-hide: true,
-        @_icon-font-color: @color-gray60,
+        @_icon-font-color: @color-gray46,
         @_icon-font-color-hover: @color-gray-darken4,
         @_icon-font-color-active: @color-gray60
         );
@@ -1524,9 +1524,17 @@
 
 & when (@media-common = true) {
     .abs-block-items-counter {
-        .lib-css(color, @primary__color__lighter);
+        .lib-css(color, @block-items__counter__color);
         .lib-font-size(12px);
         white-space: nowrap;
+
+        &:before {
+            content: '(';
+        }
+
+        &:after {
+            content: ')';
+        }
     }
 }
 
diff --git a/app/design/frontend/Magento/luma/web/css/source/_theme.less b/app/design/frontend/Magento/luma/web/css/source/_theme.less
@@ -27,6 +27,12 @@
 @h3__font-weight: @font-weight__semibold;
 @h3__margin-top: @indent__base;
 
+//  Links
+@link__color: @color-blue2;
+
+//  Focus
+@focus__color: @color-blue3;
+
 //
 //  Tables
 //  ---------------------------------------------
@@ -54,14 +60,21 @@
 
 @navigation__background: @color-gray94;
 @navigation-level0-item__active__color: @primary__color;
+@navigation-level0-item__active__border-color: @active__color;
+@navigation-desktop-level0-item__active__border-color: @active__color;
+
+@submenu-desktop-item__active__border-color: @active__color;
+@submenu-item__active__border-color: @active__color;
 @submenu-item__active__color: @navigation-level0-item__active__color;
 
+
 //  Desktop navigation
 @navigation-desktop-level0-item__line-height: 47px;
 @submenu-desktop__font-weight: @font-weight__regular;
 @submenu-desktop-item__active__color: @navigation-level0-item__active__color;
 
 //  Tabs
+@tab-control__color: @color-gray43;
 @tab-control__font-weight: @font-weight__regular;
 @tab-control__height: @indent__base*2;
 @tab-control__margin-right: -1px;
@@ -171,6 +184,9 @@
 //  Form field note icon
 @form-field-note-icon-font__content: false;
 
+//  Placeholder
+@form-element-input-placeholder__color: @color-gray34;
+
 //
 //  Pager
 //  ---------------------------------------------
@@ -228,6 +244,12 @@
 @breadcrumbs-icon__font-size: 10px;
 @breadcrumbs-icon__font-margin: 0 @indent__s;
 
+@breadcrumbs-current__color: @color-gray-middle5;
+@breadcrumbs-link__color: @color-blue2;
+@breadcrumbs-link__visited__color: @breadcrumbs-link__color;
+@breadcrumbs-link__hover__color: @breadcrumbs-link__color;
+@breadcrumbs-link__active__color: @breadcrumbs-link__color;
+
 //
 //  Popups
 //  ---------------------------------------------
@@ -265,3 +287,9 @@
 
 //  Checkout
 @checkout-sidebar__columns: 8;
+
+//
+//  Footer
+//  ---------------------------------------------
+
+@copyright__background-color: @color-gray-middle4;
diff --git a/app/design/frontend/Magento/luma/web/css/source/_variables.less b/app/design/frontend/Magento/luma/web/css/source/_variables.less
@@ -17,7 +17,6 @@
 
 //  Colors nesting
 @page__background-color: @color-white;
-@copyright__background-color: @color-gray56;
 
 //
 //  Icons
@@ -40,3 +39,9 @@
 //  ---------------------------------------------
 
 @sidebar__background-color: @color-white-smoke; // Used in cart sidebar, Checkout sidebar, Tier Prices, My account navigation, Rating block background
+
+//
+//  Sidebar blocks
+//  ---------------------------------------------
+
+@block-items__counter__color: @color-gray43;
diff --git a/lib/web/css/source/lib/variables/_colors.less b/lib/web/css/source/lib/variables/_colors.less

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`@product-item__hover__background-color: @color-white;`
`21`	`21`	`@product-item__hover__box-shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);`
`22`	`22`
	`23`	`+@product-price__muted__color: @color-gray40;`
	`24`	`+`
`23`	`25`	`//`
`24`	`26`	`// Common`
`25`	`27`	`// _____________________________________________`
`@@ -107,7 +109,7 @@`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`.price-label {`
`110`		`- .lib-css(color, @text__color__muted);`
	`112`	`+ .lib-css(color, @product-price__muted__color);`
`111`	`113`	`font-size: @font-size__s;`
`112`	`114`	`}`
`113`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,12 @@`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`&:extend(.abs-adjustment-incl-excl-tax all);`
	`152`	`+`
	`153`	`+ .action {`
	`154`	`+ &.multicheckout {`
	`155`	`+ color: @color-blue2;`
	`156`	`+ }`
	`157`	`+ }`
`152`	`158`	`}`
`153`	`159`
`154`	`160`	`// Totals block`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@`
`142`	`142`	`right: 26px;`
`143`	`143`	`}`
`144`	`144`	`}`
	`145`	`+`
`145`	`146`	`.product {`
`146`	`147`	`.actions {`
`147`	`148`	`float: right;`
`@@ -207,6 +208,10 @@`
`207`	`208`	`}`
`208`	`209`	`}`
`209`	`210`
	`211`	`+ .counter-number {`
	`212`	`+ text-shadow: 0 0 7px rgba(0, 0, 0, 1);`
	`213`	`+ }`
	`214`	`+`
`210`	`215`	`.counter-label {`
`211`	`216`	`&:extend(.abs-visually-hidden all);`
`212`	`217`	`}`