Skip to content

Commit 49e2e3b

Browse files
committed
fix(badge): run lint and fix based on lint feedback.
1 parent 82d587e commit 49e2e3b

File tree

5 files changed

+22
-24
lines changed

5 files changed

+22
-24
lines changed

core/src/components/badge/badge.common.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,12 @@
7878
}
7979

8080
:host([vertical].in-tab-button) ::slotted(ion-icon) {
81-
position: absolute;
82-
top: 50%;
83-
left: 50%;
84-
transform: translate(-50%, -50%);
81+
@include position($top: 50%, $start: 50%);
8582

83+
position: absolute;
84+
8685
width: globals.$ion-scale-300;
8786
height: globals.$ion-scale-300;
87+
88+
transform: translate(-50%, -50%);
8889
}

core/src/components/badge/test/hint/badge.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ configs({ directions: ['ltr'], modes: ['md', 'ios', 'ionic-md'] }).forEach(({ co
2121
await expect(container).toHaveScreenshot(screenshot(`badge-hint-avatar`));
2222
});
2323
});
24-
24+
2525
test.describe(title('badge: hint inside tab button'), () => {
2626
test('should not have visual regressions', async ({ page }) => {
2727
await page.goto('/src/components/badge/test/hint', config);

core/src/components/badge/test/hint/index.html

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,71 +99,65 @@
9999
</div>
100100
</ion-list>
101101

102-
103102
<ion-list id="tab-button">
104103
<ion-list-header>
105104
<ion-label> Inside Tab Button </ion-label>
106105
</ion-list-header>
107106
<div class="ion-display-flex ion-align-items-center ion-justify-content-around ion-margin">
108-
109107
<ion-tab-button href="" tab="tab-one">
110108
<ion-label>Tab One</ion-label>
111109
<ion-icon name="star"></ion-icon>
112110
<ion-badge vertical="top" color="danger">9</ion-badge>
113111
</ion-tab-button>
114-
112+
115113
<ion-tab-button tab="schedule" class="e2eTabTwoButton">
116114
<ion-label>Tab Two</ion-label>
117115
<ion-icon name="globe"></ion-icon>
118116
<ion-badge vertical="top" color="primary">
119117
<ion-icon name="star"></ion-icon>
120118
</ion-badge>
121119
</ion-tab-button>
122-
120+
123121
<ion-tab-button tab="tab-three">
124122
<ion-label>Tab Three</ion-label>
125123
<ion-icon name="logo-facebook"></ion-icon>
126124
<ion-badge vertical="top" color="warning">999</ion-badge>
127125
</ion-tab-button>
128-
126+
129127
<ion-tab-button tab="tab-four" class="e2eTabFourButton">
130128
<ion-label>Tab Four</ion-label>
131129
<ion-icon name="chatbox"></ion-icon>
132130
<ion-badge vertical="top" color="success"></ion-badge>
133131
</ion-tab-button>
134-
135132
</div>
136133
<div class="ion-display-flex ion-align-items-center ion-justify-content-around ion-margin">
137-
138134
<ion-tab-button href="" tab="tab-one">
139135
<ion-label>Tab One</ion-label>
140136
<ion-icon name="star"></ion-icon>
141137
<ion-badge vertical="bottom" color="danger">9</ion-badge>
142138
</ion-tab-button>
143-
139+
144140
<ion-tab-button tab="schedule" class="e2eTabTwoButton">
145141
<ion-label>Tab Two</ion-label>
146142
<ion-icon name="globe"></ion-icon>
147143
<ion-badge vertical="bottom" color="primary">
148144
<ion-icon name="star"></ion-icon>
149145
</ion-badge>
150146
</ion-tab-button>
151-
147+
152148
<ion-tab-button tab="tab-three">
153149
<ion-label>Tab Three</ion-label>
154150
<ion-icon name="logo-facebook"></ion-icon>
155151
<ion-badge vertical="bottom" color="warning">999</ion-badge>
156152
</ion-tab-button>
157-
153+
158154
<ion-tab-button tab="tab-four" class="e2eTabFourButton">
159155
<ion-label>Tab Four</ion-label>
160156
<ion-icon name="chatbox"></ion-icon>
161157
<ion-badge vertical="bottom" color="success"></ion-badge>
162158
</ion-tab-button>
163-
164159
</div>
165160
</ion-list>
166-
167161
</ion-content>
168162
</ion-app>
169163
</body>

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,13 @@
158158
:host ::slotted(ion-badge[vertical]:empty) {
159159
@include padding(0, 0);
160160

161-
height: globals.$ion-scale-200;
162161
width: globals.$ion-scale-200;
162+
height: globals.$ion-scale-200;
163163
}
164164

165165
:host ::slotted(ion-badge[vertical]) {
166-
left: 50%;
166+
@include position($start: 50%);
167+
167168
transform: translateX(globals.$ion-scale-300);
168169
}
169170

@@ -172,7 +173,8 @@
172173
}
173174

174175
:host ::slotted(ion-badge[vertical="bottom"]) {
175-
top: 50%;
176+
@include position($top: 50%);
177+
176178
transform: translate(globals.$ion-scale-300, calc(globals.$ion-scale-200 * -1));
177179
}
178180

@@ -183,11 +185,12 @@
183185
:host ::slotted(ion-badge[vertical]:not(:empty)) {
184186
@include padding(2px, 4px, 4px, 4px);
185187

188+
min-width: globals.$ion-scale-400;
189+
height: globals.$ion-scale-400;
190+
186191
font-size: globals.$ion-font-size-300;
187-
line-height: 1;
188192

189-
height: globals.$ion-scale-400;
190-
min-width: globals.$ion-scale-400;
193+
line-height: 1;
191194
}
192195

193196
// Tab Button: Layout

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@
9999

100100
:host ::slotted(ion-badge[vertical]:not(:empty)) {
101101
@include padding(3px, 4px, 4px, 4px);
102-
}
102+
}

0 commit comments

Comments
 (0)