Skip to content

Commit e1e4afc

Browse files
author
Evgeniy Kolesov
committed
MAGETWO-35182: The link of "URL" type breaks "edit Downloadable" Backend page
- CR fixes
1 parent 9882d0f commit e1e4afc

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,10 @@
2323
.col-action {
2424
width: 1px;
2525
}
26-
td.col-limit {
27-
white-space: nowrap;
26+
td {
27+
&.col-limit {
28+
white-space: nowrap;
29+
}
2830
}
2931
.admin__control-table {
3032
.admin__control-text {

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ nav ol {
395395
.admin__control-table th {
396396
background: #efefef;
397397
border: 0;
398-
border-bottom: 1px solid #fff;
398+
border-bottom: 1px solid #ffffff;
399399
padding: 1.3rem 2.5rem 1.3rem 0;
400400
text-align: left;
401401
}
@@ -3283,6 +3283,10 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
32833283
font-size: 1.7rem;
32843284
transition: color 0.1s linear;
32853285
}
3286+
.admin__menu .submenu-close:hover {
3287+
cursor: pointer;
3288+
text-decoration: none;
3289+
}
32863290
.admin__menu .submenu-close:hover:before {
32873291
color: #ffffff;
32883292
}

app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
}
2727
td,
2828
th {
29-
background: #efefef;
29+
background: @color-white-dark-smoke;
3030
border: 0;
31-
border-bottom: 1px solid #fff;
31+
border-bottom: 1px solid @color-white;
3232
padding: 1.3rem 2.5rem 1.3rem 0;
3333
text-align: left;
3434
&:first-child {
@@ -38,14 +38,16 @@
3838
th {
3939
border: 0;
4040
vertical-align: bottom;
41-
color: #303030;
41+
color: @color-very-dark-gray-black;
4242
font-size: @font-size__base;
4343
font-weight: @font-weight__semibold;
4444
padding-bottom: 0;
4545
&._required {
46-
span:after {
47-
color: @field-label__required__color;
48-
content: '*';
46+
span {
47+
&:after {
48+
color: @field-label__required__color;
49+
content: '*';
50+
}
4951
}
5052
}
5153
}

dev/tools/grunt/configs/watch.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ var watchOptions = {
2525
"files": "<%= path.less.setup %>/**/*.less",
2626
"tasks": "less:setup"
2727
},
28+
"reload": {
29+
"files": "<%= path.pub %>/**/*.css",
30+
"options": {
31+
livereload: true
32+
}
33+
},
2834
"backendMigration": {
2935
"files": [
3036
"<%= combo.autopath(\"backend\",\"pub\") %>/css/styles.css"

lib/web/css/source/lib/variables/_colors.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
@color-gray94: #f0f0f0;
3434
@color-gray95: #f2f2f2;
3535
@color-white-smoke: #f5f5f5;
36+
@color-white-dark-smoke: #efefef;
3637
@color-white-fog: #f8f8f8;
3738

3839
@color-gray-light0: #f6f6f6;

0 commit comments

Comments
 (0)