Skip to content

Commit e6e9097

Browse files
committed
Merge branch 'master' into enable-scale-title-stroke
2 parents ac37917 + 2bbb96c commit e6e9097

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v4
3434
- uses: pnpm/[email protected]
3535
- name: Use Node.js
36-
uses: actions/setup-node@v5
36+
uses: actions/setup-node@v6
3737
with:
3838
node-version: 16
3939
cache: pnpm

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v4
2727
- uses: pnpm/[email protected]
2828
- name: Use Node.js
29-
uses: actions/setup-node@v5
29+
uses: actions/setup-node@v6
3030
with:
3131
node-version: 16
3232
cache: pnpm

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v4
3030
- uses: pnpm/[email protected]
31-
- uses: actions/setup-node@v5
31+
- uses: actions/setup-node@v6
3232
with:
3333
registry-url: https://registry.npmjs.org/
3434
node-version: 16
@@ -73,7 +73,7 @@ jobs:
7373
steps:
7474
- uses: actions/checkout@v4
7575
- uses: pnpm/[email protected]
76-
- uses: actions/setup-node@v5
76+
- uses: actions/setup-node@v6
7777
with:
7878
registry-url: https://registry.npmjs.org/
7979
node-version: 16

docs/axes/cartesian/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Cartesian Axes
22

3-
Axes that follow a cartesian grid are known as 'Cartesian Axes'. Cartesian axes are used for line, bar, and bubble charts. Four cartesian axes are included in Chart.js by default.
3+
Axes that follow a cartesian grid are known as 'Cartesian Axes'. Cartesian axes are used for line, bar, and bubble charts. Five cartesian axes are included in Chart.js by default.
44

55
* [linear](./linear.md)
66
* [logarithmic](./logarithmic.md)

docs/configuration/responsive.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,19 @@ chart.canvas.parentNode.style.width = '128px';
4141

4242
Note that in order for the above code to correctly resize the chart height, the [`maintainAspectRatio`](#configuration-options) option must also be set to `false`.
4343

44+
## Flexbox / Grid Layout
45+
46+
To prevent overflow issues when using flexbox / grid layout, you must set the flex / grid child element to have a `min-width` of `0`.
47+
See [issue 4156](https://github.com/chartjs/Chart.js/issues/4156#issuecomment-295180128) for more details.
48+
49+
```html
50+
<div class="grid-container" style="display: grid">
51+
<div class="chart-container" style="min-width: 0">
52+
<canvas id="chart"></canvas>
53+
</div>
54+
</div>
55+
```
56+
4457
## Printing Resizable Charts
4558

4659
CSS media queries allow changing styles when printing a page. The CSS applied from these media queries may cause charts to need to resize. However, the resize won't happen automatically. To support resizing charts when printing, you need to hook the [onbeforeprint](https://developer.mozilla.org/en-US/docs/Web/API/WindowEventHandlers/onbeforeprint) event and manually trigger resizing of each chart.
@@ -62,4 +75,4 @@ window.addEventListener('beforeprint', () => {
6275
window.addEventListener('afterprint', () => {
6376
myChart.resize();
6477
});
65-
```
78+
```

0 commit comments

Comments
 (0)