Skip to content

Commit bc05965

Browse files
authored
Merge branch 'master' into password-input
2 parents 49d640b + f114db5 commit bc05965

File tree

65 files changed

+4687
-3529
lines changed

Some content is hidden

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

65 files changed

+4687
-3529
lines changed

.github/workflows/check-build.yml

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

1212
runs-on: ubuntu-latest
1313

14-
# We use Node v16 for building since CCA@v5 is using Angular 14.
14+
# We use Node v18 for building since CCA@v5 is using Angular 14.
1515
strategy:
1616
matrix:
17-
node-version: [16.x]
17+
node-version: [18.x]
1818

1919
steps:
2020
- uses: actions/checkout@v3

.github/workflows/publish.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,30 @@ on:
88
# Allows us to run this workflow manually from the Actions tab
99
workflow_dispatch:
1010

11+
permissions:
12+
contents: read # for checkout
13+
1114
jobs:
1215
# Single deploy job since we're just deploying
1316
publish:
1417
environment:
1518
name: Deploy
1619
runs-on: ubuntu-latest
20+
permissions:
21+
contents: write # to be able to publish a GitHub release
22+
issues: write # to be able to comment on released issues
23+
pull-requests: write # to be able to comment on pull requests
24+
id-token: write # to enable use of ODIC for npm provenance
1725
steps:
1826
# Checkout to branch
1927
- name: Checkout
2028
uses: actions/checkout@v3
2129

22-
# Set up node to use v16
30+
# Set up node to use v18
2331
- name: Setup Node
2432
uses: actions/setup-node@v3
2533
with:
26-
node-version: "16"
34+
node-version: "18"
2735
cache: "npm"
2836
cache-dependency-path: "package-lock.json"
2937

.storybook/manager-head.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
<meta name="twitter:image" content="https://angular.carbondesignsystem.com/carbon.jpg">
1111
<meta name="twitter:card" content="summary_large_image">
1212

13+
<footer>
14+
<dds-footer-container key="footer" disable-locale-button="true" size="micro" />
15+
</footer>
16+
17+
<script
18+
key="8"
19+
type="module"
20+
src="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/footer.min.js">
21+
</script>
22+
1323
<!-- Storybook override -->
1424
<script>
1525
document.title = "Carbon Components Angular";
@@ -26,3 +36,20 @@
2636
send_page_view: false
2737
});
2838
</script>
39+
40+
<style>
41+
footer {
42+
position: absolute;
43+
bottom: 0;
44+
width: 100%;
45+
z-index: 9999;
46+
}
47+
48+
#root > div {
49+
/*
50+
* Subtracting the height of the footer to prevent
51+
* overlaying the footer ontop of content
52+
*/
53+
height: calc(100vh - 48px);
54+
}
55+
</style>

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,3 +163,12 @@ To keep our build dependencies local we use npm scripts to run our webpack, gulp
163163

164164
## Code of Conduct
165165
Read our code of conduct [here](./.github/CODE_OF_CONDUCT.md)
166+
167+
## <picture><source height="20" width="20" media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-dark.svg"><source height="20" width="20" media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"><img height="20" width="20" alt="IBM Telemetry" src="https://raw.githubusercontent.com/ibm-telemetry/telemetry-js/main/docs/images/ibm-telemetry-light.svg"></picture> IBM Telemetry
168+
169+
This package uses IBM Telemetry to collect metrics data. By installing this
170+
package as a dependency you are agreeing to telemetry collection. To opt out,
171+
see
172+
[Opting out of IBM Telemetry data collection](https://github.com/ibm-telemetry/telemetry-js/tree/main#opting-out-of-ibm-telemetry-data-collection).
173+
For more information on the data being collected, please see the
174+
[IBM Telemetry documentation](https://github.com/ibm-telemetry/telemetry-js/tree/main#ibm-telemetry-collection-basics).

integration/ng14/package-lock.json

Lines changed: 55 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)