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

Themes: Update Indigo Calendar, Select, and Combo #1337

Merged
merged 33 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
19c8618
calendar - update indigo theme to match the latest UI kit (#1293)
desig9stein Jul 31, 2024
1041b20
deps(theming): bump to latest version
simeonoff Jul 31, 2024
a665604
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Aug 13, 2024
da833c7
deps(theming): bump to latest beta containing changes
simeonoff Aug 13, 2024
2bc3b2d
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Aug 13, 2024
384eed1
deps(theming): bump to latest beta
simeonoff Aug 14, 2024
155dd61
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Aug 19, 2024
211167d
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Aug 21, 2024
160459e
deps(theming): bump to latest beta
simeonoff Aug 21, 2024
3b5a1fc
refactor(combo, select): update styles for focus/hover
simeonoff Aug 21, 2024
aabe382
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Aug 22, 2024
65ebc12
refactor(combo, select): update with indigo changes
simeonoff Aug 27, 2024
95ab226
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Aug 28, 2024
638e183
deps(theming): bump to latest beta
simeonoff Aug 30, 2024
60f0ea6
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Sep 4, 2024
b5d63c4
fix(calendar): change used variables for current range
desig9stein Aug 19, 2024
8aa7d63
fix(calendar): fix incorrectly consumed schema colors
desig9stein Sep 4, 2024
445f17b
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Sep 4, 2024
ecb7431
fix(calendar): make sure that disabled colors variables are used only…
desig9stein Sep 4, 2024
a163a66
fix(calendar): fix special selected and special selected current bord…
desig9stein Sep 4, 2024
8ce5a0f
fix stylelint warnings
desig9stein Sep 4, 2024
ed2727c
fix(calendar): Fix disabled for selected current range first/last and…
desig9stein Sep 4, 2024
363409b
fix(calendar): fix current state border
desig9stein Sep 5, 2024
1c602ce
fix(calendar): border for current selected
desig9stein Sep 5, 2024
d8aa448
fix(calendar): fix current state border
desig9stein Sep 5, 2024
e4aa029
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Sep 9, 2024
3e08efa
Merge branch 'master' into simeonoff/indigo-themes
desig9stein Sep 10, 2024
d85afc6
refactor(combo, select): update themes to match indigo design
simeonoff Sep 10, 2024
217cca1
refactor(combo, select): resolve issues around elevations
simeonoff Sep 11, 2024
9949a51
refactor(combo, select): fixes to background and toggle color
simeonoff Sep 11, 2024
1143ee0
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Sep 13, 2024
1575aef
Merge branch 'master' into simeonoff/indigo-themes
simeonoff Sep 20, 2024
be85901
deps(theming): bump to latest beta
simeonoff Sep 20, 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
9 changes: 4 additions & 5 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 @@ -79,7 +79,7 @@
"globby": "^14.0.2",
"husky": "^9.1.6",
"ig-typedoc-theme": "^5.0.4",
"igniteui-theming": "^11.0.0",
"igniteui-theming": "^12.2.1",
"keep-a-changelog": "^2.5.3",
"lint-staged": "^15.2.10",
"lit-analyzer": "^2.0.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,37 +355,53 @@ $border-size: rem(1px);
color: var-get($theme, 'date-special-foreground');
background: var-get($theme, 'date-special-background');

&::after {
border-color: var-get($theme, 'date-special-border-color');
}

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

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

&:focus {
color: var-get($theme, 'date-focus-foreground');
background: var-get($theme, 'date-focus-background');
}

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

&[part~='selected'][part~='special']:not([part~='range']) {
color: var-get($theme, 'date-selected-foreground');
background: var-get($theme, 'date-selected-background');

&::after {
border-color: var-get($theme, 'date-selected-special-border-color');
}

&:hover {
color: var-get($theme, 'date-selected-hover-foreground');
background: var-get($theme, 'date-selected-hover-background');

&::after {
border-color: var-get($theme, 'date-selected-special-hover-border-color');
}
}

&:focus {
color: var-get($theme, 'date-selected-focus-foreground');
background: var-get($theme, 'date-selected-focus-background');
}

&::after {
border-color: var-get($theme, 'date-selected-foreground');
&::after {
border-color: var-get($theme, 'date-selected-special-focus-border-color');
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,19 @@ $theme: $bootstrap;
padding-block-start: rem(16px);
}

[part~='month-inner'] {
[part~='month-inner'],
[part~='year-inner'] {
height: var-get($theme, 'size');
border-radius: var-get($theme, 'ym-border-radius');

&:focus,
&:focus-visible,
&:focus-within {
// Don't use outline color transparent here since :focus-visible will have transparent border around
// the element that will cover the outline of the box shadow.
outline: none;
}

&:focus,
&:hover {
color: var-get($theme, 'ym-hover-foreground');
Expand All @@ -17,95 +29,61 @@ $theme: $bootstrap;
&[part~='current'] {
color: var-get($theme, 'ym-current-foreground');
background: var-get($theme, 'ym-current-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-color');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-current-outline-color');

&:focus,
&:hover {
color: var-get($theme, 'ym-current-hover-foreground');
background: var-get($theme, 'ym-current-hover-background');
}

&:focus {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-current-outline-focus-color');
}

&:hover {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-hover-color');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-current-outline-hover-color');
}
}

&[part~='selected'] {
color: var-get($theme, 'ym-selected-foreground');
background: var-get($theme, 'ym-selected-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-outline-color');

&:focus,
&:hover {
color: var-get($theme, 'ym-selected-hover-foreground');
background: var-get($theme, 'ym-selected-hover-background');
}
}

&[part~='selected'][part~='current'] {
color: var-get($theme, 'ym-selected-current-foreground');
background: var-get($theme, 'ym-selected-current-background');

&:focus,
&:hover {
color: var-get($theme, 'ym-selected-current-hover-foreground');
background: var-get($theme, 'ym-selected-current-hover-background');
&:focus {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-focus-outline-color');
}
}
}

[part~='year-inner'] {
&:focus,
&:hover {
color: var-get($theme, 'ym-hover-foreground');
background: var-get($theme, 'ym-hover-background');
}

&[part~='current'] {
color: var-get($theme, 'ym-current-foreground');
background: var-get($theme, 'ym-current-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-color');

&:focus,
&:hover {
color: var-get($theme, 'ym-current-hover-foreground');
background: var-get($theme, 'ym-current-hover-background');
}
}

&[part~='selected'] {
color: var-get($theme, 'ym-selected-foreground');
background: var-get($theme, 'ym-selected-background');

&:focus,
&:hover {
color: var-get($theme, 'ym-selected-hover-foreground');
background: var-get($theme, 'ym-selected-hover-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-hover-outline-color');
}
}

&[part~='selected'][part~='current'] {
color: var-get($theme, 'ym-selected-current-foreground');
background: var-get($theme, 'ym-selected-current-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-color');

&:focus,
&:hover {
color: var-get($theme, 'ym-selected-current-hover-foreground');
background: var-get($theme, 'ym-selected-current-hover-background');
}
}
}

[part~='month-inner'],
[part~='year-inner'] {
height: var-get($theme, 'size');
border-radius: var-get($theme, 'ym-border-radius');
&:focus {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-focus-color');
}

&:focus,
&:focus-visible,
&:focus-within {
// Don't use outline color transparent here since :focus-visible will have transparent border around
// the element that will cover the outline of the box shadow.
outline: none;
&:hover {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-hover-color');
}
}
}

26 changes: 26 additions & 0 deletions src/components/calendar/themes/shared/fluent/days-view.fluent.scss
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,37 @@ $row-gap: rem(6px);
&:hover {
color: var-get($theme, 'date-hover-foreground');
background: var-get($theme, 'date-hover-background');

&::after {
border-color: var-get($theme, 'date-special-hover-border-color')
}
}

&:focus {
color: var-get($theme, 'date-focus-foreground');
background: var-get($theme, 'date-focus-background');

&::after {
border-color: var-get($theme, 'date-special-hover-border-color')
}
}
}

&[part~='selected'][part~='special'] {
&::after {
border-color: var-get($theme, 'date-selected-special-border-color');
}

&:hover {
&::after {
border-color: var-get($theme, 'date-selected-special-hover-border-color');
}
}

&:focus {
&::after {
border-color: var-get($theme, 'date-selected-special-focus-border-color');
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,19 @@

$theme: $fluent;

[part~='month-inner'] {
[part~='month-inner'],
[part~='year-inner'] {
height: var-get($theme, 'size');
border-radius: var-get($theme, 'ym-border-radius');

&:focus,
&:focus-visible,
&:focus-within {
// Don't use outline color transparent here since :focus-visible will have transparent border around
// the element that will cover the outline of the box shadow.
outline: none;
}

&:focus,
&:hover {
color: var-get($theme, 'ym-hover-foreground');
Expand All @@ -13,71 +25,41 @@ $theme: $fluent;
&[part~='current'] {
color: var-get($theme, 'ym-current-foreground');
background: var-get($theme, 'ym-current-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-current-outline-color');

&:focus,
&:hover {
color: var-get($theme, 'ym-current-hover-foreground');
background: var-get($theme, 'ym-current-hover-background');
}
}

&[part~='selected'] {
color: var-get($theme, 'ym-selected-foreground');
background: var-get($theme, 'ym-selected-background');

&:focus,
&:hover {
color: var-get($theme, 'ym-selected-hover-foreground');
background: var-get($theme, 'ym-selected-hover-background');
}
}

&[part~='selected'][part~='current'] {
color: var-get($theme, 'ym-selected-current-foreground');
background: var-get($theme, 'ym-selected-current-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-color');

&:focus,
&:hover {
color: var-get($theme, 'ym-selected-current-hover-foreground');
background: var-get($theme, 'ym-selected-current-hover-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-hover-color');
}

&:hover {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-hover-color');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-current-outline-hover-color');
}
}

}

[part~='year-inner'] {
&:focus,
&:hover {
color: var-get($theme, 'ym-hover-foreground');
background: var-get($theme, 'ym-hover-background');
}

&[part~='current'] {
color: var-get($theme, 'ym-current-foreground');
background: var-get($theme, 'ym-current-background');

&:focus,
&:hover {
color: var-get($theme, 'ym-current-hover-foreground');
background: var-get($theme, 'ym-current-hover-background');
&:focus {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-current-outline-focus-color');
}
}

&[part~='selected'] {
color: var-get($theme, 'ym-selected-foreground');
background: var-get($theme, 'ym-selected-background');
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-outline-color');

&:focus,
&:hover {
color: var-get($theme, 'ym-selected-hover-foreground');
background: var-get($theme, 'ym-selected-hover-background');
}

&:hover {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-hover-outline-color');
}

&:focus {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-focus-outline-color');
}
}

&[part~='selected'][part~='current'] {
Expand All @@ -94,19 +76,9 @@ $theme: $fluent;
&:hover {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-hover-color');
}
}
}

[part~='month-inner'],
[part~='year-inner'] {
height: var-get($theme, 'size');
border-radius: var-get($theme, 'ym-border-radius');

&:focus,
&:focus-visible,
&:focus-within {
// Don't use outline color transparent here since :focus-visible will have transparent border around
// the element that will cover the outline of the box shadow.
outline: none;
&:focus {
box-shadow: 0 0 0 rem(1px) var-get($theme, 'ym-selected-current-outline-focus-color');
}
}
}
Loading
Loading