From 2df495b6e2465082a8460a78a325c64cafa0438c Mon Sep 17 00:00:00 2001 From: Ionitron Date: Wed, 5 Jul 2017 15:08:07 -0400 Subject: [PATCH] fix(themes): use correct default app-direction --- packages/core/src/themes/ionic.globals.scss | 2 +- packages/core/src/themes/ionic.mixins.scss | 6 +++--- packages/ionic-angular/src/themes/ionic.globals.scss | 2 +- packages/ionic-angular/src/themes/ionic.mixins.scss | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/core/src/themes/ionic.globals.scss b/packages/core/src/themes/ionic.globals.scss index f030a16061..664a16dd48 100644 --- a/packages/core/src/themes/ionic.globals.scss +++ b/packages/core/src/themes/ionic.globals.scss @@ -12,7 +12,7 @@ // Global app direction -$app-direction: null !default; +$app-direction: ltr !default; // Global font path diff --git a/packages/core/src/themes/ionic.mixins.scss b/packages/core/src/themes/ionic.mixins.scss index 799cdfd60e..d13721e2ff 100644 --- a/packages/core/src/themes/ionic.mixins.scss +++ b/packages/core/src/themes/ionic.mixins.scss @@ -156,7 +156,7 @@ } @mixin multi-dir() { - @if $app-direction == null { + @if $app-direction == multi { $root: #{&}; @at-root [dir="ltr"], [dir="rtl"] { #{$root} { @@ -169,7 +169,7 @@ } @mixin rtl() { - @if $app-direction == null { + @if $app-direction == multi { $root: #{&}; @at-root [dir="rtl"] { #{$root} { @@ -182,7 +182,7 @@ } @mixin ltr() { - @if $app-direction == null { + @if $app-direction == multi { $root: #{&}; @at-root [dir="ltr"] { #{$root} { diff --git a/packages/ionic-angular/src/themes/ionic.globals.scss b/packages/ionic-angular/src/themes/ionic.globals.scss index f030a16061..664a16dd48 100644 --- a/packages/ionic-angular/src/themes/ionic.globals.scss +++ b/packages/ionic-angular/src/themes/ionic.globals.scss @@ -12,7 +12,7 @@ // Global app direction -$app-direction: null !default; +$app-direction: ltr !default; // Global font path diff --git a/packages/ionic-angular/src/themes/ionic.mixins.scss b/packages/ionic-angular/src/themes/ionic.mixins.scss index 799cdfd60e..d13721e2ff 100644 --- a/packages/ionic-angular/src/themes/ionic.mixins.scss +++ b/packages/ionic-angular/src/themes/ionic.mixins.scss @@ -156,7 +156,7 @@ } @mixin multi-dir() { - @if $app-direction == null { + @if $app-direction == multi { $root: #{&}; @at-root [dir="ltr"], [dir="rtl"] { #{$root} { @@ -169,7 +169,7 @@ } @mixin rtl() { - @if $app-direction == null { + @if $app-direction == multi { $root: #{&}; @at-root [dir="rtl"] { #{$root} { @@ -182,7 +182,7 @@ } @mixin ltr() { - @if $app-direction == null { + @if $app-direction == multi { $root: #{&}; @at-root [dir="ltr"] { #{$root} {