Merge pull request #158 from magento-webdev/UI

[UI] Bug fixes

Author: Momotenko,Natalia(nmomotenko)

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/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';

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

@@ -234,13 +234,14 @@
         .parent {
             margin-bottom: 4.5rem;
             //  Section title
-            //  ToDo UI: Should be not a link, strong instead and have a classname
-            > a {
+            > a, // ToDo UI: Should be deleted after template changes a -> strong.submenu-group-title
+            .submenu-group-title {
                 color: @submenu-section-label__color;
                 display: block;
                 font-size: 1.6rem;
                 font-weight: @font-weight__semibold;
                 margin-bottom: .7rem;
+                padding: 1.25rem @submenu__padding-horizontal;
                 pointer-events: none;
             }
         }

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/header/_actions-group.less

@@ -11,9 +11,9 @@
 //  Components
 //  ---------------------------------------------
 
-@import 'actions-group/_user';
-@import 'actions-group/_search';
-@import 'actions-group/_notifications';
+@import 'actions-group/_user.less';
+@import 'actions-group/_search.less';
+@import 'actions-group/_notifications.less';
 
 //
 //  Variables

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

@@ -12,7 +12,7 @@
 //  Components
 //  ---------------------------------------------
 
-@import 'actions_bar/_store-switcher';
+@import 'actions_bar/_store-switcher.less';
 
 //
 //  Variables