Skip to content

Commit dcfdf54

Browse files
material-web-copybaracopybara-github
material-web-copybara
authored and
copybara-github
committed
chore(labs): revert replace CSS imports attributes with CSS-in-JS
PiperOrigin-RevId: 903594331
1 parent 7d7cbf4 commit dcfdf54

21 files changed

Lines changed: 67 additions & 37 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 m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
15+
import {styles as 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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ 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.cssresult.js';
17-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
18-
import buttonStyles from './button.cssresult.js';
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
1922

2023
import {button} from './button.js';
2124

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ 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 m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
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
1617

1718
/** Knob types for card stories. */
1819
export interface StoryKnobs {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ 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.cssresult.js';
14-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
15-
import cardStyles from './card.cssresult.js';
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
1619

1720
import {type CardColor, card} from './card.js';
1821

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ 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 m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
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
1415

1516
/** Knob types for checkbox stories. */
1617
export interface StoryKnobs {

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ 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.cssresult.js';
26-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
27-
import checkboxStyles from './checkbox.cssresult.js';
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
2831

2932
import {checkbox} from './checkbox.js';
3033

‎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 m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
13+
import {styles as 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import {css, CSSResultOrNative, html, LitElement} from 'lit';
88
import {customElement, property} from 'lit/decorators.js';
99

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

1213
import {divider} from './divider.js';
1314

‎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 m3Styles from '@material/web/labs/gb/styles/m3.cssresult.js';
13+
import {styles as 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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
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.cssresult.js';
11-
import rippleStyles from '@material/web/labs/gb/components/ripple/ripple.cssresult.js';
12-
import fabStyles from './fab.cssresult.js';
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
1316

1417
import {fab, type FabColor, type FabSize} from './fab.js';
1518

0 commit comments

Comments
 (0)