Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/accordion-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/accordion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/action-sheet-all-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/action-sheet-all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-all-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-button-only-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-button-only.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-no-cancel-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-no-cancel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-remove-app-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/alert-remove-app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/breadcrumbs-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/breadcrumbs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/button-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/card-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/card.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/checkbox-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/checkbox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/chip-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/chip.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/date-and-time-pickers.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/floating-action-button.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/inputs-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/inputs.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/item-list-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/item-list.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/modal-card-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/modal-card.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/modal-normal-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/modal-normal.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/modal-sheet-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/modal-sheet.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/popover-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/popover.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/radio-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/radio.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/range-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/range.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/reorder-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/reorder.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/searchbar-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/searchbar.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/segment-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/segment.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/select-action-sheet.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/select-alert-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/select-alert.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/select-modal-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/select-modal.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/select-popover-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/select-popover.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/tabs-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/tabs.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toast-anchor-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toast-anchor.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toast-bottom-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toast-bottom.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toast-middle-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toast-middle.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toggle-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toggle.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toolbar-dark.png
Binary file modified demo/e2e/screenshot.spec.ts-snapshots/toolbar.png
36 changes: 36 additions & 0 deletions demo/src/app/index/pages/toolbar/toolbar.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,42 @@ <h2>toolbar</h2>
<ion-title>Primary / Secondary Buttons</ion-title>
</ion-toolbar>

<ion-toolbar>
<ion-buttons slot="end">
<ion-button>
<ion-icon slot="icon-only" name="search"></ion-icon>
</ion-button>
<ion-button fill="solid">
<ion-icon slot="icon-only" name="search"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>Icon Normal</ion-title>
</ion-toolbar>

<ion-toolbar>
<ion-buttons slot="end">
<ion-button size="small">
<ion-icon slot="icon-only" name="search"></ion-icon>
</ion-button>
<ion-button size="small" fill="solid">
<ion-icon slot="icon-only" name="search"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>Icon Small</ion-title>
</ion-toolbar>

<ion-toolbar>
<ion-buttons slot="end">
<ion-button size="large">
<ion-icon slot="icon-only" name="search"></ion-icon>
</ion-button>
<ion-button size="large" fill="solid">
<ion-icon slot="icon-only" name="search"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>Icon Large</ion-title>
</ion-toolbar>

<ion-toolbar color="primary">
<ion-buttons slot="secondary">
<ion-button>
Expand Down
8 changes: 8 additions & 0 deletions src/styles/components/ion-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
&::part(native) {
height: 32px;
}
&.button-has-icon-only {
width: 32px;
height: 32px;
}
&.button-has-icon-only::part(native) {
width: 32px;
height: 32px;
Expand All @@ -61,6 +65,10 @@
&::part(native) {
height: 56px;
}
&.button-has-icon-only {
width: 56px;
height: 56px;
}
&.button-has-icon-only::part(native) {
width: 56px;
height: 56px;
Expand Down
48 changes: 41 additions & 7 deletions src/styles/components/ion-toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,50 @@ ion-footer.md:not(.md3-disabled) {

ion-header.md:not(.md3-disabled),
ion-footer.md:not(.md3-disabled) {
ion-buttons {
margin-left: 12px;
margin-right: 12px;
ion-buttons[slot='start'],
ion-back-button[slot='start'] {
margin-left: 16px;
}
ion-back-button {
margin-left: 12px;
margin-right: 12px;
ion-buttons[slot='end'],
ion-back-button[slot='end'] {
margin-right: 16px;
}
ion-toolbar ion-buttons ion-back-button {
/* fallback ion-buttons[slot=end], ion-back-button[slot=end] */
ion-toolbar ion-buttons > ion-back-button {
margin-left: 0;
margin-right: 0;
}
}

ion-header.md:not(.md3-disabled) ion-toolbar {
&:has([slot='start']) ion-title {
padding-inline-start: 4px;
}
&:not(:has([slot='start'])) ion-title {
padding-inline-start: calc(16px + 12px);
}
}

ion-toolbar.md:not(.md3-disabled) {
ion-back-button.back-button-has-icon-only {
--icon-font-size: 24px;
&::part(native) {
width: 48px;
height: 48px;
padding: 0;
}
}

ion-button.button-has-icon-only:not(.button-small):not(.button-large) {
&::part(native) {
width: 48px;
height: 48px;
}
&.button-solid {
&::part(native) {
width: 40px;
height: 40px;
}
}
}
}
Loading