Skip to content

Commit f5ee753

Browse files
chore: apply suggestions from code review
Co-authored-by: Maria Hutt <[email protected]>
1 parent 0865a33 commit f5ee753

11 files changed

+16
-20
lines changed

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

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,14 @@
267267
font-size: globals.$ion-font-size-500;
268268
}
269269

270+
:host(.button-xsmall) ::slotted(ion-icon[slot="start"]),
271+
:host(.button-xsmall) ::slotted(ion-spinner[slot="start"]),
272+
:host(.button-xsmall) ::slotted(ion-icon[slot="end"]),
273+
:host(.button-xsmall) ::slotted(ion-spinner[slot="end"]),
270274
:host(.button-small) ::slotted(ion-icon[slot="start"]),
271-
:host(.button-small) ::slotted(ion-spinner[slot="start"]) {
275+
:host(.button-small) ::slotted(ion-spinner[slot="start"]),
276+
:host(.button-small) ::slotted(ion-icon[slot="end"]),
277+
:host(.button-small) ::slotted(ion-spinner[slot="end"]) {
272278
@include globals.margin-horizontal(null, globals.$ion-space-200);
273279
}
274280

@@ -277,28 +283,18 @@
277283
@include globals.margin-horizontal(null, globals.$ion-space-250);
278284
}
279285

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"]) {
286+
:host(.button-large) ::slotted(ion-icon[slot="start"]),
287+
:host(.button-large) ::slotted(ion-spinner[slot="start"]),
288+
:host(.button-large) ::slotted(ion-icon[slot="end"]),
289+
:host(.button-large) ::slotted(ion-spinner[slot="end"]),
290+
:host(.button-xlarge) ::slotted(ion-icon[slot="start"]),
291+
:host(.button-xlarge) ::slotted(ion-spinner[slot="start"]),
292+
:host(.button-xlarge) ::slotted(ion-icon[slot="end"]),
293+
:host(.button-xlarge) ::slotted(ion-spinner[slot="end"]){
285294
@include globals.margin-horizontal(null, globals.$ion-space-300);
286295
}
287296

288-
:host(.button-small) ::slotted(ion-icon[slot="end"]),
289-
:host(.button-small) ::slotted(ion-spinner[slot="end"]) {
290-
@include globals.margin-horizontal(globals.$ion-space-200, null);
291-
}
292-
293297
::slotted(ion-icon[slot="end"]),
294298
::slotted(ion-spinner[slot="end"]) {
295299
@include globals.margin-horizontal(globals.$ion-space-250, null);
296300
}
297-
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"]) {
303-
@include globals.margin-horizontal(globals.$ion-space-300, null);
304-
}

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: ['ionic-md', 'ionic-ios'] }).forEach(({ config, screenshot, title }) => {
4+
configs({ modes: ['ionic-md'], directions: ['ltr'] }).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);
2 Bytes
Loading
-69 Bytes
Loading

0 commit comments

Comments
 (0)