Skip to content

Commit 8fdae10

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #20439: [Backport] Meassage icon is not proper aligned (by @saphaljha) - #20433: [Backport] Missing echo of php vars in widget template file - tabshoriz.phtml (by @irajneeshgupta) - #19400: [Backport]Fix-issue-19399-Add product customization option collapsible design issue (by @speedy008) - #20272: Fixed-Review-Details-Detailed-Rating-misaligned (by @amol2jcommerce) - #20369: 'Fixes-for-customer-login-page-input-field' :: On customer login page� (by @nainesh2jcommerce) - #20375: [Backport] [Forwardport]Fix issue 19902 - Store View label and Dropdown misaligned (by @speedy008) Fixed GitHub Issues: - #19399: Add product customization option collapsible design issue (reported by @speedy008) has been fixed in #19400 by @speedy008 in 2.2-develop branch Related commits: 1. 731fd07 - #20120: Review Details Detailed Rating misaligned (reported by @priti2jcommerce) has been fixed in #20272 by @amol2jcommerce in 2.2-develop branch Related commits: 1. a987dc5 - #20172: On customer login page input field are short width on tablet view (reported by @nainesh2jcommerce) has been fixed in #20369 by @nainesh2jcommerce in 2.2-develop branch Related commits: 1. 4de166f
2 parents 57175a5 + f5b617a commit 8fdae10

File tree

7 files changed

+29
-13
lines changed

7 files changed

+29
-13
lines changed

app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
1919
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
2020
<li>
21-
<a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
21+
<a href="<?= $block->escapeHtmlAttr($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>" class="<?= $block->escapeHtmlAttr($_tabClass) ?>" data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
2222
<span>
2323
<span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
2424
<span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,24 @@
127127
}
128128
}
129129
}
130+
td.admin__collapsible-block-wrapper {
131+
.admin__collapsible-title {
132+
&:before {
133+
content: @icon-expand-open__content;
134+
}
135+
}
136+
&._show {
137+
.admin__collapsible-title {
138+
&:before {
139+
content: @icon-expand-close__content;
140+
}
141+
}
142+
}
143+
}
130144
}
131145

146+
147+
132148
&.fieldset-wrapper {
133149
border-bottom: 1px solid @collapsible__border-color;
134150
padding: 0;

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
// ToDo UI: Consist old styles, should be changed with new design
1111

1212
.store-switcher {
13-
color: @text__color; // ToDo UI: Delete with admin scope
14-
float: left;
15-
font-size: round(@font-size__base - .1rem, 1);
16-
margin-top: .7rem;
17-
1813
.admin__action-dropdown {
1914
background-color: @page-main-actions__background-color;
2015
margin-left: .5em;
@@ -47,8 +42,8 @@
4742
width: 7px;
4843
}
4944
&::-webkit-scrollbar-thumb {
50-
border-radius: 4px;
5145
background-color: rgba(0, 0, 0, .5);
46+
border-radius: 4px;
5247
}
5348

5449
li {
@@ -116,6 +111,12 @@
116111
}
117112
}
118113
}
114+
115+
color: @text__color; // ToDo UI: Delete with admin scope
116+
float: left;
117+
font-size: round(@font-size__base - .1rem, 1);
118+
margin-top: .59rem;
119+
119120
}
120121

121122
.store-switcher-label {
@@ -239,7 +240,6 @@
239240

240241
.store-switcher-label {
241242
display: inline-block;
242-
margin-top: @indent__s;
243243
}
244244
}
245245

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
.admin__field-control {
3535
direction: rtl;
3636
display: inline-block;
37-
margin: -4px 0 0;
37+
margin: -2px 0 0;
3838
unicode-bidi: bidi-override;
3939
vertical-align: top;
4040
width: 125px;

app/design/adminhtml/Magento/backend/web/css/source/components/_messages.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
position: absolute;
7777
speak: none;
7878
text-shadow: none;
79-
top: 1.3rem;
79+
top: 1.5rem;
8080
width: auto;
8181
}
8282
}
@@ -110,7 +110,7 @@
110110
content: @alert-icon__error__content;
111111
font-size: @alert-icon__error__font-size;
112112
left: 2.2rem;
113-
margin-top: 0.5rem;
113+
margin-top: .5rem;
114114
}
115115
}
116116

app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421

422422
> .field {
423423
> .control {
424-
width: 55%;
424+
width: 80%;
425425
}
426426
}
427427
}

app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@
371371
.fieldset {
372372
> .field {
373373
> .control {
374-
width: 55%;
374+
width: 80%;
375375
}
376376
}
377377
}

0 commit comments

Comments
 (0)