Skip to content

Commit a25b839

Browse files
committed
fix: move all custom classes to end of class list, allowing them to override other classes
1 parent cdcdefa commit a25b839

File tree

79 files changed

+88
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+88
-86
lines changed

packages/accordion/src/Accordion.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
bind:this={element}
55
use:useActions={use}
66
class={classMap({
7-
[className]: true,
87
'smui-accordion': true,
98
'smui-accordion--multiple': multiple,
109
'smui-accordion--with-open-dialog': withOpenDialog,
10+
[className]: true,
1111
})}
1212
{...restProps}
1313
onSMUIAccordionPanelActivate={(e) => {

packages/accordion/src/Header.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
addStyle,
1414
}}
1515
class={classMap({
16-
[className]: true,
1716
'smui-accordion__header': true,
1817
...internalClasses,
18+
[className]: true,
1919
})}
2020
style={Object.entries(internalStyles)
2121
.map(([name, value]) => `${name}: ${value};`)

packages/accordion/src/Panel.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
bind:this={element}
55
{use}
66
class={classMap({
7-
[className]: true,
87
'smui-accordion__panel': true,
98
'smui-accordion__panel--open': open,
109
'smui-accordion__panel--opened': opened,
@@ -16,6 +15,7 @@
1615
(extend && open ? extendedElevation : elevation)]:
1716
(elevation !== 0 && variant === 'raised') ||
1817
(extendedElevation !== 0 && variant === 'raised' && extend && open),
18+
[className]: true,
1919
})}
2020
{color}
2121
variant={variant === 'raised' ? 'unelevated' : variant}

packages/autocomplete/src/Autocomplete.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use:Anchor
66
use:useActions={use}
77
class={classMap({
8-
[className]: true,
98
'smui-autocomplete': true,
9+
[className]: true,
1010
})}
1111
{...exclude(restProps, ['menu$', 'textfield$', 'list$'])}
1212
onfocusout={(

packages/badge/src/Badge.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
bind:this={element}
55
use:useActions={use}
66
class={classMap({
7-
[className]: true,
87
'smui-badge': true,
98
'smui-badge--rounded': !square,
109
['smui-badge--color-' + color]: true,
1110
['smui-badge--position-' + position]: true,
1211
['smui-badge--align-' + align]: true,
12+
[className]: true,
1313
})}
1414
role="status"
1515
{...restProps}

packages/banner/src/Banner.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
bind:this={element}
77
use:useActions={use}
88
class={classMap({
9-
[className]: true,
109
'mdc-banner': true,
1110
'mdc-banner--centered': centered,
1211
'mdc-banner--mobile-stacked': mobileStacked,
1312
...internalClasses,
13+
[className]: true,
1414
})}
1515
style={Object.entries(internalStyles)
1616
.map(([name, value]) => `${name}: ${value};`)

packages/bottom-app-bar/src/AutoAdjust.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
bind:this={element}
66
{use}
77
class={classMap({
8-
[className]: true,
98
[adjustClass]: true,
9+
[className]: true,
1010
})}
1111
style={Object.entries(internalStyles)
1212
.map(([name, value]) => `${name}: ${value};`)

packages/bottom-app-bar/src/BottomAppBar.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
bind:this={element}
77
use:useActions={use}
88
class={classMap({
9-
[className]: true,
109
'smui-bottom-app-bar': true,
1110
'smui-bottom-app-bar--standard': variant === 'standard',
1211
'smui-bottom-app-bar--fixed': variant === 'fixed',
12+
[className]: true,
1313
})}
1414
style={Object.entries(internalStyles)
1515
.map(([name, value]) => `${name}: ${value};`)

packages/bottom-app-bar/src/Section.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
bind:this={element}
55
{use}
66
class={classMap({
7-
[className]: true,
87
'smui-bottom-app-bar__section': true,
98
'smui-bottom-app-bar__section--fab-inset': fabInset,
9+
[className]: true,
1010
})}
1111
color={$color}
1212
variant="unelevated"

packages/button/src/Button.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
...use,
2020
]}
2121
class={classMap({
22-
[className]: true,
2322
'mdc-button': true,
2423
'mdc-button--raised': variant === 'raised',
2524
'mdc-button--unelevated': variant === 'unelevated',
@@ -36,6 +35,7 @@
3635
'mdc-banner__primary-action': context === 'banner' && !secondary,
3736
'mdc-tooltip__action': context === 'tooltip:rich-actions',
3837
...internalClasses,
38+
[className]: true,
3939
})}
4040
style={Object.entries(internalStyles)
4141
.map(([name, value]) => `${name}: ${value};`)

0 commit comments

Comments
 (0)