Skip to content

Commit 1ad05f8

Browse files
maxwhite-uamaxwhite-ua
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-53349
2 parents 9a42540 + 84e6776 commit 1ad05f8

File tree

36 files changed

+2309
-191
lines changed

36 files changed

+2309
-191
lines changed

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,27 @@ require([
2222
}
2323

2424
function disableFieldEditMode(fieldId) {
25-
byId(fieldId).prop('disabled', true);
25+
var field = byId(fieldId);
26+
27+
field.prop('disabled', true);
28+
29+
if (field.next().hasClass('addafter')) {
30+
field.parent().addClass('_update-attributes-disabled');
31+
}
2632

2733
if (byId(fieldId + '_hidden').length) {
2834
byId(fieldId + '_hidden').prop('disabled', true);
2935
}
3036
}
3137

3238
function enableFieldEditMode(fieldId) {
33-
byId(fieldId).prop('disabled', false);
39+
var field = byId(fieldId);
40+
41+
field.prop('disabled', false);
42+
43+
if (field.parent().hasClass('_update-attributes-disabled')) {
44+
field.parent().removeClass('_update-attributes-disabled');
45+
}
3446

3547
if (byId(fieldId + '_hidden').length) {
3648
byId(fieldId + '_hidden').prop('disabled', false);

‎app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
1414
<?php if ($wishlistHelper->isAllow()) : ?>
1515
<div class="block block-wishlist" data-bind="scope: 'wishlist'">
1616
<div class="block-title">
17-
<strong><?php /* @escapeNotVerified */ echo $block->getTitle(); ?></strong>
17+
<strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $block->getTitle(); ?></strong>
1818
<!-- ko if: wishlist().counter -->
1919
<span data-bind="text: wishlist().counter" class="counter"></span>
2020
<!-- /ko -->

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@
321321
margin-bottom: 4.5rem;
322322

323323
// Section title
324-
> a, // ToDo UI: Should be deleted after template changes a -> strong.submenu-group-title
325324
.submenu-group-title {
326325
color: @submenu-section-label__color;
327326
display: block;
@@ -502,6 +501,12 @@
502501
}
503502
}
504503
}
504+
505+
// This part hides Submenu Group Titles only for menus with single groups.
506+
.submenu .column:only-of-type .submenu-group-title,
507+
.level-0 > .submenu > ul > .level-1:only-of-type > .submenu-group-title {
508+
display: none;
509+
}
505510
}
506511

507512
.admin__menu-overlay {
@@ -526,3 +531,4 @@
526531
}
527532
}
528533
}
534+

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

Lines changed: 97 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,25 +64,115 @@
6464
}
6565
}
6666

67+
.field-price {
68+
label {
69+
&.mage-error {
70+
position: static;
71+
}
72+
}
73+
}
74+
6775
.field-price,
6876
.field-special_price,
6977
.field-gift_wrapping_price,
7078
.field-msrp,
7179
.field-cost,
7280
.field-gift_wrapping_price {
81+
&:not(.field-weight) {
82+
.addon {
83+
.lib-vendor-prefix-display(inline-flex);
84+
.lib-vendor-prefix-flex-direction(row);
85+
color: #303030;
86+
display: inline-flex;
87+
flex-flow: row nowrap;
88+
margin: 0 0 35px;
89+
position: relative;
90+
width: 100%;
91+
z-index: 1;
92+
93+
&._update-attributes-disabled {
94+
background: #f4f4f4;
95+
border-color: #d6d6d6;
96+
97+
.addafter {
98+
strong {
99+
opacity: .5;
100+
}
101+
}
102+
}
103+
104+
input[type="text"] {
105+
border: solid #adadad;
106+
border-width: 1px 1px 1px 0;
107+
108+
&[disabled] {
109+
+ .addafter {
110+
border-color: #d0d0d0;
111+
}
112+
113+
&.mage-error {
114+
+ .addafter {
115+
border-color: #eb8d8d !important;
116+
}
117+
}
118+
}
119+
}
120+
121+
.addafter {
122+
border: solid #adadad;
123+
border-width: 1px 0 1px 1px;
124+
}
125+
}
126+
}
127+
128+
._update-attributes-disabled {
129+
.admin__control-text {
130+
background: none;
131+
}
132+
}
133+
134+
.admin__control-text {
135+
.lib-css(appearance, none, 1);
136+
.lib-vendor-prefix-flex-basis(auto);
137+
.lib-vendor-prefix-flex-grow(1);
138+
.lib-vendor-prefix-flex-shrink(1);
139+
background: none;
140+
border: 0;
141+
}
142+
73143
.control {
74-
.addon > input {
75-
padding-left: 23px;
144+
.admin__control-text {
145+
&[disabled] {
146+
background: none;
147+
}
76148
}
149+
}
77150

78-
.addafter {
79-
> strong {
80-
left: 5px;
81-
position: absolute;
82-
top: 3px;
151+
.addafter {
152+
.lib-vendor-prefix-flex-basis(auto);
153+
.lib-vendor-prefix-flex-grow(0);
154+
.lib-vendor-prefix-flex-shrink(0);
155+
.lib-vendor-prefix-order(0);
156+
position: relative;
157+
z-index: 0;
158+
159+
strong {
160+
padding-top: 4px;
161+
position: relative;
162+
vertical-align: top;
163+
z-index: 1;
164+
165+
+ strong {
166+
padding-left: 0;
83167
}
84168
}
85169
}
170+
171+
.attribute-change-checkbox {
172+
left: 0;
173+
position: absolute;
174+
top: 35px;
175+
}
86176
}
87177

88178
.field.type-price,

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,7 @@
221221
}
222222

223223
input[type='checkbox'] {
224-
-moz-appearance: none;
225-
-webkit-appearance: none;
226-
appearance: none;
224+
.lib-css(appearance, none, 1);
227225
background: @color-white;
228226
border: 1px solid @color-gray68;
229227
border-radius: 2px;

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

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,43 @@
340340
}
341341

342342
.weight-switcher {
343+
margin-bottom: 18px;
344+
343345
.addafter {
344346
margin-top: 30px;
347+
position: absolute;
348+
}
349+
350+
.mage-error {
351+
+ .addafter {
352+
+ .admin__addon-suffix,
353+
+ .admin__addon-suffix:hover {
354+
&:before {
355+
border-color: #e22626 !important;
356+
}
357+
}
358+
}
359+
360+
&[disabled] {
361+
border-color: #eb8d8d !important;
362+
}
363+
}
364+
}
365+
366+
.field-weight {
367+
.addon {
368+
+ .mage-error {
369+
margin-top: 14px;
370+
}
345371
}
346372
}
347373
}
348374

349-
.field .control input[type='text'][disabled] ~ .addafter strong,
350-
.field .control select[disabled] ~ .addafter strong {
351-
background-color: #e9e9e9;
375+
.field .control input[type='text'][disabled],
376+
.field .control select[disabled] {
377+
~ .addafter strong {
378+
background-color: #e9e9e9;
379+
}
352380
}
353381

354382
.field-price.addon {

‎app/design/adminhtml/Magento/backend/web/css/source/actions/_actions-dropdown.less

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,7 @@
227227
display: inline-block;
228228

229229
input[type='text'] {
230-
-moz-appearance: none;
231-
-webkit-appearance: none;
232-
appearance: none;
230+
.lib-css(appearance, none, 1);
233231
border: 0;
234232
display: inline;
235233
margin: 0;
@@ -369,9 +367,7 @@
369367
}
370368

371369
.selectmenu-item-action {
372-
-moz-appearance: none;
373-
-webkit-appearance: none;
374-
appearance: none;
370+
.lib-css(appearance, none, 1);
375371
background: transparent;
376372
border: 0;
377373
color: @text__color;

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -858,20 +858,18 @@
858858

859859
input[type="radio"],
860860
input[type="checkbox"] {
861+
.lib-css(appearance, none, 1);
861862
background: #fff;
862-
border: 1px solid #adadad;
863863
border-radius: 2px;
864+
border: 1px solid #adadad;
864865
cursor: pointer;
865866
display: inline-block;
866-
vertical-align: middle;
867-
margin: 0 5px 0 0;
868867
height: 16px;
869-
width: 16px;
868+
margin: 0 5px 0 0;
870869
position: relative;
871-
appearance: none;
872-
-webkit-appearance: none;
873-
-moz-appearance: none;
874870
transition: all 0.1s ease-in;
871+
vertical-align: middle;
872+
width: 16px;
875873

876874
&:focus {
877875
border-color: #007bdb;
@@ -1702,10 +1700,6 @@
17021700
}
17031701
}
17041702

1705-
.field-price .addon input[type="text"] ~ .addafter strong {
1706-
font-size: 18px;
1707-
}
1708-
17091703
.field-weight,
17101704
.field-base_price {
17111705
.addon {
@@ -1718,20 +1712,23 @@
17181712
.field.type-price .addon,
17191713
.field-price .addon,
17201714
.field-special_price .addon,
1715+
.field-gift_wrapping_price .addon,
17211716
.field-msrp .addon {
17221717
direction: rtl;
17231718
}
17241719

17251720
.field.type-price .addon > *,
17261721
.field-price .addon > *,
17271722
.field-special_price .addon > *,
1723+
.field-gift_wrapping_price .addon > *,
17281724
.field-msrp .addon > * {
17291725
direction: ltr;
17301726
}
17311727

17321728
.field.type-price .addon .addafter,
17331729
.field-price .addon .addafter,
17341730
.field-special_price .addon .addafter,
1731+
.field-gift_wrapping_price .addon .addafter,
17351732
.field-msrp .addon .addafter {
17361733
border-width: 1px 0 1px 1px;
17371734
border-radius: 1px 0 0 1px;
@@ -1740,20 +1737,23 @@
17401737
.field.type-price .addon input[type=text]:first-child,
17411738
.field-price .addon input[type=text]:first-child,
17421739
.field-special_price .addon input[type=text]:first-child,
1740+
.field-gift_wrapping_price .addon input[type=text]:first-child,
17431741
.field-msrp .addon input[type=text]:first-child {
17441742
border-radius: 0 1px 1px 0;
17451743
}
17461744

17471745
.field.type-price input:focus,
17481746
.field-price input:focus,
17491747
.field-special_price input:focus,
1748+
.field-gift_wrapping_price input:focus,
17501749
.field-msrp input:focus {
17511750
border-color: #007bdb;
17521751
}
17531752

17541753
.field.type-price input:focus ~ label.addafter,
17551754
.field-price input:focus ~ label.addafter,
17561755
.field-special_price input:focus ~ label.addafter,
1756+
.field-gift_wrapping_price input:focus ~ label.addafter,
17571757
.field-msrp input:focus ~ label.addafter {
17581758
border-color: #007bdb;
17591759
}

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

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎lib/web/css/docs/breadcrumbs.html

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)