Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indigo Themes: Updates to Toast, Stepper, Rating #1249

Merged
merged 22 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
36c2ee8
Stepper - indigo theme update (#1243)
desig9stein Jun 13, 2024
fe6460a
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 13, 2024
c063cc3
deps(theming): bump to latest beta
simeonoff Jun 13, 2024
eb08636
chore(stepper): fix lint error
desig9stein Jun 13, 2024
30f7483
refactor(rating): update indigo theme to match the latest UI kit (#1255)
desig9stein Jun 17, 2024
4347884
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 18, 2024
d2055d6
deps(theming): bump to latest version
simeonoff Jun 18, 2024
7b5f0e6
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Jun 20, 2024
cee253c
fix(rating): fix issues
desig9stein Jun 20, 2024
bc99837
Merge branch 'master' into simeonoff/indigo-themes
SisIvanova Jun 24, 2024
e215bc2
fix(toast): sizing issues
SisIvanova Jun 24, 2024
27f9e35
Merge branch 'master' into simeonoff/indigo-themes
SisIvanova Jun 25, 2024
7a5a57f
build(deps): bump igniteui-theming to latest beta
simeonoff Jun 25, 2024
0c5f00d
fix(stepper): fix content padding size in horizontal mode
desig9stein Jun 26, 2024
e4c4097
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Jun 26, 2024
c3a713b
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 27, 2024
7a4be4e
build(deps): bump theming to latest beta
simeonoff Jun 27, 2024
212b119
fix(stepper): Use the existing variable for invalid subtitle and set …
desig9stein Jun 27, 2024
9a7b139
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 28, 2024
79c1a95
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 28, 2024
5f4835e
Merge branch 'master' into simeonoff/indigo-themes
SisIvanova Jul 2, 2024
c055aa1
build(deps): bump igniteui-theming to version 10
simeonoff Jul 2, 2024
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
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"globby": "^14.0.2",
"husky": "^9.0.11",
"ig-typedoc-theme": "^5.0.4",
"igniteui-theming": "^9.0.0",
"igniteui-theming": "^10.0.0-beta.4",
"keep-a-changelog": "^2.5.3",
"lint-staged": "^15.2.7",
"lit-analyzer": "^2.0.3",
Expand Down
2 changes: 0 additions & 2 deletions src/components/rating/themes/rating-symbol.base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
@use 'styles/utilities' as *;

:host {
--symbol-size: #{sizable(rem(18px), rem(24px), rem(36px))};

display: flex;
justify-content: center;
align-items: center;
Expand Down
2 changes: 2 additions & 0 deletions src/components/rating/themes/rating.base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
}

[part~='symbols'] {
--symbol-size: #{sizable(rem(18px), rem(24px), rem(36px))};

position: relative;
display: flex;
justify-content: center;
Expand Down
18 changes: 14 additions & 4 deletions src/components/rating/themes/shared/rating.indigo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,26 @@
$theme: $indigo;

:host {
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
--default-size: 2;
--component-size: var(--ig-size, #{var-get($theme, 'default-size')}) !important;

gap: rem(5px);
gap: rem(4px);
}

[part='base'] {
gap: rem(8px);
}

[part~='label'],
[part~='value-label'] {
@include type-style('body-1');
@include type-style('caption');
}

[part~='label'] {
padding-inline-start: rem(2px);
}

[part~='symbols'] {
--symbol-size: #{sizable(rem(18px), rem(24px), rem(30px))};

padding-inline-end: 0;
}
31 changes: 29 additions & 2 deletions src/components/stepper/themes/step/shared/step.common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ $theme: $material;
}

:host([complete]) {
[part~='header'] {
&:hover {
background: var-get($theme, 'complete-step-hover-background');
}

&:focus,
&:focus-within,
&:active {
background: var-get($theme, 'complete-step-focus-background');
}
}

[part~='body'] {
&::before {
border-inline-start-style: var-get($theme, 'complete-step-separator-style');
Expand Down Expand Up @@ -113,13 +125,28 @@ $theme: $material;
box-shadow: inset 0 0 0 var(--indicator-box-shadow-size) var-get($theme, 'invalid-indicator-outline');
}

[part~='title'],
[part~='subtitle'] {
[part~='title'] {
color: var-get($theme, 'invalid-title-color');
}

[part~='subtitle'] {
color: var-get($theme, 'invalid-subtitle-color')
}
}

:host([active]) {
[part~='header'] {
&:hover {
background: var-get($theme, 'current-step-hover-background');
}

&:focus,
&:focus-within,
&:active {
background: var-get($theme, 'current-step-focus-background');
}
}

[part~='indicator'] {
background: var-get($theme, 'current-indicator-background');
color: var-get($theme, 'current-indicator-color');
Expand Down
12 changes: 12 additions & 0 deletions src/components/stepper/themes/step/shared/step.indigo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
$theme: $indigo;

[part~='indicator'] {
@include type-style('button');

box-shadow: inset 0 0 0 var(--indicator-box-shadow-size) var-get($theme, 'indicator-outline');
}

Expand All @@ -14,11 +16,21 @@ $theme: $indigo;
}

:host([active]) {
[part~='title'] {
@include type-style('subtitle-2');
}

[part~='indicator'] {
box-shadow: inset 0 0 0 var(--indicator-box-shadow-size) var-get($theme, 'current-indicator-outline');
}
}

[part~='content'] {
@include type-style('body-2');

color: var-get($theme, 'content-foreground');
}

[part~='disabled'] {
[part~='indicator'] {
box-shadow: inset 0 0 0 var(--indicator-box-shadow-size) var-get($theme, 'disabled-indicator-outline');
Expand Down
9 changes: 7 additions & 2 deletions src/components/stepper/themes/stepper/stepper.indigo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

// STEPPER
:host {
--indicator-box-shadow-size: #{rem(2px)};
--separator-size: #{rem(2px)};
--indicator-box-shadow-size: #{rem(1px)};
--separator-size: #{rem(1px)};
}

:host([orientation='horizontal']) {
--separator-min-width : #{rem(40px)};
--horizontal-body-padding: #{rem(16px)};
}
2 changes: 1 addition & 1 deletion src/components/toast/themes/shared/toast.bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'styles/utilities' as *;

:host {
padding: rem(11px);
padding: rem(12px);
}
5 changes: 4 additions & 1 deletion src/components/toast/themes/shared/toast.common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ $theme: $material;
padding: rem(10px) rem(16px);
color: var-get($theme, 'text-color');
background: var-get($theme, 'background');
border: #{rem(1px)} solid var-get($theme, 'border-color');
box-shadow: var-get($theme, 'elevation');
border-radius: var-get($theme, 'border-radius');

&::after {
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'border-color');
}
}
2 changes: 2 additions & 0 deletions src/components/toast/themes/shared/toast.fluent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
@include type-style('caption');

padding: rem(8px) rem(12px);
margin-block: rem(42px);
margin-inline: auto;
}
9 changes: 9 additions & 0 deletions src/components/toast/themes/toast.base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
transform: translateX(calc(-50% + .5px));
margin: rem(42px) auto;
min-width: rem(52px);

&::after {
content: '';
position: absolute;
width: 100%;
height: 100%;
border-radius: inherit;
inset-inline: 0;
}
}

:host([position='bottom']) {
Expand Down
7 changes: 5 additions & 2 deletions stories/stepper.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,9 @@ const BasicTemplate = ({
.verticalAnimation=${verticalAnimation}
.horizontalAnimation=${horizontalAnimation}
>
<igc-step>
<igc-step complete>
<span slot="title">Step1</span>
<span slot="subtitle">(completed)</span>
<label for="first-name">First Name:</label>
<input type="text" id="first-name" name="first-name" required />
<br /><br />
Expand All @@ -155,6 +156,7 @@ const BasicTemplate = ({

<igc-step>
<span slot="title">Step 2</span>
<span slot="subtitle">(default)</span>
<label for="last-name">Last Name:</label>
<input type="text" id="last-name" name="last-name" required />
<br /><br />
Expand All @@ -174,8 +176,9 @@ const BasicTemplate = ({
<igc-button @click=${next}>Next</igc-button>
</igc-step>

<igc-step>
<igc-step disabled>
<span slot="title">Step 4</span>
<span slot="subtitle">(disabled)</span>
<div tabindex="0">
Tabbable content
<br />
Expand Down
Loading