Skip to content
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
863fc6e
fix accordion tokens
BenOsodrac Apr 21, 2025
8263909
fix avatar tokens
BenOsodrac Apr 21, 2025
e16104a
fix avatar typography
BenOsodrac Apr 21, 2025
32e9822
fix backdrop tokens & architecture
BenOsodrac Apr 21, 2025
bee20eb
fix button tokens architecture
BenOsodrac Apr 21, 2025
63f71c6
fix lint
BenOsodrac Apr 21, 2025
93afcbe
fix card import
BenOsodrac Apr 21, 2025
f6e1a15
fix chip tokens
BenOsodrac Apr 21, 2025
0b754b0
fix chip line-height
BenOsodrac Apr 21, 2025
c2faa10
gix input-password-toggle tokens
BenOsodrac Apr 21, 2025
73f68e7
fix item tokens
BenOsodrac Apr 21, 2025
b1d8de7
fix item-option tokens
BenOsodrac Apr 21, 2025
0685641
fix item-options tokens
BenOsodrac Apr 21, 2025
7844bda
fix list tokens
BenOsodrac Apr 21, 2025
bd74ac1
fix list-header tokens
BenOsodrac Apr 21, 2025
9c7886d
fix modal tokens
BenOsodrac Apr 21, 2025
4b0da4e
fix progress-bar tokens
BenOsodrac Apr 21, 2025
7f87d79
fix radio tokens
BenOsodrac Apr 21, 2025
2f398ef
fix range tokens
BenOsodrac Apr 21, 2025
7473309
fix ripple-effect tokens
BenOsodrac Apr 21, 2025
78f6d3c
fix searchbar tokens
BenOsodrac Apr 21, 2025
a22f034
fix spinner tokens
BenOsodrac Apr 21, 2025
7d6c1c8
fix tab-button tokens
BenOsodrac Apr 22, 2025
50ecdb3
fix toast tokens
BenOsodrac Apr 22, 2025
668caf1
fix toggle tokens
BenOsodrac Apr 22, 2025
ee5c1c4
fix badge tokens
BenOsodrac Apr 22, 2025
01fe718
fix input tokens
BenOsodrac Apr 22, 2025
3201a19
fix select tokens
BenOsodrac Apr 22, 2025
c9d0c69
fix textarea tokens
BenOsodrac Apr 22, 2025
482d4a0
chore(): add updated snapshots
Ionitron Apr 22, 2025
73bd0ff
fix input warning disabled
BenOsodrac Apr 22, 2025
f169494
fix progress buffle color
BenOsodrac Apr 22, 2025
61e0ffe
fix spinner tests
BenOsodrac Apr 22, 2025
1a6458c
fix textarea tests
BenOsodrac Apr 22, 2025
bac6af1
fix lint
BenOsodrac Apr 22, 2025
529eb33
chore(): add updated snapshots
Ionitron Apr 22, 2025
3d28e67
fix textarea label
BenOsodrac Apr 22, 2025
1522e0f
chore(): add updated snapshots
Ionitron Apr 22, 2025
df841bf
chore(): add updated snapshots
Ionitron Apr 22, 2025
b0a6a7c
fix badge typography tokens
BenOsodrac Apr 22, 2025
458c570
remove input native vars file
BenOsodrac Apr 22, 2025
8e1d4b8
fix button typography
BenOsodrac Apr 22, 2025
716d621
remove chip font-family
BenOsodrac Apr 22, 2025
58efa3f
remove item font-family
BenOsodrac Apr 22, 2025
38a1b7b
fix tab-bar shape test
BenOsodrac Apr 22, 2025
eb3951e
fix lint
BenOsodrac Apr 22, 2025
0202754
chore(): add updated snapshots
Ionitron Apr 22, 2025
d74af2f
revert button typography changes
BenOsodrac Apr 23, 2025
9d90892
chore(): add updated snapshots
Ionitron Apr 23, 2025
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
2 changes: 0 additions & 2 deletions core/api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1707,10 +1707,8 @@ ion-progress-bar,prop,shape,"rectangular" | "round" | undefined,undefined,false,
ion-progress-bar,prop,theme,"ios" | "md" | "ionic",undefined,false,false
ion-progress-bar,prop,type,"determinate" | "indeterminate",'determinate',false,false
ion-progress-bar,prop,value,number,0,false,false
ion-progress-bar,css-prop,--background,ionic
ion-progress-bar,css-prop,--background,ios
ion-progress-bar,css-prop,--background,md
ion-progress-bar,css-prop,--progress-background,ionic
ion-progress-bar,css-prop,--progress-background,ios
ion-progress-bar,css-prop,--progress-background,md
ion-progress-bar,part,progress
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
// --------------------------------------------------

:host {
min-width: 272px;
min-width: calc(#{globals.$ion-scale-6200} + #{globals.$ion-space-600});

background-color: globals.$ion-primitives-base-white;
background-color: globals.$ion-bg-neutral-subtlest-default;
}

// Inset Accordion Group
Expand Down
10 changes: 5 additions & 5 deletions core/src/components/accordion/accordion.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

height: globals.$ion-border-size-025;

background-color: globals.$ion-primitives-neutral-300;
background-color: globals.$ion-border-default;

content: "";

Expand All @@ -43,9 +43,9 @@
// we are adding a border to the ::after element of the accordion.
::slotted(ion-item[slot="header"]) {
--border-radius: inherit;
--color: #{globals.$ion-primitives-neutral-1200};
--border-width: 0;
--inner-border-width: 0;
--color: #{globals.$ion-text-default};
--border-width: #{globals.$ion-border-size-0};
--inner-border-width: #{globals.$ion-scale-0};
--min-height: #{globals.$ion-scale-700};
--padding-top: #{globals.$ion-space-300};
--padding-end: #{globals.$ion-space-400};
Expand All @@ -62,7 +62,7 @@
@include globals.padding(null, globals.$ion-space-400, globals.$ion-space-300, globals.$ion-space-400);
@include globals.typography(globals.$ion-body-md-regular);

color: globals.$ion-primitives-neutral-1000;
color: globals.$ion-text-default;
}

// Disabled Accordion
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/avatar/avatar.common.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../themes/native/native.globals";
@import "../../themes/mixins.scss";

// Avatar
// --------------------------------------------------
Expand Down
44 changes: 17 additions & 27 deletions core/src/components/avatar/avatar.ionic.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "../../themes/ionic/ionic.globals.scss" as globals;
@import "./avatar.common";
@use "./avatar.common";

// Ionic Avatar
// --------------------------------------------------
Expand All @@ -8,21 +8,19 @@
--padding-top: #{globals.$ion-space-0};
--padding-bottom: #{globals.$ion-space-0};

@include globals.typography(globals.$ion-heading-h6-medium);

display: flex;

align-items: center;
justify-content: center;

background: globals.$ion-primitives-neutral-100;
color: globals.$ion-primitives-neutral-800;

font-weight: globals.$ion-font-weight-medium;

line-height: globals.$ion-font-line-height-700;
background: globals.$ion-bg-neutral-subtlest-default;
color: globals.$ion-text-subtlest;
}

:host(:not(.avatar-image)) {
@include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start));
@include globals.padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start));
}

// Avatar Sizes
Expand All @@ -33,38 +31,32 @@
--padding-end: #{globals.$ion-space-050};
--padding-start: #{globals.$ion-space-050};

@include globals.typography(globals.$ion-body-sm-medium);

width: globals.$ion-scale-400;
height: globals.$ion-scale-400;

font-size: globals.$ion-font-size-300;

line-height: globals.$ion-font-line-height-500;
}

/* Extra Small */
:host(.avatar-xsmall) {
--padding-end: #{globals.$ion-space-050};
--padding-start: #{globals.$ion-space-050};

@include globals.typography(globals.$ion-body-sm-medium);

width: globals.$ion-scale-600;
height: globals.$ion-scale-600;

font-size: globals.$ion-font-size-300;

line-height: globals.$ion-font-line-height-500;
}

/* Small */
:host(.avatar-small) {
--padding-end: #{globals.$ion-space-150};
--padding-start: #{globals.$ion-space-150};

@include globals.typography(globals.$ion-body-lg-medium);

width: globals.$ion-scale-800;
height: globals.$ion-scale-800;

font-size: globals.$ion-font-size-400;

line-height: globals.$ion-font-line-height-600;
}

/* Medium */
Expand All @@ -74,30 +66,28 @@

width: globals.$ion-scale-1000;
height: globals.$ion-scale-1000;

font-size: globals.$ion-font-size-450;
}

/* Large */
:host(.avatar-large) {
--padding-end: #{globals.$ion-space-250};
--padding-start: #{globals.$ion-space-250};

@include globals.typography(globals.$ion-heading-h5-medium);

width: globals.$ion-scale-1200;
height: globals.$ion-scale-1200;

font-size: globals.$ion-font-size-500;
}

/* Extra Large */
:host(.avatar-xlarge) {
--padding-end: #{globals.$ion-space-300};
--padding-start: #{globals.$ion-space-300};

@include globals.typography(globals.$ion-heading-h4-medium);

width: globals.$ion-scale-1400;
height: globals.$ion-scale-1400;

font-size: globals.$ion-font-size-550;
}

// Avatar Shapes
Expand Down Expand Up @@ -125,7 +115,7 @@
// --------------------------------------------------

:host(.avatar-icon) {
@include padding(0);
@include globals.padding(0);
}

:host(.avatar-xsmall) ::slotted(ion-icon) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "./backdrop.vars";
@import "../../themes/mixins.scss";

// Backdrop
// --------------------------------------------------
Expand All @@ -15,7 +15,6 @@
cursor: pointer;
opacity: 0.01;
touch-action: none;
z-index: $z-index-backdrop;
}

:host(.backdrop-hide) {
Expand Down
4 changes: 3 additions & 1 deletion core/src/components/backdrop/backdrop.ionic.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@use "../../themes/ionic/ionic.globals.scss" as globals;
@import "./backdrop";
@use "./backdrop.common";

:host {
background-color: rgba(globals.$ion-primitives-base-black-rgb, 0.7);

z-index: 2;
}
4 changes: 2 additions & 2 deletions core/src/components/backdrop/backdrop.ios.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "./backdrop";
@import "./backdrop.ios.vars";
@import "./backdrop.native";
@import "../../themes/native/native.globals.ios";

:host {
background-color: $backdrop-ios-color;
Expand Down
1 change: 0 additions & 1 deletion core/src/components/backdrop/backdrop.ios.vars.scss

This file was deleted.

4 changes: 2 additions & 2 deletions core/src/components/backdrop/backdrop.md.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "./backdrop";
@import "./backdrop.md.vars";
@import "./backdrop.native";
@import "../../themes/native/native.globals.md.scss";

:host {
background-color: $backdrop-md-color;
Expand Down
1 change: 0 additions & 1 deletion core/src/components/backdrop/backdrop.md.vars.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
@import "./backdrop.common";
@import "../../themes/native/native.globals";

// Button
// Backdrop
// --------------------------------------------------

/// @prop - Badge padding inside button
$button-badge-padding: 2px;
:host {
z-index: $z-index-backdrop;
}
13 changes: 0 additions & 13 deletions core/src/components/badge/badge.common.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@use "../../themes/functions.color" as color;
@import "../../themes/mixins";
@import "./badge.common.vars";

// Badge
// --------------------------------------------------
Expand All @@ -15,26 +14,14 @@
* @prop --padding-bottom: Bottom padding of the badge
* @prop --padding-start: Left padding if direction is left-to-right, and right padding if direction is right-to-left of the badge
*/
--padding-top: #{$badge-padding-top};
--padding-end: #{$badge-padding-end};
--padding-bottom: #{$badge-padding-bottom};
--padding-start: #{$badge-padding-start};

@include font-smoothing();
@include padding(var(--padding-top), var(--padding-end), var(--padding-bottom), var(--padding-start));

display: inline-block;

min-width: $badge-min-width;

background: var(--background);
color: var(--color);

font-size: $badge-font-size;
font-weight: $badge-font-weight;

line-height: 1;

text-align: center;

white-space: nowrap;
Expand Down
28 changes: 0 additions & 28 deletions core/src/components/badge/badge.common.vars.scss

This file was deleted.

28 changes: 7 additions & 21 deletions core/src/components/badge/badge.ionic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
--padding-top: #{globals.$ion-space-0};
--padding-bottom: #{globals.$ion-space-0};

@include globals.typography(globals.$ion-body-action-sm);

display: inline-flex;

align-items: center;
justify-content: center;

font-weight: globals.$ion-font-weight-medium;
min-width: globals.$ion-scale-250;
}

// Bold Badge
Expand Down Expand Up @@ -114,10 +116,6 @@

min-width: globals.$ion-scale-800;
height: globals.$ion-scale-800;

font-size: globals.$ion-font-size-400;

line-height: globals.$ion-font-line-height-600;
}

:host(.badge-small) ::slotted(ion-icon) {
Expand All @@ -127,12 +125,9 @@

/* Medium Badge */
:host(.badge-medium) {
@include globals.typography(globals.$ion-body-action-md);
min-width: globals.$ion-scale-1000;
height: globals.$ion-scale-1000;

font-size: globals.$ion-font-size-450;

line-height: globals.$ion-font-line-height-700;
}

:host(.badge-medium) ::slotted(ion-icon) {
Expand All @@ -142,12 +137,9 @@

/* Large Badge */
:host(.badge-large) {
@include globals.typography(globals.$ion-body-action-lg);
min-width: globals.$ion-scale-1200;
height: globals.$ion-scale-1200;

font-size: globals.$ion-font-size-500;

line-height: globals.$ion-font-line-height-700;
}

:host(.badge-large) ::slotted(ion-icon) {
Expand All @@ -157,12 +149,9 @@

/* Extra Large Badge */
:host(.badge-xlarge) {
@include globals.typography(globals.$ion-heading-h4-medium);
min-width: globals.$ion-scale-1400;
height: globals.$ion-scale-1400;

font-size: globals.$ion-font-size-550;

line-height: globals.$ion-font-line-height-700;
}

:host(.badge-xlarge) ::slotted(ion-icon) {
Expand Down Expand Up @@ -239,13 +228,10 @@
}

:host(:not(:empty).in-button) {
@include globals.typography(globals.$ion-body-action-xs);
min-width: globals.$ion-scale-400;
height: globals.$ion-scale-400;

font-size: globals.$ion-font-size-300;

line-height: globals.$ion-font-line-height-500;

::slotted(ion-icon) {
width: globals.$ion-scale-300;
height: globals.$ion-scale-300;
Expand Down
Loading
Loading