Skip to content
Snippets Groups Projects
Unverified Commit f28dbc0c authored by Magento 2 Team's avatar Magento 2 Team Committed by GitHub
Browse files

:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento/magento2#13025: fixed issue prices aren't readable when using custom price symbol (by @pradeep-wagento)


Fixed GitHub Issues:
 - magento/magento2#12430: While assigning prices to configurable products, prices aren's readable when using custom price symbol. (reported by @quisse) has been fixed in magento/magento2#13025 by @pradeep-wagento in 2.2-develop branch
   Related commits:
     1. b3c0a3f3
parents ccf2a782 069184fb
No related merge requests found
...@@ -19,10 +19,30 @@ ...@@ -19,10 +19,30 @@
.currency-addon { .currency-addon {
position: relative; position: relative;
border: 1px solid #adadad;
display: -webkit-inline-flex;
display: -ms-inline-flexbox;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
display: inline-flex;
flex-flow: row nowrap;
width: 100%;
position: relative;
.admin__control-text { .admin__control-text {
border-width: 1px 1px 1px 0; appearence: none;
padding-left: @currency-addon-symbol__width + .2; -webkit-flex-grow: 1;
flex-grow: 1;
-ms-flex-order: 1;
-webkit-order: 1;
order: 1;
-webkit-flex-shrink: 1;
flex-shrink: 1;
background-color: transparent;
border-color: transparent;
box-shadow: none;
vertical-align: top;
&:focus { &:focus {
+ .currency-symbol { + .currency-symbol {
...@@ -31,18 +51,29 @@ ...@@ -31,18 +51,29 @@
} }
} }
label.error {
position: absolute;
left: 0;
top: 33px;
}
.currency-symbol { .currency-symbol {
border: solid @currency-addon-symbol__border-color; border: solid @currency-addon-symbol__border-color;
border-width: 0 0 0 1px; border-width: 0;
box-sizing: border-box; box-sizing: border-box;
color: @currency-addon-symbol__color; color: @currency-addon-symbol__color;
height: @currency-addon-symbol__height; height: @currency-addon-symbol__height;
left: 0;
padding: 7px 0 0 @indent__xs; padding: 7px 0 0 @indent__xs;
position: absolute; position: static;
top: 0;
transition: @smooth__border-color; transition: @smooth__border-color;
width: @currency-addon-symbol__width; -webkit-flex-basis: auto;
flex-basis: auto;
-webkit-flex-grow: 0;
flex-grow: 0;
-webkit-flex-shrink: 0;
flex-shrink: 0;
z-index: 1;
order: 0;
} }
._error & { ._error & {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment