Skip to content

Commit 42d4655

Browse files
authored
Merge branch 'master' into support-disable-table-radio
2 parents e1b0193 + 361ea46 commit 42d4655

File tree

177 files changed

+24712
-7177
lines changed

Some content is hidden

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

177 files changed

+24712
-7177
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ indent_size = 4
1010
trim_trailing_whitespace = true
1111
insert_final_newline = true
1212

13+
[*.json]
14+
charset = utf-8
15+
end_of_file = lf
16+
indent_style = space
17+
indent_size = 2
18+
trim_trailing_whitespace = true
19+
insert_final_newline = true
20+
1321
[*.yml]
1422
charset = utf-8
1523
indent_style = space

.github/workflows/check-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111

1212
runs-on: ubuntu-latest
1313

14+
# We use Node v16 for building since CCA@v5 is using Angular 14.
1415
strategy:
1516
matrix:
1617
node-version: [16.x]
@@ -39,10 +40,11 @@ jobs:
3940

4041
runs-on: ubuntu-latest
4142

43+
# We use Node v20 for building since it is current lts. Node v16 is no longer supported in Angular 17.
4244
strategy:
4345
matrix:
44-
angular-version: [14, 15, 16]
45-
node-version: [16.x]
46+
angular-version: [14, 15, 16, 17]
47+
node-version: [20.x]
4648

4749
steps:
4850
- uses: actions/checkout@v3

.storybook/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ module.exports = {
1010
backgrounds: false
1111
}
1212
},
13-
"@storybook/addon-a11y"
13+
"@storybook/addon-a11y",
14+
"@storybook/addon-storysource"
1415
],
1516
framework: {
1617
name: "@storybook/angular",

.storybook/preview.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ html {
66
@include styles.theme(styles.$white);
77
}
88

9+
.innerZoomElementWrapper {
10+
min-width: 55rem;
11+
}
12+
13+
.docblock-argstable {
14+
margin-bottom: 10rem;
15+
}
16+
917
/*
1018
* Story batch styling, we are wrapping the storybook decorator function to ensure
1119
* styles do not leak to other components

0 commit comments

Comments
 (0)