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

fixes #8820
This commit is contained in:
Manu Mtz.-Almeida
2016-10-21 17:58:27 +02:00
parent 9895b86015
commit 4be5d8329e
4 changed files with 6 additions and 9 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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,6 +67,7 @@ $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;
}
@@ -74,7 +75,6 @@ $tabs-md-tab-icon-size: 2.4rem !default;
.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;
}

View File

@@ -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 {}