Skip to content

Commit

Permalink
Merge branch 'main' into fix/card-colors
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasBerliner authored Oct 16, 2024
2 parents 59293bc + ff99d8c commit f19b993
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 22 deletions.
5 changes: 5 additions & 0 deletions .changeset/quiet-tools-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/icon-toggle-button): remove console.log
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ export class IconToggleButton {
...this.getIconSizeClass(),
},
};
console.log(baseButtonProps, this.disabled, this.loading);

return (
<Host
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ The overlay can be closed in three ways:
- Click the info icon again
- Click another navigation item

When the navigation menu is collapsed, the overlay stays open.
42 changes: 21 additions & 21 deletions packages/documentation/docs/migration/uxt.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Your layout might change in some places when applying the theme, including:
3. Update your current UXT version to 2.7.0
</Accordion>

<Accordion title="The colors don’t look right in both themes." id="colors-dark">
<Accordion title="The colors don’t look right in both themes." id="colors-dark" showBorderBottom>
1. Check if you use color variables (no raw HEX or RGB values)
2. Check if you used meta color variables correctly (see more details [here](https://design.mindsphere.io/patterns/color.html#tab2anchor4)):
1. For text elements: use the font colors, e.g. color-font or color-font-secondary (no base colors)
Expand All @@ -77,31 +77,31 @@ As some of the components are named differently in Industrial Experience, please

| **User Experience Toolkit** | **Industrial Experience** |
| ------------------------------------------------ | --------------------------------------------------------------------- |
| App bar | Nav menu |
| Badge | Pill, chip |
| Busy indicator | Spinner |
| Button<br/>- primary<br/>- secondary<br/>- ghost | Button<br/>- primary filled<br/>- primary outline<br/>- primary ghost |
| Card grid | Layout grid |
| Container | Card |
| Dialog | Modal |
| Dropzone | Upload |
| List | Event list |
| Stepper | Workflow |
| Menu | Dropdown button |
| Message | Message bar |
| Notification | Toast |
| Pager | Pagination |
| Popover | Tooltip, dropdown |
| Switch | Toggle |
| Context region | Pane (inline right) |
| Item region | Pane (floating right) |
| Leading region | Pane (inline left) |
| App bar | [Nav menu](../controls/application-frame/application-menu.md) |
| Badge | [Pill](../controls/pill.md), [chip](../controls/chip.md) |
| Busy indicator | [Spinner](../controls/spinner.md) |
| Button<br/>- primary<br/>- secondary<br/>- ghost | [Button](../controls/buttons/button.md)<br/>- primary filled<br/>- primary outline<br/>- primary ghost |
| Card grid | [Layout grid](../controls/layout-grid.md) |
| Container | [Card](../controls/card.md) |
| Dialog | [Modal](../controls/modal.md) |
| Dropzone | [Upload](../controls/upload.md) |
| List | [Event list](../controls/event-list.md) |
| Stepper | [Workflow](../controls/workflow.md) |
| Menu | [Dropdown button](../controls/buttons/dropdown-button.md) |
| Message | [Message bar](../controls/messagebar.md) |
| Notification | [Toast](../controls/toast.md) |
| Pager | [Pagination](../controls/pagination.md) |
| Popover | [Tooltip](../controls/tooltip.md), [dropdown](../controls/dropdown.md) |
| Switch | [Toggle](../controls/toggle.md) |
| Context region | [Pane](../controls/panes.md) (inline right) |
| Item region | [Pane](../controls/panes.md) (floating right) |
| Leading region | [Pane](../controls/panes.md) (inline left) |

## System icons

Key differences between UXT and Industrial Experience:

- [UXT offers an iconfont](https://design.mindsphere.io/patterns/system-icons.html) with 3 different styles (regular, bold, filled)
- UXT offers an iconfont with 3 different styles (regular, bold, filled)
- [iX offers SVGs](https://ix.siemens.io/docs/icon-library/icons) with mainly 1 style that corresponds to our bold and partially filled variants separately

When changing to the SVG icons by Industrial Experience, check whether your stylings still apply in your custom-built components.
Expand Down

0 comments on commit f19b993

Please sign in to comment.