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

2
src/components/toolbar/toolbar-button.scss
View File

@@ -4,6 +4,7 @@
// --------------------------------------------------
.bar-button {
@include text-align(center);
@include appearance(none);
position: relative;
@@ -13,7 +14,6 @@
padding: 0;
line-height: 1;
text-align: center;
text-overflow: ellipsis;
text-transform: none;
white-space: nowrap;

11
src/components/toolbar/toolbar.ios.scss
View File

@@ -97,9 +97,10 @@ $toolbar-button-ios-strong-font-weight: 600 !default;
}
.toolbar-title-ios {
@include text-align($toolbar-ios-title-text-align);
font-size: $toolbar-ios-title-font-size;
font-weight: $toolbar-ios-title-font-weight;
text-align: $toolbar-ios-title-text-align;
color: $toolbar-ios-title-text-color;
pointer-events: auto;
@@ -156,15 +157,15 @@ $toolbar-button-ios-strong-font-weight: 600 !default;
}
.bar-buttons-ios[end] {
order: map-get($toolbar-order-ios, buttons-end);
@include text-align(end);
text-align: right;
order: map-get($toolbar-order-ios, buttons-end);
}
.bar-buttons-ios[right] {
order: map-get($toolbar-order-ios, buttons-right);
@include text-align(right);
text-align: right;
order: map-get($toolbar-order-ios, buttons-right);
}

11
src/components/toolbar/toolbar.md.scss
View File

@@ -169,15 +169,15 @@ $toolbar-button-md-strong-font-weight: bold !default;
}
.bar-buttons-md[end] {
order: map-get($toolbar-order-md, buttons-end);
@include text-align(end);
text-align: right;
order: map-get($toolbar-order-md, buttons-end);
}
.bar-buttons-md[right] {
order: map-get($toolbar-order-md, buttons-right);
@include text-align(right);
text-align: right;
order: map-get($toolbar-order-md, buttons-right);
}
@@ -346,12 +346,13 @@ $toolbar-button-md-strong-font-weight: bold !default;
}
.back-button-icon-md {
@include text-align(start);
margin: 0;
padding: 0 6px;
font-size: 2.4rem;
font-weight: normal;
text-align: left;
}

11
src/components/toolbar/toolbar.wp.scss
View File

@@ -129,15 +129,15 @@ $toolbar-button-wp-strong-font-weight: bold !default;
}
.bar-buttons-wp[end] {
order: map-get($toolbar-order-wp, buttons-end);
@include text-align(end);
text-align: right;
order: map-get($toolbar-order-wp, buttons-end);
}
.bar-buttons-wp[right] {
order: map-get($toolbar-order-wp, buttons-right);
@include text-align(right);
text-align: right;
order: map-get($toolbar-order-wp, buttons-right);
}
@@ -300,12 +300,13 @@ $toolbar-button-wp-strong-font-weight: bold !default;
}
.back-button-icon-wp {
@include text-align(start);
margin: 0;
padding: 0 6px;
font-size: 2.4rem;
font-weight: normal;
text-align: left;
}