Skip to content

Commit 7cc4d57

Browse files
author
Ievgen Shakhsuvarov
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-45916
2 parents 157687a + d2d098d commit 7cc4d57

File tree

254 files changed

+4434
-222
lines changed

Some content is hidden

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

254 files changed

+4434
-222
lines changed

app/code/Magento/Cms/Setup/InstallData.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
210210
</p>
211211
<h2><a name="list"></a>List of cookies we collect</h2>
212212
<p>The table below lists the cookies we collect and what information they store.</p>
213-
<table class="data-table">
213+
<table class="data-table data-table-definition-list">
214214
<thead>
215215
<tr>
216216
<th>COOKIE name</th>

app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected function _prepareForm()
116116
]
117117
);
118118

119-
$fieldset->addField('insert_variable', 'note', ['text' => $insertVariableButton->toHtml()]);
119+
$fieldset->addField('insert_variable', 'note', ['text' => $insertVariableButton->toHtml(), 'label' => '']);
120120

121121
$fieldset->addField(
122122
'template_text',

app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ use Magento\Framework\App\TemplateTypesInterface;
1313
<?php if (!$block->getEditMode()): ?>
1414
<form action="<?php /* @escapeNotVerified */ echo $block->getLoadUrl() ?>" method="post" id="email_template_load_form">
1515
<?php echo $block->getBlockHtml('formkey')?>
16-
<fieldset class="fieldset form-inline">
17-
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Load default template') ?></span></legend>
18-
<div class="field">
19-
<label class="label" for="template_select"><?php /* @escapeNotVerified */ echo __('Template') ?></label>
20-
<div class="control">
21-
<select id="template_select" name="code" class="select required-entry">
16+
<fieldset class="admin__fieldset form-inline">
17+
<legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Load default template') ?></span></legend><br>
18+
<div class="admin__field">
19+
<label class="admin__field-label" for="template_select"><?php /* @escapeNotVerified */ echo __('Template') ?></label>
20+
<div class="admin__field-control">
21+
<select id="template_select" name="code" class="admin__control-select required-entry">
2222
<?php foreach ($block->getTemplateOptions() as $group => $options): ?>
2323
<?php if ($group): ?>
2424
<optgroup label="<?php echo $block->escapeHtml($group) ?>">
@@ -33,20 +33,23 @@ use Magento\Framework\App\TemplateTypesInterface;
3333
</select>
3434
</div>
3535
</div>
36-
<div class="field required">
37-
<div class="control">
36+
<div class="admin__field required">
37+
<span class="admin__field-label"></span>
38+
<div class="admin__field-control">
3839
<?php echo $block->getLoadButtonHtml() ?>
3940
</div>
4041
</div>
4142
</fieldset>
4243
</form>
4344
<?php endif ?>
45+
4446
<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="email_template_edit_form">
4547
<?php echo $block->getBlockHtml('formkey')?>
4648
<input type="hidden" id="change_flag_element" name="_change_type_flag" value="" />
4749
<input type="hidden" id="orig_template_code" name="orig_template_code" value="<?php /* @escapeNotVerified */ echo $block->getOrigTemplateCode() ?>" />
4850
<?php echo $block->getFormHtml() ?>
4951
</form>
52+
5053
<form action="<?php /* @escapeNotVerified */ echo $block->getPreviewUrl() ?>" method="post" id="email_template_preview_form" target="_blank">
5154
<?php echo $block->getBlockHtml('formkey')?>
5255
<div class="no-display">

app/code/Magento/Reports/Block/Adminhtml/Filter/Form.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ protected function _prepareForm()
159159
'date_format' => $dateFormat,
160160
'label' => __('From'),
161161
'title' => __('From'),
162-
'required' => true
162+
'required' => true,
163+
'class' => 'admin__control-text'
163164
]
164165
);
165166

@@ -171,7 +172,8 @@ protected function _prepareForm()
171172
'date_format' => $dateFormat,
172173
'label' => __('To'),
173174
'title' => __('To'),
174-
'required' => true
175+
'required' => true,
176+
'class' => 'admin__control-text'
175177
]
176178
);
177179

app/code/Magento/Widget/Block/Adminhtml/Widget/Options.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function getMainFieldset()
9595
$this->setMainFieldsetHtmlId($mainFieldsetHtmlId);
9696
$fieldset = $this->getForm()->addFieldset(
9797
$mainFieldsetHtmlId,
98-
['legend' => __('Widget Options'), 'class' => 'fieldset-wide']
98+
['legend' => __('Widget Options'), 'class' => 'fieldset-wide fieldset-widget-options']
9999
);
100100
$this->setData('main_fieldset', $fieldset);
101101

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
.message-system-inner {
1818
&:extend(.abs-clearfix all);
1919
background: @message-system__background-color;
20+
2021
.message-system-list {
2122
float: left;
2223
width: 75%;
@@ -32,13 +33,16 @@
3233
.message-system-short {
3334
overflow: hidden;
3435
text-align: right;
36+
3537
.message-system-short-label {
3638
display: inline-block;
3739
padding: @message-system-short-message__padding-vertical .3rem @message-system-short-message__padding-vertical 1rem;
3840
}
41+
3942
.message {
4043
display: inline-block;
4144
padding: @message-system-short-message__padding-vertical 2rem @message-system-short-message__padding-vertical 3.3rem;
45+
4246
&:before {
4347
left: .3rem;
4448
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
.accordion & {
88
margin: 0 0 @indent__base;
99
}
10+
1011
.add-sku-csv {
1112
.admin__field-label {
1213
&:before {

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
background-color: #fff;
1818
border: 1px solid #ada89e;
1919
border-radius: 2px;
20+
2021
&:after {
2122
position: absolute;
2223
top: 3px;
@@ -33,13 +34,15 @@
3334
font-size: 18px;
3435
color: #b2b2b2;
3536
}
37+
3638
input[type="search"],
3739
input.search {
3840
width: 100%;
3941
border: none;
4042
background: none;
4143
padding-right: 30px;
4244
}
45+
4346
&.category-select {
4447
input[type="search"],
4548
input.search {
@@ -56,6 +59,7 @@
5659
background-color: transparent;
5760
border: none;
5861
border-radius: 0;
62+
5963
&:after {
6064
display: none;
6165
}
@@ -71,21 +75,26 @@
7175
background: #fff;
7276
box-shadow: 0 2px 4px rgba(0, 0, 0, .2);
7377
z-index: 990;
78+
7479
ul {
7580
margin: 0;
7681
padding: 0;
7782
list-style: none;
7883
}
84+
7985
li {
8086
border-bottom: 1px solid #e5e5e5;
8187
padding: 0;
88+
8289
a {
8390
display: block;
91+
8492
&.ui-state-focus {
8593
background: #f5f5f5;
8694
}
8795
}
8896
}
97+
8998
li a,
9099
.jstree li a:hover,
91100
.jstree .jstree-hovered,
@@ -95,18 +104,22 @@
95104
color: #333;
96105
height: inherit !important;
97106
}
107+
98108
.jstree {
99109
li a:hover,
100110
.jstree-hovered,
101111
.jstree-clicked {
102112
border: none;
103113
}
114+
104115
li {
105116
border-bottom: 0;
117+
106118
a {
107119
display: inline-block;
108120
}
109121
}
122+
110123
.mage-suggest-selected > a {
111124
color: #000;
112125
background: #F1FFEB;
@@ -158,35 +171,42 @@
158171
font-size: 12px;
159172
padding: 5px 4px;
160173
filter: none;
174+
161175
span {
162176
display: inline;
163177
}
178+
164179
&:before {
165180
display: inline-block;
166181
float: right;
167182
margin-left: 4px;
168183
font-size: 13px;
169184
color: #b2b0ad;
170185
}
186+
171187
&:hover:before {
172188
color: #7e7e7e;
173189
}
174190
}
191+
175192
.dropdown-menu {
176193
margin: 1px 0 0;
177194
left: 0;
178195
right: auto;
179196
width: 245px;
180197
z-index: 4;
181198
}
199+
182200
.mage-suggest {
183201
border: none;
184202
border-radius: 3px 3px 0 0;
203+
185204
&:after {
186205
top: 10px;
187206
right: 8px;
188207
}
189208
}
209+
190210
.mage-suggest-inner {
191211
.title {
192212
margin: 0;
@@ -196,6 +216,7 @@
196216
font-size: 12px;
197217
border-bottom: 1px solid #e5e5e5;
198218
}
219+
199220
> input[type="search"],
200221
> input.search {
201222
position: relative;
@@ -205,11 +226,13 @@
205226
width: 236px;
206227
z-index: 1;
207228
}
229+
208230
> input.ui-autocomplete-loading,
209231
> input.mage-suggest-state-loading {
210232
background: #fff url("@{baseDir}mui/images/ajax-loader-small.gif") no-repeat 190px 50%;
211233
}
212234
}
235+
213236
.mage-suggest-dropdown {
214237
margin-top: 0;
215238
border-top: 0;
@@ -218,6 +241,7 @@
218241
overflow: auto;
219242
width: 100%;
220243
float: left;
244+
221245
ul {
222246
margin: 0;
223247
padding: 0;

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
color: @footer__color;
2727
margin-top: auto;
2828
padding: 2.6rem 2rem 6rem 3rem;
29+
2930
a {
3031
.lib-link(
3132
@_link-color: @footer-link__color,
@@ -38,6 +39,7 @@
3839
@_link-text-decoration-active: false
3940
);
4041
}
42+
4143
.admin__control-select {
4244
max-width: 52rem;
4345
width: 100%;
@@ -46,6 +48,7 @@
4648

4749
.magento-version {
4850
margin-bottom: .5rem;
51+
4952
strong {
5053
color: @footer-version__color;
5154
}
@@ -56,16 +59,19 @@
5659
margin-bottom: -.2rem;
5760
text-align: left;
5861
position: relative;
62+
5963
.link-copyright {
6064
display: inline-block;
6165
margin-right: .5rem;
6266
text-decoration: none;
6367
vertical-align: top;
68+
6469
&:hover {
6570
&:before {
6671
color: lighten(@color-light-phoenix, 10%);
6772
}
6873
}
74+
6975
&:before {
7076
&:extend(.abs-icon all);
7177
.transition(color);
@@ -76,6 +82,7 @@
7682
position: relative;
7783
top: -.2rem;
7884
}
85+
7986
&:active {
8087
&:before {
8188
.scale();

0 commit comments

Comments
 (0)