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, Tooltip, Stepper, Rating #14380

Merged
merged 35 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
8a159d4
feat(tooltip): implement indigo design changes (#14359)
SisIvanova Jun 12, 2024
a60a181
refactor(stepper): update stepper theme to match the latest indigo de…
desig9stein Jun 13, 2024
faac9b1
feat(toast): implement indigo design updates (#14354)
SisIvanova Jun 13, 2024
11dc5c4
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 13, 2024
cd0042d
depst(theming): bump to latest beta
simeonoff Jun 13, 2024
49500bd
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 18, 2024
a77f98e
deps(theming): bump to latest beta
simeonoff Jun 18, 2024
85e5edb
chore(stepper):fix lint waring
desig9stein Jun 18, 2024
0120771
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Jun 19, 2024
eb98328
Merge branch 'master' into simeonoff/indigo-themes
SisIvanova Jun 20, 2024
88c024c
fix(toast): sizing issues
SisIvanova Jun 20, 2024
7e31c22
Update _toast-theme.scss
SisIvanova Jun 20, 2024
5a70d77
Merge branch 'master' into simeonoff/indigo-themes
SisIvanova Jun 25, 2024
5f30761
deps(theming): bump to latest beta
SisIvanova Jun 25, 2024
28656e4
build(deps): bump igniteui-theming to latest beta
simeonoff Jun 25, 2024
633b981
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 25, 2024
457ae1d
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 26, 2024
e91da0c
build(deps): bump to latest igniteui-theming beta
simeonoff Jun 26, 2024
f9f9329
fix(stepper): fix typography and sizing issues
desig9stein Jun 26, 2024
8a5c0b3
build(deps): bump igniteui-theming to latest beta
desig9stein Jun 26, 2024
7a7c8f9
fix(stepper): fix vertical stepper body padding
desig9stein Jun 27, 2024
d9dc3f3
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Jun 28, 2024
fcc4326
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jun 28, 2024
8ba31b8
fix(stepper): update min-width of the indigo separator
desig9stein Jul 1, 2024
388bc67
fix(stepper): revert min width 0
desig9stein Jul 1, 2024
45a8dc2
fix(stepper): fix first step min-width
desig9stein Jul 1, 2024
139ff03
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jul 1, 2024
2b59766
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jul 3, 2024
1a7d53c
build(deps): bump igniteui-webcomponents to version 4.11.0
simeonoff Jul 3, 2024
6a743d8
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jul 3, 2024
fd33389
Merge branch 'master' into simeonoff/indigo-themes
SisIvanova Jul 3, 2024
e87a3a1
build(deps): bump igniteui-theming to version 10.0
simeonoff Jul 3, 2024
3282318
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jul 3, 2024
2b1dec3
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jul 4, 2024
8ada0f8
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Jul 4, 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
16 changes: 8 additions & 8 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@types/source-map": "0.5.2",
"express": "^4.19.2",
"fflate": "^0.8.1",
"igniteui-theming": "^9.0.0",
"igniteui-theming": "^10.0.0",
"igniteui-trial-watermark": "^3.0.2",
"lodash-es": "^4.17.21",
"rxjs": "^7.8.0",
Expand Down Expand Up @@ -118,7 +118,7 @@
"ig-typedoc-theme": "^5.0.4",
"igniteui-dockmanager": "^1.14.2",
"igniteui-sassdoc-theme": "^1.2.3",
"igniteui-webcomponents": "^4.7.0",
"igniteui-webcomponents": "^4.11.0",
"jasmine": "^5.1.0",
"jasmine-core": "~5.1.2",
"karma": "^6.4.2",
Expand Down
2 changes: 1 addition & 1 deletion projects/igniteui-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"igniteui-trial-watermark": "^3.0.2",
"lodash-es": "^4.17.21",
"uuid": "^9.0.0",
"igniteui-theming": "^9.0.0",
"igniteui-theming": "^10.0.0",
"@igniteui/material-icons-extended": "^3.0.0"
},
"peerDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

/// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
///
/// @param {Color} $content-foreground [null] - The foreground of the step content.
/// @param {Color} $step-background [null] - The background of the step header.
/// @param {Color} $step-hover-background [null] - The background of the step header on hover.
/// @param {Color} $step-focus-background [null] - The background of the step header on focus.
Expand Down Expand Up @@ -86,6 +87,8 @@
@function stepper-theme(
$schema: $light-material-schema,

$content-foreground: null,

$step-background: null,
$step-hover-background: null,
$step-focus-background: null,
Expand Down Expand Up @@ -241,6 +244,8 @@
name: $name,
selector: $selector,

content-foreground: $content-foreground,

// Incomplete
step-background: $step-background,
step-hover-background: $step-hover-background,
Expand Down Expand Up @@ -338,7 +343,7 @@
material: rem(24px),
fluent: rem(8px),
bootstrap: rem(24px),
indigo-design: rem(16px)
indigo-design: rem(8px)
), $variant);

$step-header-padding-simple: map.get((
Expand All @@ -348,7 +353,6 @@
indigo-design: rem(8px)
), $variant);

$step-body-padding: rem(16px);
$title-gap: rem(8px);
$indicator-gap: rem(4px);
$indicator-padding: rem(2px);
Expand All @@ -366,7 +370,7 @@
material: rem(1px),
fluent: rem(1px),
bootstrap: rem(8px),
indigo-design: rem(2px)
indigo-design: rem(1px)
), $variant);

$separator-title-top: calc(100% - ((#{$indicator-size} / 2) + #{$step-header-padding} + (#{$separator-size} / 2)));
Expand All @@ -392,6 +396,7 @@
}

%igx-stepper__body {
color: var-get($theme, 'content-foreground');
position: relative;
flex-direction: column;
flex: 1 1 auto;
Expand Down Expand Up @@ -525,19 +530,25 @@
background: var-get($theme, 'indicator-background');
box-shadow: 0 0 0 $outline-width var-get($theme, 'indicator-outline');

@if $variant != 'bootstrap' {
@if $variant == 'bootstrap' {
> igx-icon {
width: var(--igx-icon-size, #{rem(18px)});
height: var(--igx-icon-size, #{rem(18px)});
font-size: var(--igx-icon-size, #{rem(18px)});
}
} @else if $variant == 'indigo-design' {
> igx-icon {
width: var(--igx-icon-size, #{rem(14px)});
height: var(--igx-icon-size, #{rem(14px)});
font-size: var(--igx-icon-size, #{rem(14px)});
}
} @else {
> igx-icon {
width: var(--igx-icon-size, #{calc(#{$indicator-size} - #{rem(6px)})});
height: var(--igx-icon-size, #{calc(#{$indicator-size} - #{rem(6px)})});
font-size: var(--igx-icon-size, #{calc(#{$indicator-size} - #{rem(6px)})});
color: inherit;
}
} @else if $variant == 'bootstrap' {
> igx-icon {
width: var(--igx-icon-size, #{rem(18px)});
height: var(--igx-icon-size, #{rem(18px)});
font-size: var(--igx-icon-size, #{rem(18px)});
}
}

div > igx-icon,
Expand All @@ -559,6 +570,12 @@
}

%igx-stepper__step-title {
@if $variant == 'indigo-design' {
/* stylelint-disable scss/at-extend-no-missing-placeholder */
@extend .ig-typography__subtitle-2;
/* stylelint-enable scss/at-extend-no-missing-placeholder */
}

color: var-get($theme, 'current-title-color');
}

Expand Down Expand Up @@ -643,7 +660,7 @@

%igx-stepper__step-content-wrapper,
%igx-stepper__body-content {
padding: $step-body-padding;
padding: rem(16px);
}

%igx-stepper__body-content--active {
Expand All @@ -654,7 +671,7 @@
%igx-stepper__step-content-wrapper {
margin-inline-start: $v-line-indent;
position: relative;
min-height: rem(32px);
min-height: if($variant == 'indigo-design', rem(24px), rem(32px));

&::before {
content: '';
Expand All @@ -667,6 +684,22 @@
}
}

@if $variant == 'indigo-design' {
[aria-selected='true'] {
%igx-stepper__step-content-wrapper {
padding-block: rem(16px);
padding-inline-start: $v-line-indent;
padding-inline-end: rem(16px);
}
}

[aria-selected='false'] {
%igx-stepper__step-content-wrapper {
padding-block: 0;
}
}
}

%igx-stepper__step-title-wrapper {
white-space: nowrap;
text-overflow: ellipsis;
Expand Down Expand Up @@ -802,7 +835,7 @@
&::before {
content: '';
width: auto;
min-width: rem(10px);
min-width: if($variant == 'indigo-design', rem(40px), rem(10px));
height: $separator-size;
flex: 1;
position: relative;
Expand All @@ -813,7 +846,7 @@

&:first-of-type {
flex-grow: 0;
min-width: 0;
min-width: fit-content;

&::before {
display: none;
Expand Down Expand Up @@ -968,11 +1001,22 @@
@mixin stepper-typography(
$categories: (
title: 'body-2',
subtitle: 'caption'
subtitle: 'caption',
indicator: 'caption',
body-content: 'body-2'
)
) {
$title: map.get($categories, 'title');
$subtitle: map.get($categories, 'subtitle');
$indicator: map.get($categories, 'indicator');
$body-content: map.get($categories, 'body-content');

%igx-stepper__step-indicator {
@include type-style($indicator) {
margin-top: 0;
margin-bottom: 0;
}
}

%igx-stepper__step-title {
@include type-style($title) {
Expand All @@ -993,4 +1037,12 @@
font-weight: 600;
}
}

%igx-stepper__step-content-wrapper,
%igx-stepper__body-content {
@include type-style($body-content) {
margin-top: 0;
margin-bottom: 0;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,34 @@
$margin: rem(42px) auto;

$padding: map.get((
'material': rem(16px) rem(24px),
'fluent': rem(16px) rem(24px),
'material': rem(10px) rem(16px),
'fluent': rem(8px) rem(12px),
'bootstrap': rem(12px),
'indigo-design': rem(14px) rem(24px)
'indigo-design': rem(10px) rem(16px)
), $variant);

%igx-toast-display {
display: inline-flex;
justify-content: center;
align-items: center;
margin: $margin;
// !important is needed to override the typography styles
margin: $margin !important;
padding: $padding;
min-width: $width;
color: var-get($theme, 'text-color');
background: var-get($theme, 'background');
border: rem(1px) solid var-get($theme, 'border-color');
border-radius: var-get($theme, 'border-radius');
box-shadow: map.get($theme, 'shadow');
backdrop-filter: blur(10px);

&::after {
content: '';
position: absolute;
width: 100%;
height: 100%;
border-radius: inherit;
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'border-color');
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,8 @@

@extend %tooltip-display !optional;

@include m(desktop) {
@extend %tooltip-display !optional;
@extend %tooltip--desktop !optional;
}

@include m(mobile) {
@extend %tooltip-display !optional;
@extend %tooltip--mobile !optional;
}

@include m(disabled) {
@extend %tooltip--disabled !optional;
@include m(hidden) {
@extend %tooltip--hidden !optional;
}
}
}
Loading
Loading