Skip to content

Commit

Permalink
Merge branch 'next' into ROU-11387
Browse files Browse the repository at this point in the history
  • Loading branch information
BenOsodrac authored Dec 2, 2024
2 parents 686f5f7 + 4782a1a commit 1df9a05
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/components/toolbar/toolbar.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,5 @@ $toolbar-order-ionic: (
justify-content: end;
order: map-get($toolbar-order-ionic, slot-end);

font-size: var(--ionic-font-size-600, 1.5rem);
font-size: globals.$ion-font-size-600;
}
8 changes: 8 additions & 0 deletions core/src/css/display.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
// --------------------------------------------------
// Modifies display of a particular element based on the given classes

.ion-display-flex {
display: flex !important;
}

.ion-display-contents {
display: contents !important;
}

.ion-hide {
display: none !important;
}
Expand Down

0 comments on commit 1df9a05

Please sign in to comment.