javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(rtl): add correct text-align (#11353)

Browse Source 
* fix(rtl): add correct text-align

* feat(text-align): add mixin for backwards compatibility of variables

* fix(text-align): default null not empty string

* fix(text-align): remove default
This commit is contained in:
Amit Moryossef
2017-05-02 18:10:18 +03:00
committed by Brandy Carney
parent 6b42677460
commit 424b15aefd
32 changed files with 134 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/picker/picker.ios.scss
View File

@@ -69,10 +69,9 @@ $picker-button-ios-strong-font-weight: 600 !default;
}
.picker-ios .picker-toolbar-button {
flex: 1;
@include text-align(end);
text-align: right;
text-align: end;
flex: 1;
}
.picker-ios .picker-toolbar-button:last-child .picker-button {
@@ -80,10 +79,9 @@ $picker-button-ios-strong-font-weight: 600 !default;
}
.picker-ios .picker-toolbar-cancel {
font-weight: normal;
@include text-align(start);
text-align: left;
text-align: start;
font-weight: normal;
}
.picker-ios .picker-button,

11
src/components/picker/picker.scss
View File

@@ -87,6 +87,8 @@ ion-picker-cmp {
}
.picker-prefix {
@include text-align(end);
position: relative;
flex: 2;
@@ -94,12 +96,12 @@ ion-picker-cmp {
min-width: 45%;
max-width: 50%;
text-align: right;
text-align: end;
white-space: nowrap;
}
.picker-suffix {
@include text-align(start);
position: relative;
flex: 2;
@@ -107,13 +109,13 @@ ion-picker-cmp {
min-width: 45%;
max-width: 50%;
text-align: left;
text-align: start;
white-space: nowrap;
}
// contain property is supported by Chrome
.picker-opt {
@include text-align(center);
position: absolute;
top: 0;
left: 0;
@@ -122,7 +124,6 @@ ion-picker-cmp {
width: 100%;
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;

10
src/components/picker/picker.wp.scss
View File

@@ -70,17 +70,15 @@ $picker-wp-option-selected-color: color($colors-wp, primary) !defaul
}
.picker-wp .picker-toolbar-button {
flex: 1;
@include text-align(end);
text-align: right;
text-align: end;
flex: 1;
}
.picker-wp .picker-toolbar-cancel {
font-weight: normal;
@include text-align(start);
text-align: left;
text-align: start;
font-weight: normal;
}
.picker-wp .picker-button,