Merge remote-tracking branch 'remotes/upstream/develop' into MAGETWO-35264-Failed-SOAP-Service-Request

Author: anupdugar

Gruntfile.js

@@ -60,7 +60,14 @@ module.exports = function (grunt) {
             'less:luma',
             'less:backend'
         ],
-
+        /**
+         * Styles for backend theme
+         */
+        backend: [
+            'less:backend',
+            'replace:escapeCalc',
+            'less:override'
+        ],
         /**
          * Documentation
          */

app/code/Magento/Backend/Block/Menu.php

@@ -410,7 +410,7 @@ protected function _addSubMenu($menuItem, $level, $limit)
         if ($level == 0 && $limit) {
             $colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
             $output .= '<strong class="submenu-title">' . $this->_getAnchorLabel($menuItem) . '</strong>';
-            $output .= '<button class="submenu-close _close"></button>';
+            $output .= '<a href="#" class="submenu-close _close" data-role="close-submenu"></a>';
         }
 
         $output .= $this->renderNavigation($menuItem->getChildren(), $level + 1, $limit, $colStops);

app/code/Magento/Catalog/Pricing/Price/TierPrice.php

@@ -162,7 +162,8 @@ protected function filterTierPrices(array $priceList)
         $qtyCache = [];
         foreach ($priceList as $priceKey => $price) {
             /* filter price by customer group */
-            if ($price['cust_group'] !== $this->customerGroup && $price['cust_group'] !== $this->groupManagement->getAllCustomersGroup()->getId()) {
+            if ($price['cust_group'] != $this->customerGroup &&
+                $price['cust_group'] != $this->groupManagement->getAllCustomersGroup()->getId()) {
                 unset($priceList[$priceKey]);
                 continue;
             }

app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml

@@ -73,8 +73,8 @@ $product = $block->getSaleableItem();
                     );
                 ?><?php echo __('each') ?>
                 <?php if ($block->getShowDetailedPrice() !== false): ?>
-                    <?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>
-                        <span class="percent tier-<?php echo $index ?>"><?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>%
+                    &nbsp;<?php echo __('and') ?>&nbsp;<strong class="benefit"><?php echo __('save')?>
+                        <span class="percent tier-<?php echo $index ?>">&nbsp;<?php echo $tierPriceModel->getSavePercent($price['price']) ?></span>%
                     </strong>
                 <?php endif ?>
             <?php endif; ?>

app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml

@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="entry-edit">
+<div class="entry-edit form-inline">
     <?php echo $block->getFormHtml() ?>
 </div>
 <?php echo $block->getChildHtml('form_after');?>

app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml

@@ -5,7 +5,7 @@
  */
 /* @var $block \Magento\Tax\Block\Adminhtml\Rate\Form */
 ?>
-<div id="<?php echo $block->getNameInLayout() ?>" style="display:none">
+<div class="form-inline" id="<?php echo $block->getNameInLayout() ?>" style="display:none">
     <?php echo $block->getFormHtml();?>
     <?php echo $block->getChildHtml('form_after');?>
 </div>

app/code/Magento/Ui/view/base/web/templates/massaction.html

@@ -8,11 +8,10 @@
     <button title="Actions" class="action-default scalable add" data-bind="click: onToggle('actionsVisible')">
         <span data-bind="text: $t('Actions')"></span>
     </button>
-    <button title="" class="action-toggle scalable  add" data-toggle="dropdown" data-bind="click: onToggle('actionsVisible'), css: {active: actionsVisible}">
-        <span>|</span>
+    <button title="" class="action-toggle scalable add" data-toggle="dropdown" data-bind="click: onToggle('actionsVisible'), css: {active: actionsVisible}">
+        <span data-bind="text: $t('Select')"></span>
     </button>
-
     <ul class="dropdown-menu" data-bind="css: {'active': actionsVisible}, foreach: {data: actions, as: 'action'}">
         <li data-bind="click: $parent.setAction(action)"><span class="item" data-bind="text: label"></span></li>
     </ul>
-</div>
+</div>

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/_module.less

@@ -7,13 +7,13 @@
 //  Crosspage components
 //  _____________________________________________
 
-@import 'module/_menu';
-@import 'module/_header';
-@import 'module/_footer';
-@import 'module/_main';
+@import 'module/_menu.less';
+@import 'module/_header.less';
+@import 'module/_footer.less';
+@import 'module/_main.less';
 
 //
 //  Pages
 //  _____________________________________________
 
-@import 'module/pages/_dashboard';
+@import 'module/pages/_dashboard.less';

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_header.less

@@ -11,8 +11,8 @@
 //  Components
 //  ---------------------------------------------
 
-@import 'header/_actions-group';
-@import 'header/_headings-group';
+@import 'header/_actions-group.less';
+@import 'header/_headings-group.less';
 
 //  Variables
 //  ---------------------------------------------

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_main.less

@@ -11,4 +11,4 @@
 //  Components
 //  ---------------------------------------------
 
-@import 'main/_actions-bar';
+@import 'main/_actions-bar.less';