Skip to content

Commit 2ea8cdd

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #360 from magento-webdev/PR
[WebDev] Tasks and Bug-fixes
2 parents 2badc7e + 1df03f5 commit 2ea8cdd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3792
-597
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
.store-switcher {
3131
display: none;
3232
}
33+
34+
.page-actions-placeholder {
35+
min-height: 50px;
36+
}
3337
}
3438
}
3539

app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4055,6 +4055,13 @@
40554055
.style28();
40564056
}
40574057
}
4058+
4059+
.pp-buttons-container {
4060+
.action-default {
4061+
display: inline-block;
4062+
margin-bottom: @indent__xs;
4063+
}
4064+
}
40584065
}
40594066
}
40604067

app/design/adminhtml/Magento/backend/web/mui/styles/_base.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ h6 {
7979

8080
// Links
8181
a {
82-
.actionLink();
82+
display: inline;
8383
}

app/design/frontend/Magento/blank/web/css/source/_dropdowns.less

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/design/frontend/Magento/blank/web/css/source/_popups.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
top: 0;
2929
width: 40px;
3030
z-index: 1001;
31-
._lib-popup-button-close-icon(
31+
.lib-popup-button-close-icon(
3232
@popup-button-close__icon,
3333
@popup-icon-font__content,
3434
@popup-icon-font,

app/design/frontend/Magento/blank/web/css/source/_rating.less

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/design/frontend/Magento/blank/web/css/source/_sources.less

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
@import '_icons.less';
1717
@import '_buttons.less';
1818
@import '_sections.less';
19-
@import '_dropdowns.less';
2019
@import '_pages.less'; // Theme pager
21-
@import '_rating.less';
2220
@import '_actions-toolbar.less';
2321
@import '_breadcrumbs.less';
2422
@import '_popups.less';

app/design/frontend/Magento/luma/web/css/source/_popups.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
top: 0;
2929
width: 40px;
3030
z-index: 1001;
31-
._lib-popup-button-close-icon(
31+
.lib-popup-button-close-icon(
3232
@popup-button-close__icon,
3333
@popup-icon-font__content,
3434
@popup-icon-font,

lib/web/css/docs/actions-toolbar.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,66 +42,77 @@
4242
<table>
4343
<tr>
4444
<th class="vars_head">Mixin variable</th>
45+
<th class="vars_head">Global variable</th>
4546
<th class="vars_head">Default value</th>
46-
<th class="vars_head">Allowable values</th>
47+
<th class="vars_head">Allowed values</th>
4748
<th class="vars_head">Comment</th>
4849
</tr>
4950
<tr>
5051
<th>@_actions-toolbar-actions-position</th>
52+
<td>@actions-toolbar-actions__position</td>
5153
<td class="vars_value">justify</td>
5254
<td class="vars_value">justify | left | right | center</td>
5355
<td>Position for actions in Actions toolbar</td>
5456
</tr>
5557
<tr>
5658
<th>@_actions-toolbar-actions-reverse</th>
59+
<td>@actions-toolbar-actions__reverse</td>
5760
<td class="vars_value">false</td>
5861
<td class="vars_value">true | false</td>
5962
<td>Reverse primary and secondary blocks position in Actions toolbar</td>
6063
</tr>
6164
<tr>
6265
<th>@_actions-toolbar-margin</th>
66+
<td>@actions-toolbar__margin</td>
6367
<td class="vars_value">false</td>
6468
<td class="vars_value">'' | false | value</td>
6569
<td>Margins of the Actions toolbar</td>
6670
</tr>
6771
<tr>
6872
<th>@_actions-toolbar-padding</th>
73+
<td>@actions-toolbar__padding</td>
6974
<td class="vars_value">false</td>
7075
<td class="vars_value">'' | false | value</td>
7176
<td>Paddings of the Actions toolbar</td>
7277
</tr>
7378
<tr>
7479
<th>@_actions-toolbar-actions-margin</th>
80+
<td>@actions-toolbar-actions__margin</td>
7581
<td class="vars_value">false</td>
7682
<td class="vars_value">'' | false | value</td>
7783
<td>Margins of all .actions in the Actions toolbar</td>
7884
</tr>
7985
<tr>
8086
<th>@_actions-toolbar-primary-actions-margin</th>
87+
<td>@actions-toolbar-actions-primary__margin</td>
8188
<td class="vars_value">0 @indent__xs 0 0</td>
8289
<td class="vars_value">'' | false | value</td>
8390
<td>Margins of primary .actions in the Actions toolbar</td>
8491
</tr>
8592
<tr>
8693
<th>@_actions-toolbar-secondary-actions-margin</th>
94+
<td>@actions-toolbar-actions-secondary__margin</td>
8795
<td class="vars_value">false</td>
8896
<td class="vars_value">'' | false | value</td>
8997
<td>Margins of secondary .actions in the Actions toolbar</td>
9098
</tr>
9199
<tr>
92100
<th nowrap="nowrap">@_actions-toolbar-actions-links-margin-top</th>
101+
<td>@actions-toolbar-actions-links__margin-top</td>
93102
<td class="vars_value">false</td>
94103
<td class="vars_value">'' | false | value</td>
95104
<td>Margin-top for links with class .action in the Actions toolbar</td>
96105
</tr>
97106
<tr>
98107
<th nowrap="nowrap">@_actions-toolbar-primary-actions-links-margin-top</th>
108+
<td>@actions-toolbar-actions-links-primary__margin-top</td>
99109
<td class="vars_value">false</td>
100110
<td class="vars_value">'' | false | value</td>
101111
<td>Margin-top for primary links with class .action in the Actions toolbar</td>
102112
</tr>
103113
<tr>
104114
<th nowrap="nowrap">@_actions-toolbar-secondary-actions-links-margin-top</th>
115+
<td>@actions-toolbar-actions-secondary__margin</td>
105116
<td class="vars_value">6px</td>
106117
<td class="vars_value">'' | false | value</td>
107118
<td>Margin-top for secondary links with class .action in the Actions toolbar</td>

0 commit comments

Comments
 (0)