Skip to content

Commit 0865a33

Browse files
fix(button): fix spinner margins
also update e2e tests spanshots
1 parent 0d88065 commit 0865a33

27 files changed

+48
-8
lines changed

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@
268268
}
269269

270270
:host(.button-small) ::slotted(ion-icon[slot="start"]),
271-
::slotted(ion-spinner[slot="start"]) {
271+
:host(.button-small) ::slotted(ion-spinner[slot="start"]) {
272272
@include globals.margin-horizontal(null, globals.$ion-space-200);
273273
}
274274

@@ -277,13 +277,16 @@
277277
@include globals.margin-horizontal(null, globals.$ion-space-250);
278278
}
279279

280-
:host(.button-large) ::slotted(ion-icon[slot="start"]),
281-
::slotted(ion-spinner[slot="start"]) {
280+
:host(.button-large) ::slotted(ion-icon[slot="start"]) {
281+
@include globals.margin-horizontal(null, globals.$ion-space-300);
282+
}
283+
284+
:host(.button-xlarge) ::slotted(ion-spinner[slot="start"]) {
282285
@include globals.margin-horizontal(null, globals.$ion-space-300);
283286
}
284287

285288
:host(.button-small) ::slotted(ion-icon[slot="end"]),
286-
::slotted(ion-spinner[slot="end"]) {
289+
:host(.button-small) ::slotted(ion-spinner[slot="end"]) {
287290
@include globals.margin-horizontal(globals.$ion-space-200, null);
288291
}
289292

@@ -292,7 +295,10 @@
292295
@include globals.margin-horizontal(globals.$ion-space-250, null);
293296
}
294297

295-
:host(.button-large) ::slotted(ion-icon[slot="end"]),
296-
::slotted(ion-spinner[slot="end"]) {
298+
:host(.button-large) ::slotted(ion-icon[slot="end"]) {
299+
@include globals.margin-horizontal(globals.$ion-space-300, null);
300+
}
301+
302+
:host(.button-xlarge) ::slotted(ion-spinner[slot="end"]) {
297303
@include globals.margin-horizontal(globals.$ion-space-300, null);
298304
}

core/src/components/button/test/spinner/button.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { expect } from '@playwright/test';
22
import { configs, test } from '@utils/test/playwright';
33

4-
configs({ modes: ['ios', 'md', 'ionic-md', 'ionic-ios'] }).forEach(({ config, screenshot, title }) => {
4+
configs({ modes: ['ionic-md', 'ionic-ios'] }).forEach(({ config, screenshot, title }) => {
55
test.describe(title('button: spinner'), () => {
66
test('should not have visual regressions', async ({ page }) => {
77
await page.goto(`/src/components/button/test/spinner`, config);
19.7 KB
Loading
24.7 KB
Loading
19.3 KB
Loading
20.5 KB
Loading
23.8 KB
Loading
19.1 KB
Loading
19.3 KB
Loading
24.7 KB
Loading

0 commit comments

Comments
 (0)