Skip to content

Commit d3bb3cd

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-54009' into bugfixes
2 parents d8e4888 + 98d7a23 commit d3bb3cd

File tree

2 files changed

+52
-28
lines changed

2 files changed

+52
-28
lines changed

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/pages/_cache-management.less

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,3 @@
9090
margin: 5px 0 6px;
9191
}
9292
}
93-
94-
.adminhtml-cache-index {
95-
.data-grid-checkbox-cell {
96-
&.col-select.col-massaction {
97-
cursor: pointer;
98-
}
99-
}
100-
101-
.data-grid-checkbox-cell-inner {
102-
margin: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
103-
padding: 0;
104-
105-
&:before {
106-
content: none;
107-
}
108-
}
109-
}

app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -783,22 +783,11 @@ body._in-resize {
783783
.data-grid-checkbox-cell-inner {
784784
display: block;
785785
padding: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
786-
position: relative;
787786
text-align: right;
788787

789788
&:hover {
790789
cursor: pointer;
791790
}
792-
793-
&:before {
794-
bottom: 0;
795-
content: '';
796-
height: 500%;
797-
left: 0;
798-
position: absolute;
799-
right: 0;
800-
top: 0;
801-
}
802791
}
803792

804793
// State actions column
@@ -1012,3 +1001,55 @@ body._in-resize {
10121001
}
10131002
}
10141003
}
1004+
1005+
// Fix for Not whole column area is clickable in data-grid.
1006+
// Purpose to expand clickable area for new data-grids.
1007+
.admin__data-grid-outer-wrap {
1008+
.data-grid-checkbox-cell {
1009+
overflow: hidden;
1010+
}
1011+
1012+
.data-grid-checkbox-cell-inner {
1013+
position: relative;
1014+
1015+
&:before {
1016+
bottom: 0;
1017+
content: '';
1018+
height: 500%;
1019+
left: 0;
1020+
position: absolute;
1021+
right: 0;
1022+
top: 0;
1023+
}
1024+
}
1025+
}
1026+
1027+
// And to shrink clickable area for old data-grid.
1028+
.admin__data-grid-wrap-static {
1029+
.data-grid-checkbox-cell {
1030+
&:hover {
1031+
cursor: pointer;
1032+
}
1033+
}
1034+
1035+
.data-grid-checkbox-cell-inner {
1036+
margin: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal .9rem;
1037+
padding: 0;
1038+
}
1039+
1040+
// Content Hierarchy specific
1041+
.adminhtml-cms-hierarchy-index & {
1042+
.data-grid-actions-cell:first-child {
1043+
padding: 0;
1044+
}
1045+
}
1046+
1047+
// System Export specific
1048+
.adminhtml-export-index & {
1049+
.data-grid-checkbox-cell-inner {
1050+
margin: 0;
1051+
padding: @data-grid-checkbox-cell-inner__padding-top @data-grid-checkbox-cell-inner__padding-horizontal 1.9rem;
1052+
}
1053+
}
1054+
}
1055+
// End Fix for Not whole column area is clickable in data-grid.

0 commit comments

Comments
 (0)