From 43153af19fa6a57b48130c0612a228e4f8671fd8 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Tue, 17 May 2016 12:16:53 +0300
Subject: [PATCH 01/31] MAGETWO-51331: Order number is shown as a telephone
 link on iPhone

---
 app/code/Magento/Backend/view/adminhtml/layout/default.xml    | 1 +
 .../view/frontend/web/template/billing-address/details.html   | 4 +++-
 .../template/shipping-address/address-renderer/default.html   | 4 +++-
 .../shipping-information/address-renderer/default.html        | 4 +++-
 app/code/Magento/Customer/etc/config.xml                      | 4 ++--
 .../blank/Magento_Theme/layout/default_head_blocks.xml        | 1 +
 6 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index c957f3b49c6b8..9db902fb13294 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -9,6 +9,7 @@
     <head>
         <title>Magento Admin</title>
         <meta name="viewport" content="width=1024"/>
+        <meta name="format-detection" content="telephone=no"/>
         <link src="requirejs/require.js"/>
         <css src="extjs/resources/css/ext-all.css"/>
         <css src="extjs/resources/css/ytheme-magento.css"/>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index 4f3c430cf3d31..edd6324d3de95 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -10,7 +10,9 @@
     <!-- ko text: currentBillingAddress().street --><!-- /ko --><br/>
     <!-- ko text: currentBillingAddress().city --><!-- /ko -->, <!-- ko text: currentBillingAddress().region --><!-- /ko --> <!-- ko text: currentBillingAddress().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(currentBillingAddress().countryId) --><!-- /ko --><br/>
-    <!-- ko text: currentBillingAddress().telephone --><!-- /ko --><br/>
+    <!-- ko if: (currentBillingAddress().telephone) -->
+    <a data-bind="text: currentBillingAddress().telephone, attr: {'href': 'tel:' + currentBillingAddress().telephone}"></a>
+    <!-- /ko --><br/>
     <button type="button"
             class="action action-edit-address"
             data-bind="visible: !isAddressSameAsShipping(), click: editAddress">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index fb34ea9f3f7f6..b71cc710d65f8 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -10,7 +10,9 @@
     <!-- ko text: address().street --><!-- /ko --><br/>
     <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
-    <!-- ko text: address().telephone --><!-- /ko --><br/>
+    <!-- ko if: (address().telephone) -->
+    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
+    <!-- /ko --><br/>
     <!-- ko if: (address().isEditable()) -->
     <button type="button"
             class="action edit-address-link"
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
index b7ffe3794a760..9d93c365ed382 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -10,5 +10,7 @@
     <!-- ko text: address().street --><!-- /ko --><br/>
     <!-- ko text: address().city --><!-- /ko -->, <!-- ko text: address().region --><!-- /ko --> <!-- ko text: address().postcode --><!-- /ko --><br/>
     <!-- ko text: getCountryName(address().countryId) --><!-- /ko --><br/>
-    <!-- ko text: address().telephone --><!-- /ko --><br/>
+    <!-- ko if: (address().telephone) -->
+    <a data-bind="text: address().telephone, attr: {'href': 'tel:' + address().telephone}"></a>
+    <!-- /ko --><br/>
 <!-- /ko -->
diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index effe94adad747..f671cac129638 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -76,7 +76,7 @@ T: {{var telephone}}
 {{depend street4}}{{var street4}}<br />{{/depend}}
 {{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
 {{var country}}<br/>
-{{depend telephone}}T: {{var telephone}}{{/depend}}
+{{depend telephone}}T: <a href="tel:{{var telephone}}">{{var telephone}}</a>{{/depend}}
 {{depend fax}}<br/>F: {{var fax}}{{/depend}}
 {{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}]]></html>
                 <pdf><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}|
@@ -89,7 +89,7 @@ T: {{var telephone}}
 {{if city}}{{var city}},|{{/if}}
 {{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
 {{var country}}|
-{{depend telephone}}T: {{var telephone}}{{/depend}}|
+{{depend telephone}}T: <a href="tel">{{var telephone}}</a>{{/depend}}|
 {{depend fax}}<br/>F: {{var fax}}{{/depend}}|
 {{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
             </address_templates>
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml b/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml
index d0ca8a24586a8..4e911e4b38e24 100644
--- a/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml
+++ b/app/design/frontend/Magento/blank/Magento_Theme/layout/default_head_blocks.xml
@@ -10,5 +10,6 @@
         <css src="css/styles-m.css"/>
         <css src="css/styles-l.css" media="screen and (min-width: 768px)"/>
         <css src="css/print.css" media="print"/>
+        <meta name="format-detection" content="telephone=no"/>
     </head>
 </page>

From 371025c944d0b4ce2692b3152298d2628bd01016 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Tue, 17 May 2016 12:25:20 +0300
Subject: [PATCH 02/31] MAGETWO-51331: Order number is shown as a telephone
 link on iPhone

---
 app/code/Magento/Customer/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/etc/config.xml b/app/code/Magento/Customer/etc/config.xml
index f671cac129638..baf1cf0d3a90c 100644
--- a/app/code/Magento/Customer/etc/config.xml
+++ b/app/code/Magento/Customer/etc/config.xml
@@ -89,7 +89,7 @@ T: {{var telephone}}
 {{if city}}{{var city}},|{{/if}}
 {{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
 {{var country}}|
-{{depend telephone}}T: <a href="tel">{{var telephone}}</a>{{/depend}}|
+{{depend telephone}}T: {{var telephone}}{{/depend}}|
 {{depend fax}}<br/>F: {{var fax}}{{/depend}}|
 {{depend vat_id}}<br/>VAT: {{var vat_id}}{{/depend}}|]]></pdf>
             </address_templates>

From d716373d1916697d622170da9f3ca17822d90576 Mon Sep 17 00:00:00 2001
From: Ben Crook <ben@space48.com>
Date: Thu, 19 May 2016 19:33:21 +0100
Subject: [PATCH 03/31] Fix desktop spelling in lib/web/css #4557

---
 lib/web/css/docs/sections.html         | 2 +-
 lib/web/css/docs/source/_sections.less | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web/css/docs/sections.html b/lib/web/css/docs/sections.html
index 201f28f2b4da4..021865154b3ba 100644
--- a/lib/web/css/docs/sections.html
+++ b/lib/web/css/docs/sections.html
@@ -559,7 +559,7 @@
     </table>
   </pre>
 </div></article><article id="responsive-tabs" class="section"><div class="docs"><a href="#responsive-tabs" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="responsive-tabs">Responsive tabs</h1>
-<p>  Since tabs and accordion have same markup, they can transform one into other by means of CSS and JavaScript. This can be used for responsive web design. For instance, for mobile version there is an accordion, for desctop version it is transformed to tabs. To implement this approach, use the  <code>.lib-data-accordion()</code> mixin for mobile version, and the <code>.lib-data-tabs()</code> mixin for desctop version.</p>
+<p>  Since tabs and accordion have same markup, they can transform one into other by means of CSS and JavaScript. This can be used for responsive web design. For instance, for mobile version there is an accordion, for desktop version it is transformed to tabs. To implement this approach, use the  <code>.lib-data-accordion()</code> mixin for mobile version, and the <code>.lib-data-tabs()</code> mixin for desktop version.</p>
 <textarea class="preview-code" spellcheck="false">  &lt;dl class="example-sections-4" data-sections="tabs"&gt;
     &lt;dt class="item title active" data-section="title"&gt;
         &lt;a class="switch" data-toggle="switch" href="#product.info.description"&gt;Details&lt;/a&gt;
diff --git a/lib/web/css/docs/source/_sections.less b/lib/web/css/docs/source/_sections.less
index f7675acd034d1..bff2fa459d2ca 100644
--- a/lib/web/css/docs/source/_sections.less
+++ b/lib/web/css/docs/source/_sections.less
@@ -586,7 +586,7 @@
 
 //  # Responsive tabs
 //
-//  Since tabs and accordion have same markup, they can transform one into other by means of CSS and JavaScript. This can be used for responsive web design. For instance, for mobile version there is an accordion, for desctop version it is transformed to tabs. To implement this approach, use the  <code>.lib-data-accordion()</code> mixin for mobile version, and the <code>.lib-data-tabs()</code> mixin for desctop version.
+//  Since tabs and accordion have same markup, they can transform one into other by means of CSS and JavaScript. This can be used for responsive web design. For instance, for mobile version there is an accordion, for desktop version it is transformed to tabs. To implement this approach, use the  <code>.lib-data-accordion()</code> mixin for mobile version, and the <code>.lib-data-tabs()</code> mixin for desktop version.
 //
 //  ```html
 //  <dl class="example-sections-4" data-sections="tabs">

From 8e6017d51469c3157fd94bcf5328ecb915cad94d Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Thu, 26 May 2016 17:52:04 +0300
Subject: [PATCH 04/31] MAGETWO-53082: Order summary block looks broken on
 checkout step 2

---
 .../frontend/web/template/summary/grand-total.html     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
index efbc840dc32d7..54441f8da0c5e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
@@ -5,10 +5,12 @@
  */
 -->
 <!-- ko if: isDisplayed() -->
-<tr>
-    <td colspan="2" data-bind="text: title"></td>
-    <td class="col grandtotal">
-        <span data-bind ="text: getValue(), attr:{'data-label': title}"></span>
+<tr class="grand totals">
+    <td class="mark" scope="row">
+        <strong data-bind="text: title"></strong>
+    </td>
+    <td class="amount" data-bind="attr: {'data-th': title}">
+        <strong><span class="price" data-bind="text: getValue()"></span></strong>
         <!-- ko foreach: elems() -->
             <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->

From 76e15b43db8899c9692e8b04a918c9ab0f50bdf0 Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Fri, 27 May 2016 11:17:06 +0300
Subject: [PATCH 05/31] MAGETWO-53082: Order summary block looks broken on
 checkout step 2

---
 .../view/frontend/web/template/summary/grand-total.html       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
index 54441f8da0c5e..cef1f58d093e5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
@@ -7,9 +7,9 @@
 <!-- ko if: isDisplayed() -->
 <tr class="grand totals">
     <td class="mark" scope="row">
-        <strong data-bind="text: title"></strong>
+        <strong data-bind="i18n: title"></strong>
     </td>
-    <td class="amount" data-bind="attr: {'data-th': title}">
+    <td class="amount" data-bind="attr: {'data-th': $t(title)}">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
         <!-- ko foreach: elems() -->
             <!-- ko template: getTemplate() --><!-- /ko -->

From 2128c479a5d41c83c464c4c3a118340898d41060 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Mon, 30 May 2016 14:03:34 +0300
Subject: [PATCH 06/31] MAGETWO-53171: Site logo is missing on Multiple Address
 checkout

---
 .../frontend/templates/address/edit.phtml     | 91 +++++++++++++++----
 .../layout/multishipping_checkout.xml         | 22 +----
 2 files changed, 74 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 135699ebc068f..d4e9568c88ab4 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -14,7 +14,10 @@
  * @var $block \Magento\Customer\Block\Address\Edit
  */
 ?>
-<form class="form-address-edit" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
+<form class="form-address-edit" action="<?php /* @escapeNotVerified */
+echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data"
+      data-hasrequired="<?php /* @escapeNotVerified */
+      echo __('* Required Fields') ?>">
     <fieldset class="fieldset">
         <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Contact Information') ?></span></legend><br>
         <?php echo $block->getBlockHtml('formkey')?>
@@ -24,19 +27,30 @@
         <div class="field company">
             <label class="label" for="company"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
             <div class="control">
-                <input type="text" name="company" id="company" title="<?php /* @escapeNotVerified */ echo __('Company') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
+                <input type="text" name="company" id="company" title="<?php /* @escapeNotVerified */
+                echo __('Company') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>"
+                       class="input-text <?php /* @escapeNotVerified */
+                       echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
             </div>
         </div>
         <div class="field telephone required">
             <label class="label" for="telephone"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
             <div class="control">
-                <input type="text" name="telephone" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php /* @escapeNotVerified */ echo __('Phone Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="telephone">
+                <input type="text" name="telephone"
+                       value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>"
+                       title="<?php /* @escapeNotVerified */
+                       echo __('Phone Number') ?>" class="input-text <?php /* @escapeNotVerified */
+                echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>"
+                       id="telephone">
             </div>
         </div>
         <div class="field fax">
             <label class="label" for="fax"><span><?php /* @escapeNotVerified */ echo __('Fax') ?></span></label>
             <div class="control">
-                <input type="text" name="fax" id="fax" title="<?php /* @escapeNotVerified */ echo __('Fax') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>">
+                <input type="text" name="fax" id="fax" title="<?php /* @escapeNotVerified */
+                echo __('Fax') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>"
+                       class="input-text <?php /* @escapeNotVerified */
+                       echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>">
             </div>
         </div>
     </fieldset>
@@ -46,7 +60,10 @@
         <div class="field street required">
             <label for="street_1" class="label"><span><?php /* @escapeNotVerified */ echo __('Street Address') ?></span></label>
             <div class="control">
-                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine(1)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>" id="street_1" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>"  />
+                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine(1)) ?>"
+                       title="<?php /* @escapeNotVerified */
+                       echo __('Street Address') ?>" id="street_1" class="input-text <?php /* @escapeNotVerified */
+                echo $_streetValidationClass ?>"/>
                 <div class="nested">
                     <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
                     <?php for ($_i = 1, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i < $_n; $_i++): ?>
@@ -55,7 +72,13 @@
                                 <span><?php /* @escapeNotVerified */ echo __('Street Address %1', $_i+1) ?></span>
                             </label>
                             <div class="control">
-                                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine($_i+1)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address %1', $_i+1) ?>" id="street_<?php /* @escapeNotVerified */ echo $_i+1 ?>" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>">
+                                <input type="text" name="street[]"
+                                       value="<?php echo $block->escapeHtml($block->getStreetLine($_i + 1)) ?>"
+                                       title="<?php /* @escapeNotVerified */
+                                       echo __('Street Address %1', $_i + 1) ?>"
+                                       id="street_<?php /* @escapeNotVerified */
+                                       echo $_i + 1 ?>" class="input-text <?php /* @escapeNotVerified */
+                                echo $_streetValidationClass ?>">
                             </div>
                         </div>
                     <?php endfor; ?>
@@ -67,29 +90,50 @@
             <div class="field taxvat">
                 <label class="label" for="vat_id"><span><?php /* @escapeNotVerified */ echo __('VAT Number') ?></span></label>
                 <div class="control">
-                    <input type="text" name="vat_id" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>" title="<?php /* @escapeNotVerified */ echo __('VAT Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" id="vat_id">
+                    <input type="text" name="vat_id"
+                           value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>"
+                           title="<?php /* @escapeNotVerified */
+                           echo __('VAT Number') ?>" class="input-text <?php /* @escapeNotVerified */
+                    echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>"
+                           id="vat_id">
                 </div>
             </div>
         <?php endif; ?>
         <div class="field city required">
             <label class="label" for="city"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
             <div class="control">
-                <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" title="<?php /* @escapeNotVerified */ echo __('City') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city">
+                <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>"
+                       title="<?php /* @escapeNotVerified */
+                       echo __('City') ?>" class="input-text <?php /* @escapeNotVerified */
+                echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>"
+                       id="city">
             </div>
         </div>
         <div class="field region required">
             <label class="label" for="region_id"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
             <div class="control">
-                <select id="region_id" name="region_id" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="validate-select" <?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>>
-                    <option value=""><?php /* @escapeNotVerified */ echo __('Please select a region, state or province.') ?></option>
+                <select id="region_id" name="region_id" title="<?php /* @escapeNotVerified */
+                echo __('State/Province') ?>"
+                        class="validate-select" <?php echo (!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : ''; ?>>
+                    <option value=""><?php /* @escapeNotVerified */
+                        echo __('Please select a region, state or province.') ?></option>
                 </select>
-                <input type="text" id="region" name="region" value="<?php echo $block->escapeHtml($block->getRegion()) ?>"  title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"<?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>/>
+                <input type="text" id="region" name="region"
+                       value="<?php echo $block->escapeHtml($block->getRegion()) ?>"
+                       title="<?php /* @escapeNotVerified */
+                       echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */
+                echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"<?php echo (!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : ''; ?>/>
             </div>
         </div>
         <div class="field zip required">
             <label class="label" for="zip"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" name="postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
+                <input type="text" name="postcode"
+                       value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>"
+                       title="<?php /* @escapeNotVerified */
+                       echo __('Zip/Postal Code') ?>" id="zip"
+                       class="input-text validate-zip-international <?php /* @escapeNotVerified */
+                       echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
             </div>
         </div>
         <div class="field country required">
@@ -100,22 +144,30 @@
         </div>
 
         <?php if ($block->isDefaultBilling()): ?>
-            <div class="message info"><?php /* @escapeNotVerified */ echo __("It's a default billing address.") ?></div>
+            <div class="message info">
+                <span><?php /* @escapeNotVerified */ echo __("It's a default billing address.") ?></span>
+            </div>
         <?php elseif ($block->canSetAsDefaultBilling()): ?>
             <div class="field choice set billing">
                 <input type="checkbox" id="primary_billing" name="default_billing" value="1" class="checkbox">
-                <label class="label" for="primary_billing"><span><?php /* @escapeNotVerified */ echo __('Use as my default billing address') ?></span></label>
+                <label class="label" for="primary_billing">
+                    <span><?php /* @escapeNotVerified */ echo __('Use as my default billing address') ?></span>
+                </label>
             </div>
         <?php else: ?>
             <input type="hidden" name="default_billing" value="1" />
         <?php endif; ?>
 
         <?php if ($block->isDefaultShipping()): ?>
-            <div class="message info"><?php /* @escapeNotVerified */ echo __("It's a default shipping address.") ?></div>
+            <div class="message info">
+                <span><?php /* @escapeNotVerified */ echo __("It's a default shipping address.") ?></span>
+            </div>
         <?php elseif ($block->canSetAsDefaultShipping()): ?>
             <div class="field choice set shipping">
                 <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" class="checkbox">
-                <label class="label" for="primary_shipping"><span><?php /* @escapeNotVerified */ echo __('Use as my default shipping address') ?></span></label>
+                <label class="label" for="primary_shipping">
+                    <span><?php /* @escapeNotVerified */ echo __('Use as my default shipping address') ?></span>
+                </label>
             </div>
         <?php else: ?>
             <input type="hidden" name="default_shipping" value="1">
@@ -123,12 +175,15 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action save primary" data-action="save-address" title="<?php /* @escapeNotVerified */ echo __('Save Address') ?>">
+            <button type="submit" class="action save primary" data-action="save-address"
+                    title="<?php /* @escapeNotVerified */ echo __('Save Address') ?>">
                 <span><?php /* @escapeNotVerified */ echo __('Save Address') ?></span>
             </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('Go back') ?></span></a>
+            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>">
+                <span><?php /* @escapeNotVerified */ echo __('Go back') ?></span>
+            </a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
index c7adc6884c901..c3f7ff5230e5b 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
@@ -7,26 +7,6 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" label="Multishipping Checkout" design_abstraction="custom">
     <body>
-        <referenceBlock name="authentication-popup">
-            <arguments>
-                <argument name="jsLayout" xsi:type="array">
-                    <item name="components" xsi:type="array">
-                        <item name="authenticationPopup" xsi:type="array">
-                            <item name="children" xsi:type="array">
-                                <item name="captcha" xsi:type="array">
-                                    <item name="component" xsi:type="string">Magento_Captcha/js/view/checkout/loginCaptcha</item>
-                                    <item name="displayArea" xsi:type="string">additional-login-form-fields</item>
-                                    <item name="formId" xsi:type="string">user_login</item>
-                                    <item name="configSource" xsi:type="string">authenticationPopup</item>
-                                </item>
-                            </item>
-                        </item>
-                    </item>
-                </argument>
-            </arguments>
-        </referenceBlock>
-        <referenceContainer name="sidebar.main">
-            <block class="Magento\Multishipping\Block\Checkout\State" name="checkout_state" template="checkout/state.phtml" cacheable="false"/>
-        </referenceContainer>
+        <move element="logo" destination="checkout.header.wrapper"/>
     </body>
 </page>

From 9d078069664768fce2863ed3bc2cea4d1813f473 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Mon, 30 May 2016 15:04:41 +0300
Subject: [PATCH 07/31] MAGETWO-53171: Site logo is missing on Multiple Address
 checkout

---
 .../frontend/templates/address/edit.phtml     | 121 ++++++++++--------
 1 file changed, 70 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index d4e9568c88ab4..876ca049d9298 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -14,10 +14,12 @@
  * @var $block \Magento\Customer\Block\Address\Edit
  */
 ?>
-<form class="form-address-edit" action="<?php /* @escapeNotVerified */
-echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data"
-      data-hasrequired="<?php /* @escapeNotVerified */
-      echo __('* Required Fields') ?>">
+<form class="form-address-edit"
+      action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>"
+      method="post"
+      id="form-validate"
+      enctype="multipart/form-data"
+      data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
     <fieldset class="fieldset">
         <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Contact Information') ?></span></legend><br>
         <?php echo $block->getBlockHtml('formkey')?>
@@ -27,30 +29,36 @@ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipar
         <div class="field company">
             <label class="label" for="company"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
             <div class="control">
-                <input type="text" name="company" id="company" title="<?php /* @escapeNotVerified */
-                echo __('Company') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>"
-                       class="input-text <?php /* @escapeNotVerified */
-                       echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
+                <input type="text"
+                       name="company"
+                       id="company"
+                       title="<?php /* @escapeNotVerified */ echo __('Company') ?>"
+                       value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
             </div>
         </div>
         <div class="field telephone required">
-            <label class="label" for="telephone"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
+            <label class="label" for="telephone">
+                <span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span>
+            </label>
             <div class="control">
-                <input type="text" name="telephone"
+                <input type="text"
+                       name="telephone"
                        value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>"
-                       title="<?php /* @escapeNotVerified */
-                       echo __('Phone Number') ?>" class="input-text <?php /* @escapeNotVerified */
-                echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>"
+                       title="<?php /* @escapeNotVerified */ echo __('Phone Number') ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>"
                        id="telephone">
             </div>
         </div>
         <div class="field fax">
             <label class="label" for="fax"><span><?php /* @escapeNotVerified */ echo __('Fax') ?></span></label>
             <div class="control">
-                <input type="text" name="fax" id="fax" title="<?php /* @escapeNotVerified */
-                echo __('Fax') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>"
-                       class="input-text <?php /* @escapeNotVerified */
-                       echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>">
+                <input type="text"
+                       name="fax"
+                       id="fax"
+                       title="<?php /* @escapeNotVerified */ echo __('Fax') ?>"
+                       value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>">
             </div>
         </div>
     </fieldset>
@@ -58,11 +66,16 @@ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipar
         <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Address') ?></span></legend><br>
         <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
         <div class="field street required">
-            <label for="street_1" class="label"><span><?php /* @escapeNotVerified */ echo __('Street Address') ?></span></label>
+            <label for="street_1" class="label">
+                <span><?php /* @escapeNotVerified */ echo __('Street Address') ?></span>
+            </label>
             <div class="control">
-                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine(1)) ?>"
-                       title="<?php /* @escapeNotVerified */
-                       echo __('Street Address') ?>" id="street_1" class="input-text <?php /* @escapeNotVerified */
+                <input type="text"
+                       name="street[]"
+                       value="<?php echo $block->escapeHtml($block->getStreetLine(1)) ?>"
+                       title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>"
+                       id="street_1"
+                       class="input-text <?php /* @escapeNotVerified */
                 echo $_streetValidationClass ?>"/>
                 <div class="nested">
                     <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
@@ -74,11 +87,8 @@ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipar
                             <div class="control">
                                 <input type="text" name="street[]"
                                        value="<?php echo $block->escapeHtml($block->getStreetLine($_i + 1)) ?>"
-                                       title="<?php /* @escapeNotVerified */
-                                       echo __('Street Address %1', $_i + 1) ?>"
-                                       id="street_<?php /* @escapeNotVerified */
-                                       echo $_i + 1 ?>" class="input-text <?php /* @escapeNotVerified */
-                                echo $_streetValidationClass ?>">
+                                       title="<?php /* @escapeNotVerified */ echo __('Street Address %1', $_i + 1) ?>"
+                                       id="street_<?php /* @escapeNotVerified */ echo $_i + 1 ?>" echo $_streetValidationClass ?>">
                             </div>
                         </div>
                     <?php endfor; ?>
@@ -88,13 +98,15 @@ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipar
 
         <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
             <div class="field taxvat">
-                <label class="label" for="vat_id"><span><?php /* @escapeNotVerified */ echo __('VAT Number') ?></span></label>
+                <label class="label" for="vat_id">
+                    <span><?php /* @escapeNotVerified */ echo __('VAT Number') ?></span>
+                </label>
                 <div class="control">
-                    <input type="text" name="vat_id"
+                    <input type="text"
+                           name="vat_id"
                            value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>"
-                           title="<?php /* @escapeNotVerified */
-                           echo __('VAT Number') ?>" class="input-text <?php /* @escapeNotVerified */
-                    echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>"
+                           title="<?php /* @escapeNotVerified */ echo __('VAT Number') ?>"
+                           class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>"
                            id="vat_id">
                 </div>
             </div>
@@ -102,38 +114,43 @@ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipar
         <div class="field city required">
             <label class="label" for="city"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
             <div class="control">
-                <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>"
-                       title="<?php /* @escapeNotVerified */
-                       echo __('City') ?>" class="input-text <?php /* @escapeNotVerified */
-                echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>"
+                <input type="text"
+                       name="city"
+                       value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>"
+                       title="<?php /* @escapeNotVerified */ echo __('City') ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>"
                        id="city">
             </div>
         </div>
         <div class="field region required">
-            <label class="label" for="region_id"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
+            <label class="label" for="region_id">
+                <span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span>
+            </label>
             <div class="control">
-                <select id="region_id" name="region_id" title="<?php /* @escapeNotVerified */
-                echo __('State/Province') ?>"
+                <select id="region_id" name="region_id"
+                        title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>"
                         class="validate-select" <?php echo (!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : ''; ?>>
-                    <option value=""><?php /* @escapeNotVerified */
-                        echo __('Please select a region, state or province.') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('Please select a region, state or province.') ?></option>
                 </select>
-                <input type="text" id="region" name="region"
+                <input type="text"
+                       id="region"
+                       name="region"
                        value="<?php echo $block->escapeHtml($block->getRegion()) ?>"
-                       title="<?php /* @escapeNotVerified */
-                       echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */
-                echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"<?php echo (!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : ''; ?>/>
+                       title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"<?php echo (!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : ''; ?>/>
             </div>
         </div>
         <div class="field zip required">
-            <label class="label" for="zip"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
+            <label class="label" for="zip">
+                <span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span>
+            </label>
             <div class="control">
-                <input type="text" name="postcode"
+                <input type="text"
+                       name="postcode"
                        value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>"
-                       title="<?php /* @escapeNotVerified */
-                       echo __('Zip/Postal Code') ?>" id="zip"
-                       class="input-text validate-zip-international <?php /* @escapeNotVerified */
-                       echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
+                       title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>"
+                       id="zip"
+                       class="input-text validate-zip-international <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
             </div>
         </div>
         <div class="field country required">
@@ -175,7 +192,9 @@ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipar
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action save primary" data-action="save-address"
+            <button type="submit"
+                    class="action save primary"
+                    data-action="save-address"
                     title="<?php /* @escapeNotVerified */ echo __('Save Address') ?>">
                 <span><?php /* @escapeNotVerified */ echo __('Save Address') ?></span>
             </button>

From 4d0e106aee2c3e9b75a5b18535bafa0e38727c50 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Mon, 30 May 2016 16:38:55 +0300
Subject: [PATCH 08/31] MAGETWO-53171: Site logo is missing on Multiple Address
 checkout

---
 .../Magento/Checkout/view/frontend/page_layout/checkout.xml   | 1 +
 .../view/frontend/layout/multishipping_checkout.xml           | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml b/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml
index 9a78a87649f31..f3b42213d4ef1 100644
--- a/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml
+++ b/app/code/Magento/Checkout/view/frontend/page_layout/checkout.xml
@@ -12,4 +12,5 @@
             <container name="checkout.header.wrapper" label="Checkout Page Header" as="checkout_header_wrapper" htmlTag="div" htmlClass="header content"/>
         </container>
     </referenceContainer>
+    <move element="logo" destination="checkout.header.wrapper"/>
 </layout>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
index c3f7ff5230e5b..dff4133c10c97 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout.xml
@@ -6,7 +6,5 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" label="Multishipping Checkout" design_abstraction="custom">
-    <body>
-        <move element="logo" destination="checkout.header.wrapper"/>
-    </body>
+    <body/>
 </page>

From e36994e587df4959e105ecb1a647aa0a479114d1 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Mon, 30 May 2016 17:24:38 +0300
Subject: [PATCH 09/31] MAGETWO-53171: Site logo is missing on Multiple Address
 checkout

---
 .../Checkout/view/frontend/layout/checkout_index_index.xml      | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index c32e7d19d607e..aff3155ccc088 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -406,7 +406,6 @@
                                                                     </item>
                                                                 </item>
                                                             </item>
-
                                                         </item>
                                                     </item>
                                                     <item name="itemsAfter" xsi:type="array">
@@ -443,6 +442,5 @@
             </block>
         </referenceContainer>
         <referenceContainer name="page.messages" remove="true"/>
-        <move element="logo" destination="checkout.header.wrapper"/>
     </body>
 </page>

From ded826fddfb6ba30dbd469612b2339bb6b49ea3c Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Tue, 31 May 2016 10:06:42 +0300
Subject: [PATCH 10/31] MAGETWO-53377: Minicart Subtotal lost its style

---
 .../view/frontend/web/template/minicart/subtotal/totals.html  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal/totals.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal/totals.html
index baca55151c18a..d5e2d95e68638 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal/totals.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal/totals.html
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 -->
-<div class="amount">
-    <span data-bind="html: cart().subtotal"></span>
+<div class="amount price-container">
+    <span class="price-wrapper" data-bind="html: cart().subtotal"></span>
 </div>

From ddbe22a6fef4f769a4d41bd69fd7cb5f510d53b6 Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Tue, 31 May 2016 12:19:40 +0300
Subject: [PATCH 11/31] MAGETWO-53183: Grey stripe is present in Bundle Items
 data-grid. Admin page

---
 .../view/base/web/templates/dynamic-rows/templates/default.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
index b69c6b0de652a..57b7fdaad17ef 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/default.html
@@ -49,7 +49,7 @@
                 </tr>
                 </tbody>
 
-                <tfoot>
+                <tfoot visible="element.addButton || (!!$data.recordData().length && (pages() > 1))">
                     <tr>
                         <td attr="{'colspan': element.getColumnsCount()}">
                             <button if="element.addButton"

From 88fca911f0caf049e828800d1d7b1f6068da988c Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Tue, 31 May 2016 14:42:55 +0300
Subject: [PATCH 12/31] MAGETWO-53318: [GitHub] Actions column broken on
 Notifications grid #4586

---
 .../Magento/AdminNotification/Block/Grid/Renderer/Actions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index a76f43970ac02..322c61b32a534 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
             'Read Details'
-        ) . '</a> | ' : '';
+        ) . '</a>' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',
             ['_current' => true, 'id' => $row->getId()]
         ) . '">' . __(
             'Mark as Read'
-        ) . '</a> | ' : '';
+        ) . '</a>' : '';
 
         $encodedUrl = $this->_urlHelper->getEncodedUrl();
         return sprintf(

From 855aa4acb09fbee6a3bd7ed030c8235d6178295b Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Thu, 2 Jun 2016 14:05:20 +0300
Subject: [PATCH 13/31] MAGETWO-53787: URL Rewrite Fieldset is broken in Admin

---
 app/code/Magento/UrlRewrite/Block/Selector.php |  6 +++---
 .../view/adminhtml/templates/categories.phtml  |  6 +++---
 .../view/adminhtml/templates/selector.phtml    | 12 +++++++-----
 .../Magento/backend/web/css/styles-old.less    | 18 ++++++++++++++----
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index 4bdbee9420582..85ec1ea46e7e3 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -29,8 +29,8 @@ protected function _construct()
     {
         $this->_modes = [
             'id' => __('Custom'),
-            'category' => __('For category'),
-            'product' => __('For product'),
+            'category' => __('For Category'),
+            'product' => __('For Product'),
             'cms_page' => __('For CMS page'),
         ];
     }
@@ -52,7 +52,7 @@ public function getModes()
      */
     public function getSelectorLabel()
     {
-        return __('Create URL Rewrite:');
+        return __('Create URL Rewrite');
     }
 
     /**
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
index 2e2770ed4391b..84a070e2cd25e 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
@@ -8,9 +8,9 @@
 
 /** @var $block \Magento\UrlRewrite\Block\Catalog\Category\Tree */
 ?>
-<fieldset class="fieldset" data-ui-id="category-selector">
-    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Select Category') ?></span></legend>
-    <div class="content" style="clear: both;">
+<fieldset class="admin__fieldset" data-ui-id="category-selector">
+    <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Select Category') ?></span></legend>
+    <div class="content content-category-tree">
         <input type="hidden" name="categories" id="product_categories" value="" />
         <?php if ($block->getRoot()): ?>
         <div data-mage-init="<?php
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
index 490b399d629b1..bdde86bc66647 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
@@ -9,12 +9,14 @@
 /** @var $block \Magento\UrlRewrite\Block\Selector */
 ?>
 <div class="form-inline">
-    <fieldset class="fieldset" data-container-for="entity-type-selector">
-        <div class="field field-entity-type-selector">
-            <label for="entity-type-selector" class="label"><?php /* @escapeNotVerified */ echo $block->getSelectorLabel() ?></label>
-            <div class="control">
+    <fieldset class="admin__fieldset fieldset" data-container-for="entity-type-selector">
+        <div class="admin__field field field-entity-type-selector">
+            <label for="entity-type-selector" class="admin__field-label label">
+                <span><?php /* @escapeNotVerified */ echo $block->getSelectorLabel() ?></span>
+            </label>
+            <div class="admin__field-control control">
                 <?php $url = $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/*/*')?>
-                <select data-role="entity-type-selector" class="select" onchange="window.location = this.value;" id="entity-type-selector">
+                <select data-role="entity-type-selector" class="admin__control-select select" onchange="window.location = this.value;" id="entity-type-selector">
                 <?php foreach ($block->getModes() as $mode => $label): ?>
                     <option <?php echo($block->isMode($mode) ? 'selected="selected" ' : '') ?>value="<?php /* @escapeNotVerified */ echo $url . $mode ?>"><?php /* @escapeNotVerified */ echo $label ?></option>
                 <?php endforeach; ?>
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 7cc131998b768..2bc734168353c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -3867,10 +3867,6 @@
         padding-top: 13px;
     }
 
-    // jstree
-    .jstree-default .disabled > a {
-        color: #a29c94;
-    }
     //
     //  debug.less (end)
     //  --------------------------------------
@@ -4716,6 +4712,20 @@
     }
 }
 
+.content-category-tree {
+    clear: both;
+
+    .jstree-default {
+        margin-bottom: 3rem;
+
+        .disabled {
+            > a {
+                color: #a29c94;
+            }
+        }
+    }
+}
+
 //  Marketing -> Reviews
 .review-product-index {
     .admin__scope-old {

From d7f00194f8cea5aafa55045119c76839c82f16db Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Fri, 3 Jun 2016 13:53:18 +0300
Subject: [PATCH 14/31] MAGETWO-53189: Layout for Review with Rating is broken
 on Review Page

---
 .../web/css/source/module/main/_collapsible-blocks.less     | 1 +
 .../adminhtml/Magento/backend/web/css/source/_extends.less  | 5 +++++
 .../Magento/backend/web/css/source/forms/_fields.less       | 2 +-
 lib/web/css/source/lib/_typography.less                     | 6 ++++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index 47f99dc23bb7f..75ec5874a09c3 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -398,6 +398,7 @@
         }
 
         .label {
+            &:extend(.abs-word-wrap all);
             color: @color-gray19;
             float: none;
             font-size: 14px;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
index 7343d68096622..51fe88cf290b8 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
@@ -129,3 +129,8 @@
     right: 0;
     text-transform: lowercase;
 }
+
+//  Clearfixes
+.abs-word-wrap {
+    .lib-wrap-words();
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index 7dfdba4d9cbdb..b409ba500b9b9 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -192,13 +192,13 @@
     }
 
     .admin__field:not(.admin__field-option) > & {
+        &:extend(.abs-word-wrap all);
         font-family: @font-family__base;
         font-size: @field-label__font-size;
         font-weight: @font-weight__semibold;
         line-height: 3.2rem;
         padding: 0;
         white-space: nowrap;
-        word-wrap: break-word;
 
         &:before {
             .appearing__off();
diff --git a/lib/web/css/source/lib/_typography.less b/lib/web/css/source/lib/_typography.less
index 81c96f72387a7..bb87277b43091 100644
--- a/lib/web/css/source/lib/_typography.less
+++ b/lib/web/css/source/lib/_typography.less
@@ -51,8 +51,11 @@
 }
 
 .lib-wrap-words() {
-    .lib-hyphens();
+    overflow-wrap: break-word;
     word-wrap: break-word;
+    -ms-word-break: break-all;
+    word-break: break-word;
+    .lib-hyphens();
 }
 
 .lib-text-overflow() {
@@ -71,7 +74,6 @@
 
 //  Optional hyphenation
 .lib-hyphens(@mode: auto) {
-    word-wrap: break-word;
     -webkit-hyphens: @mode;
        -moz-hyphens: @mode;
         -ms-hyphens: @mode; // IE10+

From 310bc2a7713842a01b26341247c79e3575fe1391 Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Fri, 3 Jun 2016 13:58:04 +0300
Subject: [PATCH 15/31] MAGETWO-53189: Layout for Review with Rating is broken
 on Review Page

---
 .../adminhtml/Magento/backend/web/css/source/_extends.less      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_extends.less b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
index 51fe88cf290b8..ff973995d7599 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_extends.less
@@ -130,7 +130,7 @@
     text-transform: lowercase;
 }
 
-//  Clearfixes
+//  Word wrap
 .abs-word-wrap {
     .lib-wrap-words();
 }

From 2e43a805c7921da87986e2e4b29e61b8b09927ae Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 6 Jun 2016 16:48:22 +0300
Subject: [PATCH 16/31] MAGETWO-53021: Compare Products page on Storefront is
 broken on iPad (blank, luma)

---
 app/design/frontend/Magento/blank/web/css/source/_layout.less    | 1 +
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_layout.less b/app/design/frontend/Magento/blank/web/css/source/_layout.less
index cfd61a2dad94f..097fb39798b1b 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_layout.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_layout.less
@@ -21,6 +21,7 @@
             .lib-vendor-prefix-flex-basis(100%);
             .lib-vendor-prefix-flex-grow(1);
             .lib-vendor-prefix-order(1);
+            width: 100%;
         }
 
         .sidebar-main {
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
index 29154f4ee9af2..3428761a31437 100644
--- 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
@@ -777,6 +777,7 @@
         clear: both;
         max-width: 100%;
         overflow-x: auto;
+        position: relative; // Needed for Safari(iOS) to properly render "overflow-x" rule.
 
         .table-comparison > tbody > tr {
             > th,

From ccc5861ac6255f87785586b15af242bb0c011cce Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 6 Jun 2016 17:06:38 +0300
Subject: [PATCH 17/31] MAGETWO-53021: Compare Products page on Storefront is
 broken on iPad (blank, luma)

---
 .../web/css/source/_module.less               | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

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
index 3428761a31437..9b51df9908a7e 100644
--- 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
@@ -790,33 +790,20 @@
     .table-comparison {
         table-layout: fixed;
 
-        .cell.label.remove,
-        .cell.label.product {
-            span {
-                &:extend(.abs-visually-hidden all);
-            }
-        }
-
-        .cell.label,
-        td:last-child {
-            border-right: @table__border-width @table__border-style @table__border-color;
-        }
-
         .cell {
             padding: 15px;
             width: 180px;
 
-            .attribute.value {
-                overflow: hidden;
-                width: 100%;
-            }
+            &.label {
+                border-right: @table__border-width @table__border-style @table__border-color;
 
-            &.product.info,
-            &.product.label {
-                border-bottom: @table__border-width @table__border-style @table__border-color;
-            }
+                &.remove,
+                &.product {
+                    span {
+                        &:extend(.abs-visually-hidden all);
+                    }
+                }
 
-            &.label {
                 .attribute.label {
                     display: block;
                     width: 100%;
@@ -824,6 +811,13 @@
                 }
             }
 
+            &.product {
+                &.info,
+                &.label {
+                    border-bottom: @table__border-width @table__border-style @table__border-color;
+                }
+            }
+
             &.attribute {
                 .lib-font-size(13);
 
@@ -843,6 +837,15 @@
                     margin-right: .6rem;
                 }
             }
+
+            .attribute.value {
+                overflow: hidden;
+                width: 100%;
+            }
+        }
+
+        td:last-child {
+            border-right: @table__border-width @table__border-style @table__border-color;
         }
 
         .product-item-photo {
@@ -865,13 +868,15 @@
         .product-addto-links {
             margin-top: 15px;
 
-            .action.split,
-            .action.toggle {
-                .lib-button-s();
-            }
+            .action {
+                &.toggle {
+                    padding: 0;
+                }
 
-            .action.toggle {
-                padding: 0;
+                &.split,
+                &.toggle {
+                    .lib-button-s();
+                }
             }
         }
 

From 9ce8887407ddd5aa46c09c3570c236c4383d59a6 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Tue, 7 Jun 2016 10:33:50 +0300
Subject: [PATCH 18/31] MAGETWO-53944: Update dropdown documentation

---
 lib/web/css/docs/dropdowns.html         | 24 ++++++++++++------------
 lib/web/css/docs/source/_dropdowns.less | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/web/css/docs/dropdowns.html b/lib/web/css/docs/dropdowns.html
index 026b52a6919a8..17cf814d8920c 100644
--- a/lib/web/css/docs/dropdowns.html
+++ b/lib/web/css/docs/dropdowns.html
@@ -13,7 +13,7 @@
 <h2 id="button-tag-dropdown-toggle">Button tag drop-down toggle</h2>
 <p>  To implement a drop-down using a button + drop-down, use the following markup:</p>
 <textarea class="preview-code" spellcheck="false">  &lt;div class="actions dropdown example-dropdown-1"&gt;
-     &lt;button class="action toggle" data-toggle="dropdown" aria-haspopup="true"&gt;
+     &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
          &lt;span&gt;button + dropdown&lt;/span&gt;
      &lt;/button&gt;
      &lt;ul class="dropdown"&gt;
@@ -30,7 +30,7 @@ <h2 id="button-tag-dropdown-toggle">Button tag drop-down toggle</h2>
   &lt;/div&gt;</textarea><h2 id="span-tag-dropdown-toggle">Span tag drop-down toggle</h2>
 <p>  To implement a drop-down using a span + drop-down, use the following markup:</p>
 <textarea class="preview-code" spellcheck="false">  &lt;div class="example-dropdown-2"&gt;
-     &lt;span class="action toggle" data-toggle="dropdown" aria-haspopup="true"&gt;
+     &lt;span class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
          &lt;span&gt;span + dropdown&lt;/span&gt;
      &lt;/span&gt;
      &lt;ul class="dropdown"&gt;
@@ -328,7 +328,7 @@ <h2 id="button-tag-dropdown-toggle">Button tag drop-down toggle</h2>
   @_dropdown-toggle-active-icon-content: @icon-collapse</code></pre>
 <p>  The <code>.lib-dropdown()</code> mixin uses the <code>.icon-font()</code> mixin to display and customize toggle icon. More information about <code>.icon-font()</code> mixin parameters you can find at the <strong>Icons</strong> page</p>
 <textarea class="preview-code" spellcheck="false">  &lt;div class="actions dropdown example-dropdown-3"&gt;
-     &lt;span class="action toggle" data-toggle="dropdown" aria-haspopup="true"&gt;
+     &lt;span class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
          &lt;span&gt;span + dropdown&lt;/span&gt;
      &lt;/span&gt;
      &lt;ul class="dropdown"&gt;
@@ -355,7 +355,7 @@ <h2 id="button-tag-dropdown-toggle">Button tag drop-down toggle</h2>
 }</code></pre></div></article><article id="modify-dropdown-list-styles" class="section"><div class="docs"><a href="#modify-dropdown-list-styles" class="permalink"><svg viewBox="0 0 512 512" height="32" width="32" class="icon"><path d="M156.2,199.7c7.5-7.5,15.9-13.8,24.8-18.7c49.6-27.3,113.1-12.8,145,35.5l-38.5,38.5c-11.1-25.2-38.5-39.6-65.8-33.5c-10.3,2.3-20.1,7.4-28,15.4l-73.9,73.9c-22.4,22.4-22.4,58.9,0,81.4c22.4,22.4,58.9,22.4,81.4,0l22.8-22.8c20.7,8.2,42.9,11.5,64.9,9.9l-50.3,50.3c-43.1,43.1-113,43.1-156.1,0c-43.1-43.1-43.1-113-0-156.1L156.2,199.7z M273.6,82.3l-50.3,50.3c21.9-1.6,44.2,1.6,64.9,9.9l22.8-22.8c22.4-22.4,58.9-22.4,81.4,0c22.4,22.4,22.4,58.9,0,81.4l-73.9,73.9c-22.5,22.5-59.1,22.3-81.4,0c-5.2-5.2-9.7-11.7-12.5-18l-38.5,38.5c4,6.1,8.3,11.5,13.7,16.9c13.9,13.9,31.7,24.3,52.1,29.3c26.5,6.4,54.8,2.8,79.2-10.6c8.9-4.9,17.3-11.1,24.8-18.7l73.9-73.9c43.1-43.1,43.1-113,0-156.1C386.6,39.2,316.7,39.2,273.6,82.3z"></path></svg></a><h1 id="modify-dropdown-list-styles">Modify dropdown list styles</h1>
 <p>  You can customize dropdown list style</p>
 <textarea class="preview-code" spellcheck="false"> &lt;div class="actions dropdown example-dropdown-5"&gt;
-    &lt;span class="action toggle" data-toggle="dropdown" aria-haspopup="true"&gt;
+    &lt;span class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
         &lt;span&gt;span + dropdown&lt;/span&gt;
     &lt;/span&gt;
     &lt;ul class="dropdown"&gt;
@@ -385,10 +385,10 @@ <h2 id="button-tag-dropdown-toggle">Button tag drop-down toggle</h2>
 <p>  Split button can be formed of two buttons or a link and a button. The first element (link or button) must have <code>class=&quot;action split&quot;</code>, the toggle element must have <code>class=&quot;action toggle&quot;</code>.</p>
 <h2 id="split-button-buttonbutton">Split button: button+button</h2>
 <textarea class="preview-code" spellcheck="false">  &lt;div class="actions split example-dropdown-6"&gt;
-     &lt;button href="#" class="action split"&gt;
+     &lt;button class="action split"&gt;
          &lt;span&gt;Spit button&lt;/span&gt;
      &lt;/button&gt;
-     &lt;button data-toggle="dropdown" class="action toggle" aria-haspopup="true"&gt;
+     &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
          &lt;span&gt;Select&lt;/span&gt;
      &lt;/button&gt;
      &lt;ul class="dropdown"&gt;
@@ -407,7 +407,7 @@ <h2 id="split-button-buttonbutton">Split button: button+button</h2>
       &lt;a href="#" class="action split"&gt;
           &lt;span&gt;Spit button&lt;/span&gt;
       &lt;/a&gt;
-      &lt;button data-toggle="dropdown" class="action toggle" aria-haspopup="true"&gt;
+      &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
           &lt;span&gt;Select&lt;/span&gt;
       &lt;/button&gt;
       &lt;ul class="dropdown"&gt;
@@ -742,7 +742,7 @@ <h2 id="split-button-buttonbutton">Split button: button+button</h2>
     &lt;button class="action split"&gt;
         &lt;span&gt;Spit button&lt;/span&gt;
     &lt;/button&gt;
-    &lt;button data-toggle="dropdown" class="action toggle" aria-haspopup="true"&gt;
+    &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
         &lt;span&gt;Select&lt;/span&gt;
     &lt;/button&gt;
     &lt;ul class="dropdown"&gt;
@@ -761,7 +761,7 @@ <h2 id="split-button-buttonbutton">Split button: button+button</h2>
     &lt;button class="action split"&gt;
         &lt;span&gt;Spit button&lt;/span&gt;
     &lt;/button&gt;
-    &lt;button data-toggle="dropdown" class="action toggle" aria-haspopup="true"&gt;
+    &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
         &lt;span&gt;Select&lt;/span&gt;
     &lt;/button&gt;
     &lt;ul class="dropdown"&gt;
@@ -780,7 +780,7 @@ <h2 id="split-button-buttonbutton">Split button: button+button</h2>
     &lt;button class="action split"&gt;
         &lt;span&gt;Spit button&lt;/span&gt;
     &lt;/button&gt;
-    &lt;button data-toggle="dropdown" class="action toggle" aria-haspopup="true"&gt;
+    &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
         &lt;span&gt;Select&lt;/span&gt;
     &lt;/button&gt;
     &lt;ul class="dropdown"&gt;
@@ -819,7 +819,7 @@ <h2 id="split-button-buttonbutton">Split button: button+button</h2>
      &lt;button class="action split"&gt;
          &lt;span&gt;Spit button&lt;/span&gt;
      &lt;/button&gt;
-     &lt;button data-toggle="dropdown" class="action toggle" aria-haspopup="true"&gt;
+     &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
          &lt;span&gt;Select&lt;/span&gt;
      &lt;/button&gt;
      &lt;ul class="dropdown"&gt;
@@ -850,7 +850,7 @@ <h2 id="split-button-buttonbutton">Split button: button+button</h2>
      &lt;button class="action split"&gt;
          &lt;span&gt;Spit button&lt;/span&gt;
      &lt;/button&gt;
-     &lt;button data-toggle="dropdown" class="action toggle" aria-haspopup="true"&gt;
+     &lt;button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true"&gt;
          &lt;span&gt;Select&lt;/span&gt;
      &lt;/button&gt;
      &lt;ul class="dropdown"&gt;
diff --git a/lib/web/css/docs/source/_dropdowns.less b/lib/web/css/docs/source/_dropdowns.less
index d6fb2a81c2803..db7414227622e 100644
--- a/lib/web/css/docs/source/_dropdowns.less
+++ b/lib/web/css/docs/source/_dropdowns.less
@@ -17,7 +17,7 @@
 //
 //  ```html
 //  <div class="actions dropdown example-dropdown-1">
-//     <button class="action toggle" data-toggle="dropdown" aria-haspopup="true">
+//     <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //         <span>button + dropdown</span>
 //     </button>
 //     <ul class="dropdown">
@@ -44,7 +44,7 @@
 //
 //  ```html
 //  <div class="example-dropdown-2">
-//     <span class="action toggle" data-toggle="dropdown" aria-haspopup="true">
+//     <span class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //         <span>span + dropdown</span>
 //     </span>
 //     <ul class="dropdown">
@@ -347,7 +347,7 @@
 //
 //  ```html
 //  <div class="actions dropdown example-dropdown-3">
-//     <span class="action toggle" data-toggle="dropdown" aria-haspopup="true">
+//     <span class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //         <span>span + dropdown</span>
 //     </span>
 //     <ul class="dropdown">
@@ -381,7 +381,7 @@
 //
 //  ```html
 // <div class="actions dropdown example-dropdown-5">
-//    <span class="action toggle" data-toggle="dropdown" aria-haspopup="true">
+//    <span class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //        <span>span + dropdown</span>
 //    </span>
 //    <ul class="dropdown">
@@ -419,10 +419,10 @@
 //
 //  ```html
 //  <div class="actions split example-dropdown-6">
-//     <button href="#" class="action split">
+//     <button class="action split">
 //         <span>Spit button</span>
 //     </button>
-//     <button data-toggle="dropdown" class="action toggle" aria-haspopup="true">
+//     <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //         <span>Select</span>
 //     </button>
 //     <ul class="dropdown">
@@ -446,7 +446,7 @@
 //      <a href="#" class="action split">
 //          <span>Spit button</span>
 //      </a>
-//      <button data-toggle="dropdown" class="action toggle" aria-haspopup="true">
+//      <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //          <span>Select</span>
 //      </button>
 //      <ul class="dropdown">
@@ -791,7 +791,7 @@
 //    <button class="action split">
 //        <span>Spit button</span>
 //    </button>
-//    <button data-toggle="dropdown" class="action toggle" aria-haspopup="true">
+//    <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //        <span>Select</span>
 //    </button>
 //    <ul class="dropdown">
@@ -815,7 +815,7 @@
 //    <button class="action split">
 //        <span>Spit button</span>
 //    </button>
-//    <button data-toggle="dropdown" class="action toggle" aria-haspopup="true">
+//    <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //        <span>Select</span>
 //    </button>
 //    <ul class="dropdown">
@@ -839,7 +839,7 @@
 //    <button class="action split">
 //        <span>Spit button</span>
 //    </button>
-//    <button data-toggle="dropdown" class="action toggle" aria-haspopup="true">
+//    <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //        <span>Select</span>
 //    </button>
 //    <ul class="dropdown">
@@ -885,7 +885,7 @@
 //     <button class="action split">
 //         <span>Spit button</span>
 //     </button>
-//     <button data-toggle="dropdown" class="action toggle" aria-haspopup="true">
+//     <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //         <span>Select</span>
 //     </button>
 //     <ul class="dropdown">
@@ -923,7 +923,7 @@
 //     <button class="action split">
 //         <span>Spit button</span>
 //     </button>
-//     <button data-toggle="dropdown" class="action toggle" aria-haspopup="true">
+//     <button class="action toggle" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" aria-haspopup="true">
 //         <span>Select</span>
 //     </button>
 //     <ul class="dropdown">

From 2530abdf88536bbcc588c371d82426d5c8f21f6e Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Tue, 7 Jun 2016 11:19:56 +0300
Subject: [PATCH 19/31] MAGETWO-53021: Compare Products page on Storefront is
 broken on iPad (blank, luma)

---
 .../luma/Magento_Catalog/web/css/source/_module.less        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
index 9b51df9908a7e..9dcf8e43e0edb 100644
--- 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
@@ -844,8 +844,10 @@
             }
         }
 
-        td:last-child {
-            border-right: @table__border-width @table__border-style @table__border-color;
+        td {
+            &:last-child {
+                border-right: @table__border-width @table__border-style @table__border-color;
+            }
         }
 
         .product-item-photo {

From e0455728f0af5e8b2b2963baedaec91e784fa8ad Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Thu, 9 Jun 2016 12:59:07 +0300
Subject: [PATCH 20/31] MAGETWO-54102: Remove unnecessary scope label
 initialize on product page in Admin

---
 .../Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index ca2d2e59aa238..db02b67044ac9 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -308,9 +308,7 @@ public function addContainerChildren(
             ltrim(static::META_CONFIG_PATH, ArrayManager::DEFAULT_PATH_DELIMITER),
             $attributeContainer,
             [
-                'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER,
-                // TODO: Eliminate this in scope of MAGETWO-51364
-                'scopeLabel' => $this->getScopeLabel($attribute),
+                'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER
             ]
         );
 

From 2ab0879c1cc0a8428758418d48746f4b2cf0a637 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 9 Jun 2016 18:00:20 +0300
Subject: [PATCH 21/31] MAGETWO-54009: Hierarchy page elements look broken

---
 .../module/pages/_cache-management.less       | 17 -----
 .../web/css/source/module/_data-grid.less     | 63 +++++++++++++++----
 2 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_cache-management.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_cache-management.less
index 79de59c51ab22..f6caf3f87f475 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_cache-management.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_cache-management.less
@@ -90,20 +90,3 @@
         margin: 5px 0 6px;
     }
 }
-
-.adminhtml-cache-index {
-    .data-grid-checkbox-cell {
-        &.col-select.col-massaction {
-            cursor: pointer;
-        }
-    }
-
-    .data-grid-checkbox-cell-inner {
-        margin: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
-        padding: 0;
-
-        &:before {
-            content: none;
-        }
-    }
-}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index 3364bd5b5ce5e..f14763973c480 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -783,22 +783,11 @@ body._in-resize {
 .data-grid-checkbox-cell-inner {
     display: block;
     padding: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
-    position: relative;
     text-align: right;
 
     &:hover {
         cursor: pointer;
     }
-
-    &:before {
-        bottom: 0;
-        content: '';
-        height: 500%;
-        left: 0;
-        position: absolute;
-        right: 0;
-        top: 0;
-    }
 }
 
 //  State actions column
@@ -1012,3 +1001,55 @@ body._in-resize {
         }
     }
 }
+
+//  Fix for not hole column area is clickable in data-grid.
+//  Aim to expand clickable area for new data-grids.
+.admin__data-grid-outer-wrap {
+    .data-grid-checkbox-cell {
+        overflow: hidden;
+    }
+
+    .data-grid-checkbox-cell-inner {
+        position: relative;
+
+        &:before {
+            bottom: 0;
+            content: '';
+            height: 500%;
+            left: 0;
+            position: absolute;
+            right: 0;
+            top: 0;
+        }
+    }
+}
+
+//  And to shrink clickable area for old data-grid.
+.admin__data-grid-wrap-static {
+    .data-grid-checkbox-cell {
+        &:hover {
+            cursor: pointer;
+        }
+    }
+
+    .data-grid-checkbox-cell-inner {
+        margin: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
+        padding: 0;
+    }
+
+    //  Content Hierarchy specific
+    .adminhtml-cms-hierarchy-index & {
+        .data-grid-actions-cell:first-child {
+            padding: 0;
+        }
+    }
+
+    //  System Export specific
+    .adminhtml-export-index & {
+        .data-grid-checkbox-cell-inner {
+            padding: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal 1.9rem;
+            margin: 0;
+        }
+    }
+}
+//  fix end

From 2464feeb413f5d786c2c1f8373bf6da57f76be46 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 9 Jun 2016 18:02:29 +0300
Subject: [PATCH 22/31] MAGETWO-54009: Hierarchy page elements look broken

---
 .../backend/Magento_Ui/web/css/source/module/_data-grid.less    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index f14763973c480..d13d6291ba0df 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -1047,8 +1047,8 @@ body._in-resize {
     //  System Export specific
     .adminhtml-export-index & {
         .data-grid-checkbox-cell-inner {
-            padding: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal 1.9rem;
             margin: 0;
+            padding: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal 1.9rem;
         }
     }
 }

From 98d7a23a439f5f3f2645c44ed393121f10456634 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Fri, 10 Jun 2016 11:57:23 +0300
Subject: [PATCH 23/31] MAGETWO-54009: Hierarchy page elements look broken

---
 .../Magento_Ui/web/css/source/module/_data-grid.less        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
index d13d6291ba0df..7148ed87437ad 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -1002,8 +1002,8 @@ body._in-resize {
     }
 }
 
-//  Fix for not hole column area is clickable in data-grid.
-//  Aim to expand clickable area for new data-grids.
+//  Fix for Not whole column area is clickable in data-grid.
+//  Purpose to expand clickable area for new data-grids.
 .admin__data-grid-outer-wrap {
     .data-grid-checkbox-cell {
         overflow: hidden;
@@ -1052,4 +1052,4 @@ body._in-resize {
         }
     }
 }
-//  fix end
+//  End Fix for Not whole column area is clickable in data-grid.

From bf6cc212fdd74a42bc615de3f1e6c478a024cb4e Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 13 Jun 2016 17:24:04 +0300
Subject: [PATCH 24/31] MAGETWO-54195: Broken design with date javascript
 calendar on product page

---
 .../web/css/source/_module.less               | 164 ++++++++--------
 .../web/css/source/_module.less               | 177 +++++++++---------
 2 files changed, 174 insertions(+), 167 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index fb63bdb4c5b4a..ad1deb028d48b 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -84,50 +84,46 @@
         &:extend(.abs-product-link all);
     }
 
-    .category {
-        &-image {
-            .image {
-                display: block;
-                height: auto;
-                max-width: 100%;
-            }
+    .category-image {
+        .image {
+            display: block;
+            height: auto;
+            max-width: 100%;
         }
+    }
 
-        &-image,
-        &-description {
-            margin-bottom: @indent__base;
-        }
+    .category-image,
+    .category-description {
+        margin-bottom: @indent__base;
     }
 
     //
     //  Product images general container
     //  ---------------------------------------------
 
-    .product-image {
-        &-container {
-            display: inline-block;
-            max-width: 100%;
-        }
+    .product-image-container {
+        display: inline-block;
+        max-width: 100%;
+    }
 
-        &-wrapper {
-            display: block;
-            height: 0;
-            overflow: hidden;
-            position: relative;
-            z-index: 1;
-        }
+    .product-image-wrapper {
+        display: block;
+        height: 0;
+        overflow: hidden;
+        position: relative;
+        z-index: 1;
+    }
 
-        &-photo {
-            bottom: 0;
-            display: block;
-            height: auto;
-            left: 0;
-            margin: auto;
-            max-width: 100%;
-            position: absolute;
-            right: 0;
-            top: 0;
-        }
+    .product-image-photo {
+        bottom: 0;
+        display: block;
+        height: auto;
+        left: 0;
+        margin: auto;
+        max-width: 100%;
+        position: absolute;
+        right: 0;
+        top: 0;
     }
 
     //
@@ -398,30 +394,30 @@
             .product-item {
                 margin-bottom: @indent__base;
                 position: relative;
+            }
 
-                &-info {
-                    position: relative;
-                    width: auto;
+            .product-item-info {
+                position: relative;
+                width: auto;
 
-                    .product-item-photo {
-                        left: 0;
-                        position: absolute;
-                        top: 0;
-                    }
+                .product-item-photo {
+                    left: 0;
+                    position: absolute;
+                    top: 0;
                 }
+            }
 
-                &-name {
-                    margin-top: 0;
-                }
+            .product-item-name {
+                margin-top: 0;
+            }
 
-                &-details {
-                    margin: 0 0 0 85px;
-                }
+            .product-item-details {
+                margin: 0 0 0 85px;
+            }
 
-                &-actions {
-                    display: block;
-                    margin-top: @indent__s;
-                }
+            .product-item-actions {
+                display: block;
+                margin-top: @indent__s;
             }
 
             .price-box {
@@ -568,30 +564,42 @@
 
     .sidebar {
         .product-items {
-            .product-item {
-                &-info {
-                    .product-item-photo {
-                        float: left;
-                        left: auto;
-                        margin: 0 @indent__s @indent__s 0;
-                        position: relative;
-                        top: auto;
-                    }
+            .product-item-info {
+                .product-item-photo {
+                    float: left;
+                    left: auto;
+                    margin: 0 @indent__s @indent__s 0;
+                    position: relative;
+                    top: auto;
                 }
+            }
 
-                &-details {
-                    margin: 0;
-                }
+            .product-item-details {
+                margin: 0;
+            }
 
-                &-actions {
-                    clear: left;
-                }
+            .product-item-actions {
+                clear: left;
             }
         }
     }
 
     .product-add-form {
         &:extend(.abs-revert-field-type-desktop all);
+
+        .product-options-wrapper {
+            .field {
+                .control {
+
+                    //  Date & Time custom option (Affect Time that goes only after Date)
+                    input.datetime-picker {
+                        ~ select.datetime-picker {
+                            margin-top: @indent__s;
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 
@@ -602,20 +610,18 @@
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__xl) {
     .sidebar {
         .product-items {
-            .product-item {
-                &-info {
-                    .product-item-photo {
-                        float: none;
-                        left: 0;
-                        margin: 0;
-                        position: absolute;
-                        top: 0;
-                    }
+            .product-item-info {
+                .product-item-photo {
+                    float: none;
+                    left: 0;
+                    margin: 0;
+                    position: absolute;
+                    top: 0;
                 }
+            }
 
-                &-details {
-                    margin-left: 85px;
-                }
+            .product-item-details {
+                margin-left: 85px;
             }
         }
     }
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
index 29154f4ee9af2..f1c83ef5bffb8 100644
--- 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
@@ -63,51 +63,47 @@
         }
     }
 
-    .category {
-        &-image {
-            .image {
-                display: block;
-                height: auto;
-                max-width: 100%;
-            }
+    .category-image {
+        .image {
+            display: block;
+            height: auto;
+            max-width: 100%;
         }
+    }
 
-        &-cms,
-        &-image,
-        &-description {
-            margin-bottom: @indent__base;
-        }
+    .category-cms,
+    .category-image,
+    .category-description {
+        margin-bottom: @indent__base;
     }
 
     //
     //  Product images general container
     //  -----------------------------------------
 
-    .product-image {
-        &-container {
-            display: inline-block;
-            max-width: 100%;
-        }
+    .product-image-container {
+        display: inline-block;
+        max-width: 100%;
+    }
 
-        &-wrapper {
-            display: block;
-            height: 0;
-            overflow: hidden;
-            position: relative;
-            z-index: 1;
-        }
+    .product-image-wrapper {
+        display: block;
+        height: 0;
+        overflow: hidden;
+        position: relative;
+        z-index: 1;
+    }
 
-        &-photo {
-            bottom: 0;
-            display: block;
-            height: auto;
-            left: 0;
-            margin: auto;
-            max-width: 100%;
-            position: absolute;
-            right: 0;
-            top: 0;
-        }
+    .product-image-photo {
+        bottom: 0;
+        display: block;
+        height: auto;
+        left: 0;
+        margin: auto;
+        max-width: 100%;
+        position: absolute;
+        right: 0;
+        top: 0;
     }
 
     //
@@ -254,11 +250,6 @@
         }
 
         .product {
-            &-add-form {
-                clear: both;
-                padding-top: @indent__s + @indent__xs;
-            }
-
             &.attribute {
                 &.sku {
                     .type {
@@ -285,6 +276,11 @@
             }
         }
 
+        .product-add-form {
+            clear: both;
+            padding-top: @indent__s + @indent__xs;
+        }
+
         .product-reviews-summary {
             float: left;
         }
@@ -463,30 +459,30 @@
             .product-item {
                 margin-bottom: @indent__base;
                 position: relative;
+            }
 
-                &-info {
-                    position: relative;
-                    width: auto;
+            .product-item-info {
+                position: relative;
+                width: auto;
 
-                    .product-item-photo {
-                        left: 0;
-                        position: absolute;
-                        top: 0;
-                    }
+                .product-item-photo {
+                    left: 0;
+                    position: absolute;
+                    top: 0;
                 }
+            }
 
-                &-name {
-                    margin-top: 0;
-                }
+            .product-item-name {
+                margin-top: 0;
+            }
 
-                &-details {
-                    margin: 0 0 0 85px;
-                }
+            .product-item-details {
+                margin: 0 0 0 85px;
+            }
 
-                &-actions {
-                    display: block;
-                    margin-top: @indent__s;
-                }
+            .product-item-actions {
+                display: block;
+                margin-top: @indent__s;
             }
 
             .price-box {
@@ -698,33 +694,40 @@
     }
 
     .product-add-form {
-        .product-options-wrapper .field:not(.date) {
-            > .control {
-                width: 80%;
+        .product-options-wrapper {
+            .field {
+                .control {
+                    width: 80%;
+
+                    //  Date & Time custom option (Affect Time that goes only after Date)
+                    input.datetime-picker {
+                        ~ select.datetime-picker {
+                            margin-top: @indent__s;
+                        }
+                    }
+                }
             }
         }
     }
 
     .sidebar {
         .product-items {
-            .product-item {
-                &-info {
-                    .product-item-photo {
-                        float: left;
-                        left: auto;
-                        margin: 0 @indent__s @indent__s 0;
-                        position: relative;
-                        top: auto;
-                    }
+            .product-item-info {
+                .product-item-photo {
+                    float: left;
+                    left: auto;
+                    margin: 0 @indent__s @indent__s 0;
+                    position: relative;
+                    top: auto;
                 }
+            }
 
-                &-details {
-                    margin: 0;
-                }
+            .product-item-details {
+                margin: 0;
+            }
 
-                &-actions {
-                    clear: left;
-                }
+            .product-item-actions {
+                clear: left;
             }
         }
     }
@@ -737,20 +740,18 @@
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__xl) {
     .sidebar {
         .product-items {
-            .product-item {
-                &-info {
-                    .product-item-photo {
-                        float: none;
-                        left: 0;
-                        margin: 0;
-                        position: absolute;
-                        top: 0;
-                    }
+            .product-item-info {
+                .product-item-photo {
+                    float: none;
+                    left: 0;
+                    margin: 0;
+                    position: absolute;
+                    top: 0;
                 }
+            }
 
-                &-details {
-                    margin-left: 85px;
-                }
+            .product-item-details {
+                margin-left: 85px;
             }
         }
     }

From 240d04ff85294b5328eac8bdb805630e5c7bed86 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 13 Jun 2016 17:35:39 +0300
Subject: [PATCH 25/31] MAGETWO-54195: Broken design with date javascript
 calendar on product page

---
 .../Magento/blank/Magento_Catalog/web/css/source/_module.less    | 1 -
 .../Magento/luma/Magento_Catalog/web/css/source/_module.less     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index ad1deb028d48b..e1816037ef36f 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -590,7 +590,6 @@
         .product-options-wrapper {
             .field {
                 .control {
-
                     //  Date & Time custom option (Affect Time that goes only after Date)
                     input.datetime-picker {
                         ~ select.datetime-picker {
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
index f1c83ef5bffb8..e9302dbb6fa33 100644
--- 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
@@ -698,7 +698,6 @@
             .field {
                 .control {
                     width: 80%;
-
                     //  Date & Time custom option (Affect Time that goes only after Date)
                     input.datetime-picker {
                         ~ select.datetime-picker {

From b68438065091738adfa09a1c232f545da70bc838 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 13 Jun 2016 17:55:01 +0300
Subject: [PATCH 26/31] MAGETWO-54195: Broken design with date javascript
 calendar on product page

---
 .../web/css/source/_module.less               | 20 +++++++------------
 .../web/css/source/_module.less               | 13 ++++++------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
index e1816037ef36f..95de500a8c3d3 100644
--- a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -242,6 +242,13 @@
                 padding: 0;
             }
 
+            //  Date & Time custom option (Affect Time that goes only after Date)
+            input.datetime-picker {
+                ~ select.datetime-picker {
+                    margin-top: @indent__s;
+                }
+            }
+
             &.required,
             &._required {
                 .legend {
@@ -586,19 +593,6 @@
 
     .product-add-form {
         &:extend(.abs-revert-field-type-desktop all);
-
-        .product-options-wrapper {
-            .field {
-                .control {
-                    //  Date & Time custom option (Affect Time that goes only after Date)
-                    input.datetime-picker {
-                        ~ select.datetime-picker {
-                            margin-top: @indent__s;
-                        }
-                    }
-                }
-            }
-        }
     }
 }
 
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
index e9302dbb6fa33..06dd45dab5290 100644
--- 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
@@ -304,6 +304,13 @@
                 padding: 0;
             }
 
+            //  Date & Time custom option (Affect Time that goes only after Date)
+            input.datetime-picker {
+                ~ select.datetime-picker {
+                    margin-top: @indent__s;
+                }
+            }
+
             &.required,
             &._required {
                 .legend {
@@ -698,12 +705,6 @@
             .field {
                 .control {
                     width: 80%;
-                    //  Date & Time custom option (Affect Time that goes only after Date)
-                    input.datetime-picker {
-                        ~ select.datetime-picker {
-                            margin-top: @indent__s;
-                        }
-                    }
                 }
             }
         }

From 1e71155e4cb49900922746568d1ee5f49f9dd283 Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Mon, 13 Jun 2016 18:28:45 +0300
Subject: [PATCH 27/31] MAGETWO-54258: Bouncing columns in shopping cart

---
 .../blank/Magento_GiftMessage/web/css/source/_module.less     | 4 ++--
 .../luma/Magento_GiftMessage/web/css/source/_module.less      | 4 ++--
 .../luma/Magento_GiftWrapping/web/css/source/_module.less     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less
index df5ef7caaefc4..450de45c9152e 100644
--- a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less
@@ -62,6 +62,7 @@
 
     .cart.table-wrapper {
         .gift-content {
+            box-sizing: border-box;
             clear: left;
             display: none;
             float: left;
@@ -70,8 +71,7 @@
             width: 100%;
 
             &._active {
-                display: table;
-                table-layout: fixed;
+                display: block;
             }
         }
 
diff --git a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
index a5d697e2e2c60..0b00a22ce92c2 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less
@@ -115,6 +115,7 @@
 
     .cart.table-wrapper {
         .gift-content {
+            box-sizing: border-box;
             clear: left;
             display: none;
             float: left;
@@ -123,8 +124,7 @@
             width: 100%;
 
             &._active {
-                display: table;
-                table-layout: fixed;
+                display: block;
             }
         }
     }
diff --git a/app/design/frontend/Magento/luma/Magento_GiftWrapping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftWrapping/web/css/source/_module.less
index 7e198fbaec189..f751f491a6d47 100644
--- a/app/design/frontend/Magento/luma/Magento_GiftWrapping/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_GiftWrapping/web/css/source/_module.less
@@ -201,6 +201,7 @@
 
     .gift-options-cart-item {
         float: left;
+        width: 100%;
     }
 
     .gift-wrapping-preview {

From f5563a8cbfa0f43329e80cbbb9b03983ea077dfc Mon Sep 17 00:00:00 2001
From: Olga Lytvynenko <olytvynenko@magento.com>
Date: Fri, 17 Jun 2016 13:10:49 +0300
Subject: [PATCH 28/31] MAGETWO-54161: Customer Password Strength Accessibility
 issues

---
 .../Magento/Customer/view/frontend/templates/form/edit.phtml  | 4 ++--
 .../Customer/view/frontend/templates/form/register.phtml      | 4 ++--
 .../view/frontend/templates/form/resetforgottenpassword.phtml | 2 +-
 .../blank/Magento_Customer/web/css/source/_module.less        | 1 +
 .../Magento/luma/Magento_Customer/web/css/source/_module.less | 1 +
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index 0f1a0221f38e7..669cba366f265 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -59,10 +59,10 @@
                     data-input="new-password"
                     data-validate="{required:true, 'validate-customer-password':true}"
                     autocomplete="off" />
-                <div id="password-strength-meter-container" data-role="password-strength-meter" >
+                <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
                         <?php /* @escapeNotVerified */ echo __('Password Strength'); ?>:
-                        <span id="password-strength-meter-label" data-role="password-strength-meter-label" >
+                        <span id="password-strength-meter-label" data-role="password-strength-meter-label">
                             <?php /* @escapeNotVerified */ echo __('No Password'); ?>
                         </span>
                     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 37eb5ecce4bcb..264a3acefd948 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -146,10 +146,10 @@
                        data-password-min-character-sets="<?php echo $block->escapeHtml($block->getRequiredCharacterClassesNumber()) ?>"
                        data-validate="{required:true, 'validate-customer-password':true}"
                        autocomplete="off">
-                <div id="password-strength-meter-container" data-role="password-strength-meter" >
+                <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
                         <?php /* @escapeNotVerified */ echo __('Password Strength'); ?>:
-                        <span id="password-strength-meter-label" data-role="password-strength-meter-label" >
+                        <span id="password-strength-meter-label" data-role="password-strength-meter-label">
                             <?php /* @escapeNotVerified */ echo __('No Password'); ?>
                         </span>
                     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
index 0ea81786b06ed..6fba6dfd9f9f2 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -23,7 +23,7 @@
                        data-password-min-character-sets="<?php echo $block->escapeHtml($block->getRequiredCharacterClassesNumber()) ?>"
                        data-validate="{required:true, 'validate-customer-password':true}"
                        autocomplete="off">
-                <div id="password-strength-meter-container" data-role="password-strength-meter">
+                <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
                         <?php /* @escapeNotVerified */ echo __('Password Strength'); ?>:
                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
index 996ff90e45e90..9672c4ce214dc 100644
--- a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -250,6 +250,7 @@
 
             .input-text {
                 .lib-vendor-prefix-order(0);
+                z-index: 2;
             }
         }
     }
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index de8b6f948388e..5eaccc85a2c0d 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -232,6 +232,7 @@
 
             .input-text {
                 .lib-vendor-prefix-order(0);
+                z-index: 2;
             }
         }
     }

From 1afcfc6e6992e804de6691b2de73bd9baed37387 Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@ebay.com>
Date: Fri, 17 Jun 2016 13:33:32 +0300
Subject: [PATCH 29/31] MAGETWO-47254: New order: Shipping and billing address
 fields are not aigned

---
 .../templates/order/create/form/address.phtml       |  6 +++---
 .../web/css/source/module/order/_address.less       | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index 09f85ec02d4a1..66b229a27f6aa 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -41,7 +41,7 @@ endif; ?>
 
     <fieldset id="<?php /* @escapeNotVerified */ echo $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
     <?php if ($block->getIsShipping()): ?>
-        <div class="admin__field admin__field-option">
+        <div class="admin__field admin__field-option admin__field-shipping-same-as-billing">
             <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing"
                    onclick="order.setShippingAsBilling(this.checked)" class="admin__control-checkbox"
                    <?php if ($block->getIsAsBilling()): ?>checked<?php endif; ?> />
@@ -50,13 +50,13 @@ endif; ?>
             </label>
         </div>
     <?php endif; ?>
-        <div class="admin__field">
+        <div class="admin__field admin__field-select-from-existing-address">
             <label class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Select from existing customer addresses:') ?></label>
             <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
             <div class="admin__field-control">
                 <select id="<?php /* @escapeNotVerified */ echo $_id ?>"
                         name="<?php echo $block->getForm()->getHtmlNamePrefix() ?>[customer_address_id]"
-                        style="width: 97.5%;" onchange="order.selectAddress(this, '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>')"
+                        onchange="order.selectAddress(this, '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>')"
                         class="admin__control-select">
                     <option value=""><?php /* @escapeNotVerified */ echo __('Add New Address') ?></option>
                     <?php foreach ($block->getAddressCollection() as $_address): ?>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_address.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_address.less
index c6b37ec184c9e..70cf4076b50a0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_address.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_address.less
@@ -47,3 +47,16 @@
         padding: 0;
     }
 }
+
+.admin__fieldset {
+    > .admin__field-shipping-same-as-billing {
+        margin-bottom: @indent__s;
+        margin-top: -@indent__base;
+    }
+}
+
+.order-billing-address {
+    .order-choose-address {
+        margin-top: 14px;
+    }
+}

From 19056c6c826ace0bb6dc117774775be64fc987c9 Mon Sep 17 00:00:00 2001
From: Dmytro Vilchynskyi <dvilchynskyi@magento.com>
Date: Wed, 22 Jun 2016 18:09:49 +0300
Subject: [PATCH 30/31] MAGETWO-53787: URL Rewrite Fieldset is broken in Admin

- Fixes for failed functional & integration tests on Bamboo
---
 .../Test/TestCase/CreateProductUrlRewriteEntityTest.xml   | 8 ++++----
 .../Customer/Block/Account/Dashboard/AddressTest.php      | 4 ++--
 .../testsuite/Magento/Customer/Block/Address/BookTest.php | 2 +-
 .../Block/Address/Renderer/DefaultRendererTest.php        | 4 ++--
 .../Multishipping/Block/Checkout/Address/SelectTest.php   | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
index fe3dd5e40be8b..dc8ba167417e9 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateProductUrlRewriteEntityTest.xml
@@ -9,7 +9,7 @@
     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateProductUrlRewriteEntityTest" summary="Create Product URL Rewrites" ticketId="MAGETWO-25150">
         <variation name="CreateProductUrlRewriteEntityTestVariation1" summary="Add Temporary Redirect for Product" ticketId="MAGETWO-12409">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For product</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">product_with_category</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">cat%isolation%/simp_redirect%isolation%.html</data>
@@ -19,7 +19,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
         </variation>
         <variation name="CreateProductUrlRewriteEntityTestVariation2" summary="Create Product URL Rewrites with no redirect">
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For product</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">test_%isolation%.html</data>
@@ -28,7 +28,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteSaveMessage" />
         </variation>
         <variation name="CreateProductUrlRewriteEntityTestVariation3" summary="Create Product URL Rewrites with Temporary redirect">
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For product</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">test_%isolation%.html</data>
@@ -38,7 +38,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteProductRedirect" />
         </variation>
         <variation name="CreateProductUrlRewriteEntityTestVariation4" summary="Create Product URL Rewrites with Permanent redirect">
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For product</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Product</data>
             <data name="product/dataset" xsi:type="string">default</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">test_%isolation%.html</data>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
index 365a88a349def..42b850a131022 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Account/Dashboard/AddressTest.php
@@ -96,7 +96,7 @@ public function testGetPrimaryShippingAddressHtml($customerId, $expected)
     public function getPrimaryShippingAddressHtmlDataProvider()
     {
         $expected = "John Smith<br/>\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM,  Alabama, 75477<br/>"
-            . "\nUnited States<br/>\nT: 3468676\n\n";
+            . "\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
 
         return [
             '0' => [0, 'You have not set a default shipping address.'],
@@ -123,7 +123,7 @@ public function testGetPrimaryBillingAddressHtml($customerId, $expected)
     public function getPrimaryBillingAddressHtmlDataProvider()
     {
         $expected = "John Smith<br/>\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM,  Alabama, 75477<br/>"
-            . "\nUnited States<br/>\nT: 3468676\n\n";
+            . "\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
         return [
             '0' => [0, 'You have not set a default billing address.'],
             '1' => [1, $expected],
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
index 56a3f9a1105d8..ae77f1d477539 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/BookTest.php
@@ -119,7 +119,7 @@ public function getAdditionalAddressesDataProvider()
     public function testGetAddressHtml()
     {
         $expected = "John Smith<br/>\nCompanyName<br />\nGreen str, 67<br />\n\n\n\nCityM,  Alabama, 75477<br/>" .
-            "\nUnited States<br/>\nT: 3468676\n\n";
+            "\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
         $address = Bootstrap::getObjectManager()->get('Magento\Customer\Api\AddressRepositoryInterface')->getById(1);
         $html = $this->_block->getAddressHtml($address);
         $this->assertEquals($expected, $html);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php
index 08dd2dcd6f4d2..e2d0be1823e00 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Address/Renderer/DefaultRendererTest.php
@@ -50,7 +50,7 @@ public function renderArrayDataProvider()
         ];
 
         $htmlResult = "John Smith<br/>\n\nGreen str, 67<br />\n\n\n\nCityM,  Alabama, " .
-            "75477<br/>\nUnited States<br/>\nT: 3468676\n\n";
+            "75477<br/>\nUnited States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n";
         return [
             [$addressAttributes, AttributeDataFactory::OUTPUT_FORMAT_HTML, $htmlResult],
             [
@@ -107,7 +107,7 @@ public function renderDataProvider()
                 $address,
                 AttributeDataFactory::OUTPUT_FORMAT_HTML,
                 "John Smith<br/>\n\nGreen str, 67<br />\n\n\n\nCityM,  Alabama, 75477<br/>
-United States<br/>\nT: 3468676\n\n",
+United States<br/>\nT: <a href=\"tel:3468676\">3468676</a>\n\n",
             ],
             [
                 $address,
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
index 14d0fb31151a1..290b7d3a4f4ed 100644
--- a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
@@ -41,7 +41,7 @@ public function testGetAddressAsHtml()
         $addressAsHtml = $this->_selectBlock->getAddressAsHtml($address);
         $this->assertEquals(
             "John Smith<br/>CompanyName<br />Green str, 67<br />CityM,  Alabama, 75477"
-                . "<br/>United States<br/>T: 3468676",
+                . "<br/>United States<br/>T: <a href=\"tel:3468676\">3468676</a>",
             str_replace("\n", '', $addressAsHtml),
             "Address was represented as HTML incorrectly"
         );

From 89da95c10f5ac364feabaed588e16032606a0609 Mon Sep 17 00:00:00 2001
From: Dmytro Vilchynskyi <dvilchynskyi@magento.com>
Date: Thu, 23 Jun 2016 12:23:58 +0300
Subject: [PATCH 31/31] MAGETWO-53787: URL Rewrite Fieldset is broken in Admin

- Fixes for failed functional tests on Bamboo
---
 .../Test/TestCase/CreateCategoryRewriteEntityTest.xml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
index e8a73717ca691..98992ab930b90 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/TestCase/CreateCategoryRewriteEntityTest.xml
@@ -9,7 +9,7 @@
     <testCase name="Magento\UrlRewrite\Test\TestCase\CreateCategoryRewriteEntityTest" summary="Create Category URL Rewrites" ticketId="MAGETWO-24280">
         <variation name="CreateCategoryRewriteEntityTestVariation1" summary="Add Permanent Redirect for Category" ticketId="MAGETWO-12407">
             <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For category</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Category</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">cat%isolation%-redirect.html</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">Permanent (301)</data>
@@ -18,7 +18,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
         </variation>
         <variation name="CreateCategoryRewriteEntityTestVariation2" summary="Create Category URL Rewrites with no redirect">
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For category</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Category</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">test_request%isolation%</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">No</data>
@@ -27,7 +27,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteInGrid" />
         </variation>
         <variation name="CreateCategoryRewriteEntityTestVariation3" summary="Create Category URL Rewrites with Temporary redirect">
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For category</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Category</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">Temporary (302)</data>
@@ -37,7 +37,7 @@
             <constraint name="Magento\UrlRewrite\Test\Constraint\AssertUrlRewriteCategoryRedirect" />
         </variation>
         <variation name="CreateCategoryRewriteEntityTestVariation4" summary="Create Category URL Rewrites with Permanent redirect">
-            <data name="urlRewrite/data/entity_type" xsi:type="string">For category</data>
+            <data name="urlRewrite/data/entity_type" xsi:type="string">For Category</data>
             <data name="urlRewrite/data/store_id" xsi:type="string">Main Website/Main Website Store/Default Store View</data>
             <data name="urlRewrite/data/request_path" xsi:type="string">request_path%isolation%</data>
             <data name="urlRewrite/data/redirect_type" xsi:type="string">Permanent (301)</data>
