Skip to content

Commit c9dbabe

Browse files
zanileezanilee
committed
MAGETWO-34984: Invert new admin styles scope
1 parent b38d9f6 commit c9dbabe

File tree

30 files changed

+5760
-5818
lines changed

30 files changed

+5760
-5818
lines changed

‎app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ define([
159159

160160
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 45;
161161
$(this).closest('.ui-dialog').css('margin-top', topMargin);
162+
163+
$(this).addClass('admin__scope-old'); // ToDo UI: remove with old styles removal
162164
},
163165
close: function() {
164166
$(this).closest('.ui-dialog').removeClass('ui-dialog-active');

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function __construct(
5656
protected function _prepareForm()
5757
{
5858
/** @var \Magento\Framework\Data\Form $form */
59-
$form = $this->_formFactory->create(['data' => ['id' => 'new_category_form']]);
59+
$form = $this->_formFactory->create(['data' => ['id' => 'new_category_form', 'class' => 'admin__scope-old']]);
6060
$form->setUseContainer($this->getUseContainer());
6161

6262
$form->addField('new_category_messages', 'note', []);

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414
?>
1515
<?php echo $block->getFormInitScripts() ?>
16-
<form id="edit_form" action="<?php echo $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
16+
<form id="edit_form" class="admin__scope-old" action="<?php echo $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
1717
<input name="form_key" type="hidden" value="<?php echo $block->escapeHtml($block->getFormKey()) ?>" />
1818
<?php echo $block->getChildHtml('form') ?>
1919
</form>

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/category-selector.css

Lines changed: 148 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -1,176 +1,177 @@
1-
/**
2-
* Copyright © 2015 Magento. All rights reserved.
3-
* See COPYING.txt for license details.
4-
*/
5-
1+
/**
2+
* Copyright © 2015 Magento. All rights reserved.
3+
* See COPYING.txt for license details.
4+
*/
5+
66
.field-category_ids .category-select {
7-
margin: 0 0 6px 0;
8-
padding: 2px;
9-
width: 67.999999997%;
10-
}
11-
7+
margin: 0 0 6px;
8+
padding: 2px;
9+
width: 67.999999997%;
10+
}
11+
1212
.mage-new-category-dialog .category-select {
13-
width: 100%;
14-
padding: 0;
15-
}
16-
13+
padding: 0;
14+
width: 100%;
15+
}
16+
1717
.field-category_ids .mage-suggest-inner {
18-
padding-right: 27px;
19-
}
20-
18+
padding-right: 27px;
19+
}
20+
2121
.field-category_ids .addon > button {
22-
float: right;
23-
margin-left: 2.127659574%;
24-
width: 28.4%;
25-
}
26-
22+
float: right;
23+
margin-left: 2.127659574%;
24+
width: 28.4%;
25+
}
26+
2727
.field-category_ids .mage-suggest-search-label:after,
2828
.mage-new-category-dialog .mage-suggest-search-label:after {
29-
position: absolute;
30-
top: 0;
31-
right: 5px;
32-
font-family: 'MUI-Icons';
33-
font-style: normal;
34-
speak: none;
35-
font-weight: normal;
36-
-webkit-font-smoothing: antialiased;
37-
content: '\e013'; /* unordered list icon */
38-
font-size: 20px;
39-
color: #b2b2b2;
40-
}
41-
42-
/* Remove search icon for category search suggest field */
29+
color: #b2b2b2;
30+
content: '\e013'; /* unordered list icon */
31+
font-family: 'MUI-Icons';
32+
font-size: 20px;
33+
-webkit-font-smoothing: antialiased;
34+
font-style: normal;
35+
font-weight: normal;
36+
position: absolute;
37+
right: 5px;
38+
speak: none;
39+
top: 0;
40+
}
41+
42+
/* Remove search icon for category search suggest field */
4343
.field-category_ids .category-select:after,
4444
.mage-new-category-dialog .category-select:after {
45-
display: none;
46-
}
47-
48-
.mage-suggest-search-label {
49-
display: block;
50-
}
51-
45+
display: none;
46+
}
47+
48+
.admin__scope-old .mage-suggest-search-label {
49+
display: block;
50+
}
51+
5252
.mage-suggest-search-label input {
53-
border: none;
54-
}
55-
56-
/* Category Selector in "Create New Category" popup */
53+
border: none;
54+
}
55+
56+
/* Category Selector in "Create New Category" popup */
5757
.mage-new-category-dialog .mage-suggest {
58-
border: none;
59-
box-shadow: none;
60-
}
61-
58+
border: none;
59+
box-shadow: none;
60+
}
61+
6262
.mage-new-category-dialog .mage-suggest .mage-suggest-inner {
63-
padding: 0;
64-
}
65-
63+
padding: 0;
64+
}
65+
6666
.mage-new-category-dialog .mage-suggest-search-field input.mage-suggest-state-loading {
67-
padding-right: 15px;
68-
}
69-
67+
padding-right: 15px;
68+
}
69+
7070
.mage-new-category-dialog .mage-suggest-choices {
71-
position: relative;
72-
padding: 2px 22px 2px 2px;
73-
background-color: #fff;
74-
border: 1px solid #ccc;
75-
border-radius: 3px;
76-
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
77-
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
78-
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
79-
}
80-
71+
background-color: #fff;
72+
border: 1px solid #ccc;
73+
border-radius: 3px;
74+
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
75+
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
76+
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
77+
padding: 2px 22px 2px 2px;
78+
position: relative;
79+
}
80+
8181
.mage-new-category-dialog .ui-dialog-content,
8282
.mage-new-category-dialog .ui-dialog-content form {
83-
overflow: visible;
84-
}
85-
83+
overflow: visible;
84+
}
85+
8686
.mage-new-category-dialog .mage-suggest-inner {
87-
padding: 2px 22px 2px 2px;
88-
}
89-
87+
padding: 2px 22px 2px 2px;
88+
}
89+
9090
.mage-suggest-choices {
91-
margin: 0;
92-
padding: 0;
93-
list-style: none;
94-
}
95-
91+
list-style: none;
92+
margin: 0;
93+
padding: 0;
94+
}
95+
9696
.mage-suggest-choices > li {
97-
display: inline-block;
98-
}
99-
97+
display: inline-block;
98+
}
99+
100100
.mage-suggest-search-field {
101-
width: 100%;
102-
white-space: nowrap;
103-
margin: 0;
104-
padding: 0;
105-
}
106-
101+
margin: 0;
102+
padding: 0;
103+
white-space: nowrap;
104+
width: 100%;
105+
}
106+
107107
.mage-suggest-search-field input,
108108
.mage-suggest-search-field input:focus,
109109
.mage-suggest-search-field input:active {
110-
width: 100%;
111-
height: 22px;
112-
line-height: 22px;
113-
border: 0 none;
114-
box-shadow: none;
115-
padding: 0 3px;
116-
}
117-
110+
border: 0 none;
111+
box-shadow: none;
112+
height: 22px;
113+
line-height: 22px;
114+
padding: 0 3px;
115+
width: 100%;
116+
}
117+
118118
.mage-suggest-search-field input.mage-suggest-state-loading {
119-
background: #fff url('images/spinner.gif') no-repeat 100%;
120-
padding-right: 22px;
121-
position: relative;
122-
z-index: 1;
123-
}
124-
125-
.mage-suggest-choice {
126-
position: relative;
127-
background: #cdecf6;
128-
border: 1px solid #a7cedb;
129-
border-radius: 3px;
130-
padding: 2px 22px 1px 9px;
131-
margin: 1px 2px 1px 0;
132-
vertical-align: top;
133-
cursor: default;
134-
-moz-transition: background .3s;
135-
-webkit-transition: background .3s;
136-
transition: background .3s;
137-
}
138-
119+
background: #fff url('images/spinner.gif') no-repeat 100%;
120+
padding-right: 22px;
121+
position: relative;
122+
z-index: 1;
123+
}
124+
125+
.admin__scope-old .mage-suggest-choice {
126+
background: #cdecf6;
127+
border: 1px solid #a7cedb;
128+
border-radius: 3px;
129+
cursor: default;
130+
height: auto;
131+
margin: 1px 2px 1px 0;
132+
padding: 2px 22px 1px 9px;
133+
position: relative;
134+
-webkit-transition: background .3s;
135+
-moz-transition: background .3s;
136+
transition: background .3s;
137+
vertical-align: top;
138+
}
139+
139140
.mage-suggest-choice:hover {
140-
background: #aae3f5;
141-
}
142-
141+
background: #aae3f5;
142+
}
143+
143144
.mage-suggest-choice-close {
144-
position: absolute;
145-
top: 0;
146-
right: 0;
147-
bottom: 0;
148-
width: 20px;
149-
line-height: 16px;
150-
text-align: center;
151-
color: #7b94a1;
152-
cursor: pointer;
153-
}
154-
145+
bottom: 0;
146+
color: #7b94a1;
147+
cursor: pointer;
148+
line-height: 16px;
149+
position: absolute;
150+
right: 0;
151+
text-align: center;
152+
top: 0;
153+
width: 20px;
154+
}
155+
155156
.mage-suggest-choice-close:hover {
156-
color: #000;
157-
}
158-
157+
color: #000;
158+
}
159+
159160
.mage-suggest-choice-close:before {
160-
font-family: 'MUI-Icons';
161-
font-style: normal;
162-
speak: none;
163-
font-weight: normal;
164-
-webkit-font-smoothing: antialiased;
165-
content: '\e07d'; /* close icon */
166-
font-size: 6px;
167-
}
168-
161+
content: '\e07d'; /* close icon */
162+
font-family: 'MUI-Icons';
163+
font-size: 6px;
164+
-webkit-font-smoothing: antialiased;
165+
font-style: normal;
166+
font-weight: normal;
167+
speak: none;
168+
}
169+
169170
.mage-suggest-no-records {
170-
display: inline-block;
171-
padding: 10px;
172-
}
173-
171+
display: inline-block;
172+
padding: 10px;
173+
}
174+
174175
.ui-helper-hidden-accessible {
175-
display: none;
176-
}
176+
display: none;
177+
}

‎app/code/Magento/Catalog/view/adminhtml/web/js/custom-options.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ define([
137137

138138
var topMargin = $(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 135;
139139
$(this).closest('.ui-dialog').css('margin-top', topMargin);
140+
141+
$(this).addClass('admin__scope-old'); // ToDo UI: remove with old styles removal
140142
},
141143
close: function () {
142144
$(this).closest('.ui-dialog').removeClass('ui-dialog-active');

0 commit comments

Comments
 (0)