Skip to content

Commit e5be451

Browse files
copybara-githubcopybara-github
committed
Merge pull request #5926 from material-components:update-style-imports-13429758157232929297
PiperOrigin-RevId: 897161442
2 parents a44effd + 5c6c047 commit e5be451

59 files changed

Lines changed: 117 additions & 105 deletions

Some content is hidden

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

‎button/elevated-button.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {ElevatedButton} from './internal/elevated-button.js';
11-
import {styles as elevatedStyles} from './internal/elevated-styles.js';
12-
import {styles as sharedElevationStyles} from './internal/shared-elevation-styles.js';
13-
import {styles as sharedStyles} from './internal/shared-styles.js';
11+
import {styles as elevatedStyles} from './internal/elevated-styles.cssresult.js';
12+
import {styles as sharedElevationStyles} from './internal/shared-elevation-styles.cssresult.js';
13+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
1414

1515
declare global {
1616
interface HTMLElementTagNameMap {

‎button/filled-button.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {FilledButton} from './internal/filled-button.js';
11-
import {styles as filledStyles} from './internal/filled-styles.js';
12-
import {styles as sharedElevationStyles} from './internal/shared-elevation-styles.js';
13-
import {styles as sharedStyles} from './internal/shared-styles.js';
11+
import {styles as filledStyles} from './internal/filled-styles.cssresult.js';
12+
import {styles as sharedElevationStyles} from './internal/shared-elevation-styles.cssresult.js';
13+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
1414

1515
declare global {
1616
interface HTMLElementTagNameMap {

‎button/filled-tonal-button.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {FilledTonalButton} from './internal/filled-tonal-button.js';
11-
import {styles as tonalStyles} from './internal/filled-tonal-styles.js';
12-
import {styles as sharedElevationStyles} from './internal/shared-elevation-styles.js';
13-
import {styles as sharedStyles} from './internal/shared-styles.js';
11+
import {styles as tonalStyles} from './internal/filled-tonal-styles.cssresult.js';
12+
import {styles as sharedElevationStyles} from './internal/shared-elevation-styles.cssresult.js';
13+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
1414

1515
declare global {
1616
interface HTMLElementTagNameMap {

‎button/outlined-button.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {OutlinedButton} from './internal/outlined-button.js';
11-
import {styles as outlinedStyles} from './internal/outlined-styles.js';
12-
import {styles as sharedStyles} from './internal/shared-styles.js';
11+
import {styles as outlinedStyles} from './internal/outlined-styles.cssresult.js';
12+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
1313

1414
declare global {
1515
interface HTMLElementTagNameMap {

‎button/text-button.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

10-
import {styles as sharedStyles} from './internal/shared-styles.js';
10+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
1111
import {TextButton} from './internal/text-button.js';
12-
import {styles as textStyles} from './internal/text-styles.js';
12+
import {styles as textStyles} from './internal/text-styles.cssresult.js';
1313

1414
declare global {
1515
interface HTMLElementTagNameMap {

‎checkbox/checkbox.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {Checkbox} from './internal/checkbox.js';
11-
import {styles} from './internal/checkbox-styles.js';
11+
import {styles} from './internal/checkbox-styles.cssresult.js';
1212

1313
declare global {
1414
interface HTMLElementTagNameMap {

‎chips/assist-chip.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {AssistChip} from './internal/assist-chip.js';
11-
import {styles} from './internal/assist-styles.js';
12-
import {styles as elevatedStyles} from './internal/elevated-styles.js';
13-
import {styles as sharedStyles} from './internal/shared-styles.js';
11+
import {styles} from './internal/assist-styles.cssresult.js';
12+
import {styles as elevatedStyles} from './internal/elevated-styles.cssresult.js';
13+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
1414

1515
declare global {
1616
interface HTMLElementTagNameMap {
@@ -26,5 +26,9 @@ declare global {
2626
*/
2727
@customElement('md-assist-chip')
2828
export class MdAssistChip extends AssistChip {
29-
static override styles: CSSResultOrNative[] = [sharedStyles, elevatedStyles, styles];
29+
static override styles: CSSResultOrNative[] = [
30+
sharedStyles,
31+
elevatedStyles,
32+
styles,
33+
];
3034
}

‎chips/chip-set.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {ChipSet} from './internal/chip-set.js';
11-
import {styles} from './internal/chip-set-styles.js';
11+
import {styles} from './internal/chip-set-styles.cssresult.js';
1212

1313
declare global {
1414
interface HTMLElementTagNameMap {

‎chips/filter-chip.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

10-
import {styles as elevatedStyles} from './internal/elevated-styles.js';
10+
import {styles as elevatedStyles} from './internal/elevated-styles.cssresult.js';
1111
import {FilterChip} from './internal/filter-chip.js';
12-
import {styles} from './internal/filter-styles.js';
13-
import {styles as selectableStyles} from './internal/selectable-styles.js';
14-
import {styles as sharedStyles} from './internal/shared-styles.js';
15-
import {styles as trailingIconStyles} from './internal/trailing-icon-styles.js';
12+
import {styles} from './internal/filter-styles.cssresult.js';
13+
import {styles as selectableStyles} from './internal/selectable-styles.cssresult.js';
14+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
15+
import {styles as trailingIconStyles} from './internal/trailing-icon-styles.cssresult.js';
1616

1717
declare global {
1818
interface HTMLElementTagNameMap {

‎chips/input-chip.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import {CSSResultOrNative} from 'lit';
88
import {customElement} from 'lit/decorators.js';
99

1010
import {InputChip} from './internal/input-chip.js';
11-
import {styles} from './internal/input-styles.js';
12-
import {styles as selectableStyles} from './internal/selectable-styles.js';
13-
import {styles as sharedStyles} from './internal/shared-styles.js';
14-
import {styles as trailingIconStyles} from './internal/trailing-icon-styles.js';
11+
import {styles} from './internal/input-styles.cssresult.js';
12+
import {styles as selectableStyles} from './internal/selectable-styles.cssresult.js';
13+
import {styles as sharedStyles} from './internal/shared-styles.cssresult.js';
14+
import {styles as trailingIconStyles} from './internal/trailing-icon-styles.cssresult.js';
1515

1616
declare global {
1717
interface HTMLElementTagNameMap {

0 commit comments

Comments
 (0)