Skip to content

Commit 14ccbdd

Browse files
committed
MAGETWO-34893: Required marker is displayed on wrong line in Backend
1 parent 7392e4d commit 14ccbdd

File tree

38 files changed

+279
-231
lines changed

38 files changed

+279
-231
lines changed

app/code/Magento/Ui/view/base/web/templates/massaction.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
<button title="Actions" class="action-default scalable add" data-bind="click: onToggle('actionsVisible')">
99
<span data-bind="text: $t('Actions')"></span>
1010
</button>
11-
<button title="" class="action-toggle scalable add" data-toggle="dropdown" data-bind="click: onToggle('actionsVisible'), css: {active: actionsVisible}">
12-
<span>|</span>
11+
<button title="" class="action-toggle scalable add" data-toggle="dropdown" data-bind="click: onToggle('actionsVisible'), css: {active: actionsVisible}">
12+
<span data-bind="text: $t('Select')"></span>
1313
</button>
14-
1514
<ul class="dropdown-menu" data-bind="css: {'active': actionsVisible}, foreach: {data: actions, as: 'action'}">
1615
<li data-bind="click: $parent.setAction(action)"><span class="item" data-bind="text: label"></span></li>
1716
</ul>
18-
</div>
17+
</div>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
// Crosspage components
88
// _____________________________________________
99

10-
@import 'module/_menu';
11-
@import 'module/_header';
12-
@import 'module/_footer';
13-
@import 'module/_main';
10+
@import 'module/_menu.less';
11+
@import 'module/_header.less';
12+
@import 'module/_footer.less';
13+
@import 'module/_main.less';
1414

1515
//
1616
// Pages
1717
// _____________________________________________
1818

19-
@import 'module/pages/_dashboard';
19+
@import 'module/pages/_dashboard.less';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// Components
1212
// ---------------------------------------------
1313

14-
@import 'header/_actions-group';
15-
@import 'header/_headings-group';
14+
@import 'header/_actions-group.less';
15+
@import 'header/_headings-group.less';
1616

1717
// Variables
1818
// ---------------------------------------------

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
// Components
1212
// ---------------------------------------------
1313

14-
@import 'main/_actions-bar';
14+
@import 'main/_actions-bar.less';

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
// Components
1212
// ---------------------------------------------
1313

14-
@import 'actions-group/_user';
15-
@import 'actions-group/_search';
16-
@import 'actions-group/_notifications';
14+
@import 'actions-group/_user.less';
15+
@import 'actions-group/_search.less';
16+
@import 'actions-group/_notifications.less';
1717

1818
//
1919
// Variables

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Components
1313
// ---------------------------------------------
1414

15-
@import 'actions_bar/_store-switcher';
15+
@import 'actions_bar/_store-switcher.less';
1616

1717
//
1818
// Variables

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@import 'module/_tabnav';
6+
@import 'module/_tabnav.less';

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

Lines changed: 81 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -229,39 +229,89 @@
229229
}
230230

231231
.grid {
232-
.actions-split .dropdown-menu {
233-
right: auto;
234-
left: auto;
235-
text-align: left;
236-
color: #676056;
237-
font-weight: normal;
238-
239-
&:after {
240-
right: auto;
241-
left: 9px;
242-
}
243-
&:before {
244-
right: auto;
245-
left: 10px;
232+
.actions-split {
233+
.clearfix();
234+
display: inline-block;
235+
position: relative;
236+
z-index: 100;
237+
&.active {
238+
.dropdown-menu {
239+
opacity: 1;
240+
visibility: visible;
241+
}
242+
}
243+
.action-toggle,
244+
.action-default {
245+
float: left;
246+
margin: 0;
247+
}
248+
.action-default {
249+
margin-right: 3rem;
250+
}
251+
.action-toggle {
252+
border-left-color: rgba(0, 0, 0, .2);
253+
bottom: 0;
254+
padding-left: 0;
255+
padding-right: 3rem;
256+
position: absolute;
257+
right: 0;
258+
top: 0;
259+
&.active {
260+
&:after {
261+
transform: rotate(180deg);
262+
}
263+
}
264+
&:after {
265+
border-color: #645d53 transparent transparent transparent;
266+
border-style: solid;
267+
border-width: .5rem .5rem 0 .5rem;
268+
content: '';
269+
height: 0;
270+
margin-top: -.25rem;
271+
position: absolute;
272+
right: 1rem;
273+
top: 50%;
274+
width: 0;
275+
}
276+
&:hover {
277+
&:after {
278+
border-color: darken(#645d53, 10%) transparent transparent transparent;
279+
}
280+
}
281+
> span {
282+
.visually-hidden();
283+
}
284+
}
285+
.dropdown-menu {
286+
> li {
287+
padding: 4px 15px;
288+
&:hover {
289+
background-color: #e8e8e8;
290+
}
291+
span {
292+
display: block;
293+
}
294+
}
295+
}
246296
}
247-
}
248297

249-
.grid-actions {
250-
padding: 10px 0;
251-
}
298+
.grid-actions {
299+
padding: 10px 0;
300+
}
252301

253-
.hor-scroll {
254-
padding-top: 10px;
255-
}
302+
.hor-scroll {
303+
padding-top: 10px;
304+
}
256305

257-
.select-box {
258-
display: inline-block;
259-
vertical-align: top;
260-
margin: -12px -10px -7px;
261-
padding: 12px 10px 7px;
262-
width: 100%;
263-
}
306+
.select-box {
307+
display: inline-block;
308+
vertical-align: top;
309+
margin: -12px -10px -7px;
310+
padding: 12px 10px 7px;
311+
width: 100%;
312+
}
264313
}
314+
265315
.filters {
266316
&-toggle {
267317
.button(
@@ -491,7 +541,7 @@
491541
li {
492542
margin: 0;
493543
padding: 4px 15px;
494-
border-bottom: 1px solid #E5E5E5;
544+
border-bottom: 1px solid #e5e5e5;
495545
}
496546
li:hover {
497547
background: #e8e8e8;
@@ -500,7 +550,7 @@
500550
span {
501551
font-weight: normal;
502552
font-size: 13px;
503-
color: #645D53;
553+
color: #645d53;
504554
}
505555
&.active {
506556
display: block;
@@ -530,7 +580,6 @@
530580
}
531581
}
532582

533-
534583
//
535584
// Form Component
536585
//
@@ -540,7 +589,7 @@
540589
.field .control select[disabled],
541590
.field .control select[disabled] ~ .addafter {
542591
background-color: #f4f4f4;
543-
border-color: #dddddd;
592+
border-color: #ddd;
544593
box-shadow: none;
545594
color: #999;
546595
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3337,7 +3337,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
33373337
transform: rotate(180deg);
33383338
}
33393339
.admin-user-account:hover:after {
3340-
border-color: #41362f transparent transparent transparent;
3340+
border-color: #060504 transparent transparent transparent;
33413341
}
33423342
.admin-user-account:before {
33433343
content: '\e600';

app/design/adminhtml/Magento/backend/web/css/source/_components.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
// Components
88
// _____________________________________________
99

10-
@import 'components/_spinner';
10+
@import 'components/_spinner.less';

0 commit comments

Comments
 (0)