Skip to content

Commit 4be5d83

Browse files
committed
fix(tabs): $tabs-md-tab-font-size is taken into account
fixes #8820
1 parent 9895b86 commit 4be5d83

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

src/components/range/range.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
// --------------------------------------------------
55

66
.item-range .item-inner {
7-
width: 100%;
8-
97
overflow: visible;
108
}
119

1210
.item-range .input-wrapper {
13-
width: 100%;
14-
1511
overflow: visible;
1612

1713
flex-direction: column;
14+
15+
width: 100%;
1816
}
1917

2018
.item-range ion-range {

src/components/tabs/tabs.ios.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ $tabs-ios-tab-icon-size: 30px !default;
4949
max-width: $tabs-ios-tab-max-width;
5050
min-height: $tabs-ios-tab-min-height;
5151

52+
font-size: $tabs-ios-tab-font-size;
5253
color: $tabs-ios-tab-color;
5354
}
5455

@@ -62,8 +63,6 @@ $tabs-ios-tab-icon-size: 30px !default;
6263
margin-bottom: 0;
6364

6465
min-height: $tabs-ios-tab-font-size + 1;
65-
66-
font-size: $tabs-ios-tab-font-size;
6766
}
6867

6968
.tabs-ios .has-title-only .tab-button-text {

src/components/tabs/tabs.md.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $tabs-md-tab-text-margin: 6px 0 !default;
4040
$tabs-md-tab-text-capitalization: none !default;
4141

4242
/// @prop - Transform for the tab button text
43-
$tabs-md-tab-text-transform: scale(.85) !default;
43+
$tabs-md-tab-text-transform: scale($tabs-md-tab-font-size / $tabs-md-tab-font-size-active) !default;
4444

4545
/// @prop - Transform origin for the tab button text
4646
$tabs-md-tab-text-transform-origin: bottom center !default;
@@ -67,14 +67,14 @@ $tabs-md-tab-icon-size: 2.4rem !default;
6767

6868
min-height: $tabs-md-tab-min-height;
6969

70+
font-size: $tabs-md-tab-font-size-active;
7071
font-weight: $tabs-md-tab-font-weight;
7172
color: $tabs-md-tab-color;
7273
}
7374

7475
.tabs-md .tab-button[aria-selected=true] {
7576
padding: $tabs-md-tab-padding-active;
7677

77-
font-size: $tabs-md-tab-font-size-active;
7878
color: $tabs-md-tab-color-active;
7979
}
8080

src/util/mock-providers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ export const mockDeepLinkConfig = function(links?: any[]): DeepLinkConfig {
400400

401401
export const mockHaptic = function (): Haptic {
402402
return new Haptic(null);
403-
}
403+
};
404404

405405
export class MockView {}
406406
export class MockView1 {}

0 commit comments

Comments
 (0)