From 64bae378ab842082890cf943d1ae59a6437e7b2d Mon Sep 17 00:00:00 2001
From: Bogdan Plieshka <bplieshka@ebay.com>
Date: Wed, 18 Mar 2015 12:41:39 +0200
Subject: [PATCH] MAGETWO-35195: JS loader is displayed outside the content
 area in Backend

- Added main menu submenu group title style support
- Fixed Grunt Less compile tasks
---
 Gruntfile.js                                          |  2 +-
 .../Magento_Backend/web/css/source/module/_menu.less  |  5 +++--
 .../adminhtml/Magento/backend/web/css/override.less   |  5 ++++-
 dev/tools/grunt/configs/replace.js                    |  2 +-
 dev/tools/grunt/configs/themes.js                     |  2 --
 dev/tools/grunt/configs/watch.js                      | 11 ++++++++++-
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 14d1404e7d4..4c50be920fa 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -65,7 +65,7 @@ module.exports = function (grunt) {
          */
         backend: [
             'less:backend',
-            'replace:example',
+            'replace:escapeCalc',
             'less:override'
         ],
         /**
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index 63cbbf33a9b..0886abc84b4 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/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;
             }
         }
diff --git a/app/design/adminhtml/Magento/backend/web/css/override.less b/app/design/adminhtml/Magento/backend/web/css/override.less
index bc0ec5fd093..550c2b105c3 100644
--- a/app/design/adminhtml/Magento/backend/web/css/override.less
+++ b/app/design/adminhtml/Magento/backend/web/css/override.less
@@ -2791,6 +2791,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
   margin: 0 0 3rem;
 }
 .page-layout-admin-login {
+  align-items: center;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
@@ -3197,12 +3198,14 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
 .admin__menu .submenu .parent {
   margin-bottom: 4.5rem;
 }
-.admin__menu .submenu .parent > a {
+.admin__menu .submenu .parent > a,
+.admin__menu .submenu .parent .submenu-group-title {
   color: #a79d95;
   display: block;
   font-size: 1.6rem;
   font-weight: 600;
   margin-bottom: .7rem;
+  padding: 1.25rem 1.5rem;
   pointer-events: none;
 }
 .admin__menu .submenu .column {
diff --git a/dev/tools/grunt/configs/replace.js b/dev/tools/grunt/configs/replace.js
index bc45defaecc..704683f691c 100644
--- a/dev/tools/grunt/configs/replace.js
+++ b/dev/tools/grunt/configs/replace.js
@@ -9,7 +9,7 @@
  * Replace task for backend migration
  */
 module.exports = {
-    example: {
+    escapeCalc: {
         src: ['<%= combo.autopath("backend","pub") %>/css/styles.css'], // source files array (supports minimatch)
         dest: '<%= combo.autopath("backend","pub") %>/css/override.less', // destination directory or file
         replacements: [{
diff --git a/dev/tools/grunt/configs/themes.js b/dev/tools/grunt/configs/themes.js
index 3d9729b9d09..dd43ca18652 100644
--- a/dev/tools/grunt/configs/themes.js
+++ b/dev/tools/grunt/configs/themes.js
@@ -46,8 +46,6 @@ module.exports = {
         files: [
             'css/styles-old',
             'css/styles',
-            'css/pages',
-            'css/admin',
             'css/styles-migration'
         ],
         dsl: 'less'
diff --git a/dev/tools/grunt/configs/watch.js b/dev/tools/grunt/configs/watch.js
index 786f5ab270b..f1a117ac8ed 100644
--- a/dev/tools/grunt/configs/watch.js
+++ b/dev/tools/grunt/configs/watch.js
@@ -24,7 +24,16 @@ var watchOptions = {
     "setup": {
         "files": "<%= path.less.setup %>/**/*.less",
         "tasks": "less:setup"
+    },
+    "backendMigration": {
+        "files": [
+            "<%= combo.autopath(\"backend\",\"pub\") %>/css/styles.css"
+        ],
+        "tasks": [
+            "replace:escapeCalc",
+            "less:override"
+        ]
     }
 };
 
-module.exports = _.extend(themeOptions, watchOptions);
\ No newline at end of file
+module.exports = _.extend(themeOptions, watchOptions);
-- 
GitLab