Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.2-develop
Browse files Browse the repository at this point in the history
Accepted Public Pull Requests:
 - magento#20439: [Backport]  Meassage icon is not proper aligned (by @saphaljha)
 - magento#20433: [Backport] Missing echo of php vars in widget template file - tabshoriz.phtml (by @irajneeshgupta)
 - magento#19400: [Backport]Fix-issue-19399-Add product customization option collapsible design issue (by @speedy008)
 - magento#20272: Fixed-Review-Details-Detailed-Rating-misaligned (by @amol2jcommerce)
 - magento#20369: 'Fixes-for-customer-login-page-input-field' :: On customer login page� (by @nainesh2jcommerce)
 - magento#20375: [Backport] [Forwardport]Fix issue 19902 - Store View label and Dropdown misaligned  (by @speedy008)


Fixed GitHub Issues:
 - magento#19399: Add product customization option collapsible design issue (reported by @speedy008) has been fixed in magento#19400 by @speedy008 in 2.2-develop branch
   Related commits:
     1. 731fd07

 - magento#20120: Review Details Detailed Rating misaligned (reported by @priti2jcommerce) has been fixed in magento#20272 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. a987dc5

 - magento#20172: On customer login page input field are short width on tablet view (reported by @nainesh2jcommerce) has been fixed in magento#20369 by @nainesh2jcommerce in 2.2-develop branch
   Related commits:
     1. 4de166f
  • Loading branch information
magento-engcom-team authored Jan 23, 2019
2 parents 57175a5 + f5b617a commit 8fdae10
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
<?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
<li>
<a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
<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) ?>">
<span>
<span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
<span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,24 @@
}
}
}
td.admin__collapsible-block-wrapper {
.admin__collapsible-title {
&:before {
content: @icon-expand-open__content;
}
}
&._show {
.admin__collapsible-title {
&:before {
content: @icon-expand-close__content;
}
}
}
}
}



&.fieldset-wrapper {
border-bottom: 1px solid @collapsible__border-color;
padding: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
// ToDo UI: Consist old styles, should be changed with new design

.store-switcher {
color: @text__color; // ToDo UI: Delete with admin scope
float: left;
font-size: round(@font-size__base - .1rem, 1);
margin-top: .7rem;

.admin__action-dropdown {
background-color: @page-main-actions__background-color;
margin-left: .5em;
Expand Down Expand Up @@ -47,8 +42,8 @@
width: 7px;
}
&::-webkit-scrollbar-thumb {
border-radius: 4px;
background-color: rgba(0, 0, 0, .5);
border-radius: 4px;
}

li {
Expand Down Expand Up @@ -116,6 +111,12 @@
}
}
}

color: @text__color; // ToDo UI: Delete with admin scope
float: left;
font-size: round(@font-size__base - .1rem, 1);
margin-top: .59rem;

}

.store-switcher-label {
Expand Down Expand Up @@ -239,7 +240,6 @@

.store-switcher-label {
display: inline-block;
margin-top: @indent__s;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
.admin__field-control {
direction: rtl;
display: inline-block;
margin: -4px 0 0;
margin: -2px 0 0;
unicode-bidi: bidi-override;
vertical-align: top;
width: 125px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
position: absolute;
speak: none;
text-shadow: none;
top: 1.3rem;
top: 1.5rem;
width: auto;
}
}
Expand Down Expand Up @@ -110,7 +110,7 @@
content: @alert-icon__error__content;
font-size: @alert-icon__error__font-size;
left: 2.2rem;
margin-top: 0.5rem;
margin-top: .5rem;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@

> .field {
> .control {
width: 55%;
width: 80%;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
.fieldset {
> .field {
> .control {
width: 55%;
width: 80%;
}
}
}
Expand Down

0 comments on commit 8fdae10

Please sign in to comment.