Skip to content

Commit 64bae37

Browse files
author
Bogdan Plieshka
committed
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
1 parent f8f7dab commit 64bae37

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module.exports = function (grunt) {
6565
*/
6666
backend: [
6767
'less:backend',
68-
'replace:example',
68+
'replace:escapeCalc',
6969
'less:override'
7070
],
7171
/**

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,14 @@
234234
.parent {
235235
margin-bottom: 4.5rem;
236236
// Section title
237-
// ToDo UI: Should be not a link, strong instead and have a classname
238-
> a {
237+
> a, // ToDo UI: Should be deleted after template changes a -> strong.submenu-group-title
238+
.submenu-group-title {
239239
color: @submenu-section-label__color;
240240
display: block;
241241
font-size: 1.6rem;
242242
font-weight: @font-weight__semibold;
243243
margin-bottom: .7rem;
244+
padding: 1.25rem @submenu__padding-horizontal;
244245
pointer-events: none;
245246
}
246247
}

app/design/adminhtml/Magento/backend/web/css/override.less

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2791,6 +2791,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
27912791
margin: 0 0 3rem;
27922792
}
27932793
.page-layout-admin-login {
2794+
align-items: center;
27942795
display: -webkit-flex;
27952796
display: -ms-flexbox;
27962797
display: flex;
@@ -3197,12 +3198,14 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
31973198
.admin__menu .submenu .parent {
31983199
margin-bottom: 4.5rem;
31993200
}
3200-
.admin__menu .submenu .parent > a {
3201+
.admin__menu .submenu .parent > a,
3202+
.admin__menu .submenu .parent .submenu-group-title {
32013203
color: #a79d95;
32023204
display: block;
32033205
font-size: 1.6rem;
32043206
font-weight: 600;
32053207
margin-bottom: .7rem;
3208+
padding: 1.25rem 1.5rem;
32063209
pointer-events: none;
32073210
}
32083211
.admin__menu .submenu .column {

dev/tools/grunt/configs/replace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Replace task for backend migration
1010
*/
1111
module.exports = {
12-
example: {
12+
escapeCalc: {
1313
src: ['<%= combo.autopath("backend","pub") %>/css/styles.css'], // source files array (supports minimatch)
1414
dest: '<%= combo.autopath("backend","pub") %>/css/override.less', // destination directory or file
1515
replacements: [{

dev/tools/grunt/configs/themes.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ module.exports = {
4646
files: [
4747
'css/styles-old',
4848
'css/styles',
49-
'css/pages',
50-
'css/admin',
5149
'css/styles-migration'
5250
],
5351
dsl: 'less'

dev/tools/grunt/configs/watch.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,16 @@ var watchOptions = {
2424
"setup": {
2525
"files": "<%= path.less.setup %>/**/*.less",
2626
"tasks": "less:setup"
27+
},
28+
"backendMigration": {
29+
"files": [
30+
"<%= combo.autopath(\"backend\",\"pub\") %>/css/styles.css"
31+
],
32+
"tasks": [
33+
"replace:escapeCalc",
34+
"less:override"
35+
]
2736
}
2837
};
2938

30-
module.exports = _.extend(themeOptions, watchOptions);
39+
module.exports = _.extend(themeOptions, watchOptions);

0 commit comments

Comments
 (0)