Skip to content

Commit

Permalink
Merge cfb9d9c into 07f7ef2
Browse files Browse the repository at this point in the history
  • Loading branch information
simeonoff committed Apr 26, 2024
2 parents 07f7ef2 + cfb9d9c commit 181e84f
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 25 deletions.
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
Expand Up @@ -78,7 +78,7 @@
"globby": "^14.0.1",
"husky": "^9.0.11",
"ig-typedoc-theme": "^5.0.3",
"igniteui-theming": "^6.0.2",
"igniteui-theming": "^6.1.0-beta.1",
"keep-a-changelog": "^2.5.3",
"lint-staged": "^15.2.2",
"lit-analyzer": "^2.0.3",
Expand Down
1 change: 1 addition & 0 deletions src/components/slider/themes/shared/slider.common.scss
Expand Up @@ -26,6 +26,7 @@ $theme: $material;
[part='thumb-label-inner'] {
color: var-get($theme, 'label-text-color');
background: var-get($theme, 'label-background-color');
padding: 0 rem(8px);

&::after {
border-top: rem(10px) solid var-get($theme, 'label-background-color');
Expand Down
46 changes: 41 additions & 5 deletions src/components/slider/themes/shared/slider.indigo.scss
Expand Up @@ -3,8 +3,23 @@
@use '../light/themes' as *;

$theme: $indigo;
$thumb-size: rem(14px);
$thumb-size: rem(12px);
$thumb-radius: math.div($thumb-size, 2);
$thumb-scale-hover: calc(16 / 12);
$thumb-label-width: rem(36px);
$thumb-label-height: rem(22px);

[part='thumb-label-inner'] {
@include type-style('subtitle-2');
@include border-radius(rem(3px));

min-width: $thumb-label-width;
}

[part='thumb-label'] {
top: calc((#{$thumb-label-height} + rem(16px)) * -1);
height: $thumb-label-height;
}

[part='base']:hover {
[part='inactive'] {
Expand All @@ -29,21 +44,31 @@ $thumb-radius: math.div($thumb-size, 2);

line {
transform: none;
stroke-width: var-get($theme, 'track-step-size');
}
}

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

color: var-get($theme, 'tick-label-color');

}

[part~='thumb'] {
border: rem(2px) solid var-get($theme, 'thumb-border-color');
width: $thumb-size;
height: $thumb-size;
top: calc((#{$thumb-size} - #{$thumb-radius}) * -1);
margin-inline-start: calc((#{$thumb-size} - #{$thumb-radius}) * -1);

&:hover, &:active {
transform: scale($thumb-scale-hover);
border-color: var-get($theme, 'thumb-border-hover-color');
}

&:focus {
box-shadow: 0 0 0 rem(3px) var-get($theme, 'thumb-focus-color');
box-shadow: 0 0 0 rem(2px) var-get($theme, 'thumb-focus-color');
}

&::after {
Expand All @@ -53,12 +78,23 @@ $thumb-radius: math.div($thumb-size, 2);

:host([disabled]),
:host(:disabled) {
[part='fill'],
[part='tick'] {
[part='fill'] {
background: var-get($theme, 'disabled-fill-track-color');
}

[part='steps'] {
color: transparent;
}

[part='thumb'] {
border-color: var-get($theme, 'thumb-disabled-border-color');
}

[part='tick'] {
background: var-get($theme, 'disabled-base-track-color');
}

[part='tick-label'] {
color: var-get($theme, 'disabled-fill-track-color');
color: var-get($theme, 'disabled-base-track-color');
}
}
4 changes: 4 additions & 0 deletions src/components/textarea/themes/shared/textarea.indigo.scss
Expand Up @@ -86,6 +86,10 @@ textarea {
padding-block: rem(6px);
padding-inline: pad-inline(rem(2px), rem(4px), rem(6px));
margin-block-end: rem(1px);

&::placeholder {
font-style: italic;
}
}

[part~='filled'] {
Expand Down
6 changes: 3 additions & 3 deletions src/components/tree/themes/shared/item.common.scss
Expand Up @@ -30,17 +30,17 @@ $theme: $material;
max-height: var-get($theme, 'size');
}

:host(:not([disabled])[active]) {
:host(:not([disabled])[active]) [part~='wrapper'] {
background: var-get($theme, 'background-active');
color: var-get($theme, 'foreground-active');
}

:host(:not([disabled])[selected]) {
:host(:not([disabled])[selected]) [part~='wrapper']{
background: var-get($theme, 'background-selected');
color: var-get($theme, 'foreground-selected');
}

:host(:not([disabled])[selected][active]) {
:host(:not([disabled])[selected][active]) [part~='wrapper']{
background: var-get($theme, 'background-active-selected');
color: var-get($theme, 'foreground-active-selected');
}
Expand Down
60 changes: 48 additions & 12 deletions src/components/tree/themes/shared/item.indigo.scss
Expand Up @@ -3,30 +3,66 @@

$theme: $indigo;

:host {
--igc-tree-indentation-size: #{sizable(rem(8px), rem(12px), rem(16px))};
}

[part~='indicator'] {
min-width: rem(14px);
color: var-get($theme, 'icon-color');

igc-icon {
--ig-size: 1;
}
}

[part~='wrapper'] {
border-radius: rem(4px);
margin-block-end: rem(4px);

&::after {
border-radius: rem(4px);
}

&:hover {
&::after {
opacity: .3;
color: var-get($theme, 'foreground-active');
}
}

:host(:not([disabled])[selected]) {
[part~='wrapper'] {
background: var-get($theme, 'background');
color: var-get($theme, 'foreground');

&:hover {
&::after {
background: var-get($theme, 'hover-color');
}
}
}
}

[part~='wrapper'][part~='selected'] {
&:hover {
&::after {
:host(:not([disabled])[active]),
:host(:not([disabled])[active][selected]) {
[part~='wrapper'] {
&:hover {
background: var-get($theme, 'hover-selected-color');

&::after {
background: transparent;
}
}
}
}

:host(:not([disabled])[active]) {
&:hover {
color: var-get($theme, 'foreground-active');
}
[part~='focused'] {
box-shadow: inset 0 0 0 2px var-get($theme, 'border-color');
}

[part~='active'] {
&:hover {
color: var-get($theme, 'foreground-active');
:host([disabled]) {
[part~='indicator'] {
igc-icon {
color: var-get($theme, 'foreground-disabled');
}
}
}

0 comments on commit 181e84f

Please sign in to comment.