Skip to content

Commit

Permalink
Merge branch 'main' into fix-input-documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
nuke-ellington authored Dec 16, 2024
2 parents aaffa42 + 1bc1651 commit 34a2718
Show file tree
Hide file tree
Showing 43 changed files with 839 additions and 416 deletions.
3 changes: 2 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"html-test-app",
"ionic-test-app",
"figma-plugin",
"documentation"
"documentation",
"storybook-docs"
]
}
5 changes: 5 additions & 0 deletions .changeset/cyan-mugs-travel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

Adjust the spacing of the toggle
5 changes: 5 additions & 0 deletions .changeset/fresh-suns-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

Align label overflow behavior of **ix-toggle** to wrap
5 changes: 5 additions & 0 deletions .changeset/quick-bugs-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix-aggrid": patch
---

Hide border sticky bottom in **ag-grid**.
5 changes: 5 additions & 0 deletions .changeset/small-games-act.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

Increase gap between switch and label of **ix-toggle**
5 changes: 5 additions & 0 deletions .changeset/thin-frogs-relax.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

Make **ix-toggle** not clickable if disabled property is present (Fixes #1585)
5 changes: 5 additions & 0 deletions .changeset/weak-singers-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix-echarts": patch
---

Update **ECharts** theme chart colors.
4 changes: 4 additions & 0 deletions packages/aggrid/scss/ix-aggrid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,8 @@
}
}
}

.ag-sticky-bottom {
display: none;
}
}
2 changes: 1 addition & 1 deletion packages/aggrid/tests/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<html>
<head>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community/dist/ag-grid-community.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community@32.1/dist/ag-grid-community.min.js"></script>
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-grid.css" />
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-theme-alpine.css" />

Expand Down
2 changes: 1 addition & 1 deletion packages/aggrid/tests/pagination.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<html>
<head>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community/dist/ag-grid-community.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community@32.1/dist/ag-grid-community.min.js"></script>
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-grid.css" />
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-theme-alpine.css" />

Expand Down
2 changes: 1 addition & 1 deletion packages/angular-test-app/src/preview-examples/echarts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { EChartsOption } from 'echarts';
@Component({
selector: 'app-example',
templateUrl: './echarts.html',
styleUrls: ["./echarts.css"],
styleUrls: ['./echarts.css'],
})
export default class Echarts implements OnInit {
theme = convertThemeName(themeSwitcher.getCurrentTheme());
Expand Down
14 changes: 12 additions & 2 deletions packages/core/component-doc.json
Original file line number Diff line number Diff line change
Expand Up @@ -19651,8 +19651,14 @@
],
"encapsulation": "shadow",
"dependents": [],
"dependencies": [],
"dependencyGraph": {},
"dependencies": [
"ix-typography"
],
"dependencyGraph": {
"ix-toggle": [
"ix-typography"
]
},
"props": [
{
"name": "checked",
Expand Down Expand Up @@ -20686,6 +20692,7 @@
"ix-slider",
"ix-textarea",
"ix-time-picker",
"ix-toggle",
"ix-tooltip"
],
"dependencies": [],
Expand Down Expand Up @@ -20762,6 +20769,9 @@
"ix-time-picker": [
"ix-typography"
],
"ix-toggle": [
"ix-typography"
],
"ix-tooltip": [
"ix-typography"
]
Expand Down
Loading

0 comments on commit 34a2718

Please sign in to comment.