Skip to content

Commit 32e9bdd

Browse files
committed
feat(badge): remove default values.
1 parent 823e9f1 commit 32e9bdd

File tree

3 files changed

+20
-25
lines changed

3 files changed

+20
-25
lines changed

core/src/components/tab-button/tab-button.ionic.scss

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -97,28 +97,23 @@
9797
}
9898

9999
:host ::slotted(ion-badge.badge-vertical-top) {
100-
@include globals.position(-2px, null, null, null);
100+
@include globals.position(-2px);
101101
}
102102

103103
:host ::slotted(ion-badge.badge-vertical-top:empty) {
104-
@include globals.position(calc(globals.$ion-scale-100 * -1), null, null, null);
104+
@include globals.position(calc(globals.$ion-scale-100 * -1));
105105
}
106106

107107
:host ::slotted(ion-badge.badge-vertical-bottom) {
108-
@include globals.position(calc(50% - globals.$ion-scale-200), null, null, null);
108+
@include globals.position(calc(50% - globals.$ion-scale-200));
109109
}
110110

111111
:host ::slotted(ion-badge.badge-vertical-bottom:empty) {
112-
@include globals.position(calc(50% - globals.$ion-scale-100), null, null, null);
112+
@include globals.position(calc(50% - globals.$ion-scale-100));
113113
}
114114

115115
:host ::slotted(ion-badge[vertical]:not(:empty)) {
116-
@include globals.padding(
117-
globals.$ion-scale-100,
118-
globals.$ion-scale-100,
119-
globals.$ion-scale-100,
120-
globals.$ion-scale-100
121-
);
116+
@include globals.padding(globals.$ion-scale-100);
122117

123118
display: flex;
124119

@@ -127,13 +122,13 @@
127122
}
128123

129124
:host(.tab-layout-icon-bottom) ::slotted(ion-badge.badge-vertical-top) {
130-
@include globals.position(calc(50% - globals.$ion-scale-100), null, null, null);
125+
@include globals.position(calc(50% - globals.$ion-scale-100));
131126
}
132127

133128
:host(.tab-layout-icon-bottom) ::slotted(ion-badge.badge-vertical-bottom) {
134-
@include globals.position(calc(50% + globals.$ion-scale-100), null, null, null);
129+
@include globals.position(calc(50% + globals.$ion-scale-100));
135130
}
136131

137132
:host(.tab-layout-icon-bottom) ::slotted(ion-badge.badge-vertical-bottom:empty) {
138-
@include globals.position(calc(50% + 14px), null, null, null);
133+
@include globals.position(calc(50% + 14px));
139134
}

core/src/components/tab-button/tab-button.ios.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@
3838
}
3939

4040
:host ::slotted(ion-badge.badge-vertical-top) {
41-
@include position($tab-ios-button-badge-top-position, null, null, null);
41+
@include position($tab-ios-button-badge-top-position);
4242
}
4343

4444
:host ::slotted(ion-badge.badge-vertical-top:empty) {
45-
@include position($tab-ios-button-badge-top-position-empty, null, null, null);
45+
@include position($tab-ios-button-badge-top-position-empty);
4646
}
4747

4848
:host ::slotted(ion-badge.badge-vertical-bottom) {
49-
@include position($tab-ios-button-badge-bottom-position, null, null, null);
49+
@include position($tab-ios-button-badge-bottom-position);
5050
}
5151

5252
:host ::slotted(ion-badge.badge-vertical-bottom:empty) {
53-
@include position($tab-ios-button-badge-bottom-position-empty, null, null, null);
53+
@include position($tab-ios-button-badge-bottom-position-empty);
5454
}
5555

5656
:host ::slotted(ion-badge[vertical]:not(:empty)) {
@@ -73,15 +73,15 @@
7373
}
7474

7575
:host(.tab-layout-icon-bottom) ::slotted(ion-badge.badge-vertical-top) {
76-
@include position($tab-ios-button-icon-bottom-badge-top-position, null, null, null);
76+
@include position($tab-ios-button-icon-bottom-badge-top-position);
7777
}
7878

7979
:host(.tab-layout-icon-bottom) ::slotted(ion-badge.badge-vertical-bottom) {
80-
@include position($tab-ios-button-icon-bottom-badge-bottom-position, null, null, null);
80+
@include position($tab-ios-button-icon-bottom-badge-bottom-position);
8181
}
8282

8383
:host(.tab-layout-icon-bottom) ::slotted(ion-badge.badge-vertical-bottom:empty) {
84-
@include position($tab-ios-button-icon-bottom-badge-bottom-position-empty, null, null, null);
84+
@include position($tab-ios-button-icon-bottom-badge-bottom-position-empty);
8585
}
8686

8787
// iOS Tab Button: Icon
@@ -160,7 +160,7 @@
160160

161161
// Label
162162
:host(.tab-layout-icon-bottom) ::slotted(ion-label) {
163-
@include margin(4px, null, null, null);
163+
@include margin(4px);
164164
}
165165

166166
// iOS Tab Button: Icon Start / End Layout
@@ -186,7 +186,7 @@
186186
// Badge
187187
:host(.tab-layout-label-hide) ::slotted(ion-badge),
188188
:host(.tab-has-icon-only) ::slotted(ion-badge) {
189-
@include position(10px, null, null, null);
189+
@include position(10px);
190190
}
191191

192192
// Icon

core/src/components/tab-button/tab-button.md.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@
7676
}
7777

7878
:host ::slotted(ion-badge[vertical="bottom"]) {
79-
@include position($tab-button-md-badge-bottom-position, null, null, null);
79+
@include position($tab-button-md-badge-bottom-position);
8080
}
8181

8282
:host ::slotted(ion-badge[vertical="bottom"]:empty) {
83-
@include position($tab-button-md-badge-bottom-position-empty, null, null, null);
83+
@include position($tab-button-md-badge-bottom-position-empty);
8484
}
8585

8686
:host(.tab-layout-icon-bottom) ::slotted(ion-badge[vertical="top"]) {
@@ -166,7 +166,7 @@
166166
// Badge
167167
:host(.tab-layout-label-hide) ::slotted(ion-badge),
168168
:host(.tab-has-icon-only) ::slotted(ion-badge) {
169-
@include position(16px, null, null, null);
169+
@include position(16px);
170170
}
171171

172172
// Icon

0 commit comments

Comments
 (0)