Skip to content

Commit 1b385da

Browse files
asynclizcopybara-github
asyncliz
authored and
copybara-github
committed
chore(labs): replace CSS imports attributes with CSS-in-JS
PiperOrigin-RevId: 902902170
1 parent 95dd57c commit 1b385da

21 files changed

Lines changed: 37 additions & 67 deletions

File tree

‎labs/gb/components/button/demo/stories.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
ButtonSize,
1313
} from '@material/web/labs/gb/components/button/button.js';
1414
import {adoptStyles} from '@material/web/labs/gb/styles/adopt-styles.js';
15-
import {styles as m3Styles} from '@material/web/labs/gb/styles/m3.cssresult.js';
15+
import m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
1616
import {html, nothing} from 'lit';
1717

1818
/** Knob types for button stories. */

‎labs/gb/components/button/md-button.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,9 @@ import {mixinFormSubmitter} from '@material/web/labs/behaviors/form-submitter.js
1313
import {css, CSSResultOrNative, html, LitElement, nothing} from 'lit';
1414
import {customElement, property} from 'lit/decorators.js';
1515

16-
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.css' with {type: 'css'}; // github-only
17-
// import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js'; // google3-only
18-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.css' with {type: 'css'}; // github-only
19-
// import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js'; // google3-only
20-
import buttonStyles from './button.css' with {type: 'css'}; // github-only
21-
// import buttonStyles from './button.cssresult.js'; // google3-only
16+
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js';
17+
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
18+
import buttonStyles from './button.cssresult.js';
2219

2320
import {button} from './button.js';
2421

‎labs/gb/components/card/demo/stories.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ import {CardColor} from '@material/web/labs/gb/components/card/card.js';
1212
import {adoptStyles} from '@material/web/labs/gb/styles/adopt-styles.js';
1313
import {css, html, nothing} from 'lit';
1414

15-
import {styles as m3Styles} from '@material/web/labs/gb/styles/m3.css' with {type: 'css'}; // github-only
16-
// import {styles as m3Styles} from '@material/web/labs/gb/styles/m3.cssresult.js'; // google3-only
15+
import m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
1716

1817
/** Knob types for card stories. */
1918
export interface StoryKnobs {

‎labs/gb/components/card/md-card.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ import {ripple} from '@material/web/labs/gb/components/ripple/ripple.js';
1010
import {css, CSSResultOrNative, html, LitElement, nothing} from 'lit';
1111
import {customElement, property} from 'lit/decorators.js';
1212

13-
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.css' with {type: 'css'}; // github-only
14-
// import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js'; // google3-only
15-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.css' with {type: 'css'}; // github-only
16-
// import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js'; // google3-only
17-
import cardStyles from './card.css' with {type: 'css'}; // github-only
18-
// import cardStyles from './card.cssresult.js'; // google3-only
13+
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js';
14+
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
15+
import cardStyles from './card.cssresult.js';
1916

2017
import {type CardColor, card} from './card.js';
2118

‎labs/gb/components/checkbox/demo/stories.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ import {MaterialStoryInit} from './material-collection.js';
1010
import {adoptStyles} from '@material/web/labs/gb/styles/adopt-styles.js';
1111
import {css, html} from 'lit';
1212

13-
import {styles as m3Styles} from '@material/web/labs/gb/styles/m3.css' with {type: 'css'}; // github-only
14-
// import {styles as m3Styles} from '@material/web/labs/gb/styles/m3.cssresult.js'; // google3-only
13+
import m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
1514

1615
/** Knob types for checkbox stories. */
1716
export interface StoryKnobs {

‎labs/gb/components/checkbox/md-checkbox.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,9 @@ import {CheckboxValidator} from '@material/web/labs/behaviors/validators/checkbo
2222
import {css, CSSResultOrNative, html, LitElement, nothing} from 'lit';
2323
import {customElement, property, query} from 'lit/decorators.js';
2424

25-
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.css' with {type: 'css'}; // github-only
26-
// import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js'; // google3-only
27-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.css' with {type: 'css'}; // github-only
28-
// import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js'; // google3-only
29-
import checkboxStyles from './checkbox.css' with {type: 'css'}; // github-only
30-
// import checkboxStyles from './checkbox.cssresult.js'; // google3-only
25+
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js';
26+
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
27+
import checkboxStyles from './checkbox.cssresult.js';
3128

3229
import {checkbox} from './checkbox.js';
3330

‎labs/gb/components/divider/demo/stories.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {MaterialStoryInit} from './material-collection.js';
1010
import {divider} from '@material/web/labs/gb/components/divider/divider.js';
1111
import {styles as dividerStyles} from '@material/web/labs/gb/components/divider/divider.cssresult.js';
1212
import {adoptStyles} from '@material/web/labs/gb/styles/adopt-styles.js';
13-
import {styles as m3Styles} from '@material/web/labs/gb/styles/m3.cssresult.js';
13+
import m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
1414
import {css, html} from 'lit';
1515

1616
/** Knob types for divider stories. */

‎labs/gb/components/divider/md-divider.ts‎

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

10-
import dividerStyles from './divider.css' with {type: 'css'}; // github-only
11-
// import {styles as dividerStyles} from './divider.cssresult.js'; // google3-only
10+
import dividerStyles from './divider.cssresult.js';
1211

1312
import {divider} from './divider.js';
1413

‎labs/gb/components/fab/demo/stories.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import '@material/web/labs/gb/components/fab/md-fab.js';
1010
import {MaterialStoryInit} from './material-collection.js';
1111
import {FabColor, FabSize} from '@material/web/labs/gb/components/fab/fab.js';
1212
import {adoptStyles} from '@material/web/labs/gb/styles/adopt-styles.js';
13-
import {styles as m3Styles} from '@material/web/labs/gb/styles/m3.cssresult.js';
13+
import m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
1414
import {css, html, nothing} from 'lit';
1515

1616
/** Knob types for fab stories. */

‎labs/gb/components/fab/md-fab.ts‎

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

10-
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.css' with {type: 'css'}; // github-only
11-
// import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js'; // google3-only
12-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.css' with {type: 'css'}; // github-only
13-
// import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js'; // google3-only
14-
import fabStyles from './fab.css' with {type: 'css'}; // github-only
15-
// import {styles as fabStyles} from './fab.cssresult.js'; // google3-only
10+
import focusRingStyles from '@material/web/labs/gb/components/focus/focus-ring.cssresult.js';
11+
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
12+
import fabStyles from './fab.cssresult.js';
1613

1714
import {fab, type FabColor, type FabSize} from './fab.js';
1815

0 commit comments

Comments
 (0)