fix(tabs): $tabs-md-tab-font-size is taken into account

fixes #8820
ionic-team · Oct 21, 2016 · 4be5d83 · 4be5d83
1 parent 9895b86
commit 4be5d83
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/components/range/range.scss b/src/components/range/range.scss
@@ -4,17 +4,15 @@
 // --------------------------------------------------
 
 .item-range .item-inner {
-  width: 100%;
-
   overflow: visible;
 }
 
 .item-range .input-wrapper {
-  width: 100%;
-
   overflow: visible;
 
   flex-direction: column;
+
+  width: 100%;
 }
 
 .item-range ion-range {

diff --git a/src/components/tabs/tabs.ios.scss b/src/components/tabs/tabs.ios.scss
@@ -49,6 +49,7 @@ $tabs-ios-tab-icon-size:            30px !default;
   max-width: $tabs-ios-tab-max-width;
   min-height: $tabs-ios-tab-min-height;
 
+  font-size: $tabs-ios-tab-font-size;
   color: $tabs-ios-tab-color;
 }
 
@@ -62,8 +63,6 @@ $tabs-ios-tab-icon-size:            30px !default;
   margin-bottom: 0;
 
   min-height: $tabs-ios-tab-font-size + 1;
-
-  font-size: $tabs-ios-tab-font-size;
 }
 
 .tabs-ios .has-title-only .tab-button-text {

diff --git a/src/components/tabs/tabs.md.scss b/src/components/tabs/tabs.md.scss
@@ -40,7 +40,7 @@ $tabs-md-tab-text-margin:              6px 0 !default;
 $tabs-md-tab-text-capitalization:      none !default;
 
 /// @prop - Transform for the tab button text
-$tabs-md-tab-text-transform:           scale(.85) !default;
+$tabs-md-tab-text-transform:           scale($tabs-md-tab-font-size / $tabs-md-tab-font-size-active) !default;
 
 /// @prop - Transform origin for the tab button text
 $tabs-md-tab-text-transform-origin:    bottom center !default;
@@ -67,14 +67,14 @@ $tabs-md-tab-icon-size:                2.4rem !default;
 
   min-height: $tabs-md-tab-min-height;
 
+  font-size: $tabs-md-tab-font-size-active;
   font-weight: $tabs-md-tab-font-weight;
   color: $tabs-md-tab-color;
 }
 
 .tabs-md .tab-button[aria-selected=true] {
   padding: $tabs-md-tab-padding-active;
 
-  font-size: $tabs-md-tab-font-size-active;
   color: $tabs-md-tab-color-active;
 }
 

diff --git a/src/util/mock-providers.ts b/src/util/mock-providers.ts
@@ -400,7 +400,7 @@ export const mockDeepLinkConfig = function(links?: any[]): DeepLinkConfig {
 
 export const mockHaptic = function (): Haptic {
   return new Haptic(null);
-}
+};
 
 export class MockView {}
 export class MockView1 {}