-
Notifications
You must be signed in to change notification settings - Fork 2
refactor(themes): consume grid schemas from theming package #7
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
de20a33
refactor(igc-grid-lite): consume grid schemas from theming package
desig9stein 3d8baab
chore(deps): upgrade igniteui-theming to v24.0.0
desig9stein 029b7c7
refactor(themes): update grid styles
desig9stein cc6dd47
chore(deps): bump igniteui-theming to v24.0.0 in package-lock.json
desig9stein 2495770
fix(styles): fox lint errors
desig9stein bc15c10
fix(styles): fox scrollbars color
desig9stein 058bf44
fix(styles): correct row-odd styling in body-row component
desig9stein File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,44 @@ | ||
| @use "../../node_modules/igniteui-theming/" as *; | ||
| @forward "../../node_modules/igniteui-theming/"; | ||
| @use 'igniteui-theming' as *; | ||
| @forward 'igniteui-theming'; | ||
|
|
||
| $ig-cells-padding: sizable(rem(8px), rem(16px), rem(24px)); | ||
| $ig-cells-min-height: sizable(rem(24px), rem(34px), rem(50px)); | ||
|
|
||
| :host { | ||
| @include sizable(); | ||
| @mixin ig-scrollbar($track-size, $track-bg, $thumb-bg) { | ||
| // Firefox only | ||
| scrollbar-width: $track-size; | ||
| scrollbar-color: $thumb-bg $track-bg; | ||
|
|
||
| // Chromium only | ||
| ::-webkit-scrollbar { | ||
| width: $track-size; | ||
| height: $track-size; | ||
| background: $track-bg; | ||
| } | ||
|
|
||
| ::-webkit-scrollbar-thumb { | ||
| background: $thumb-bg; | ||
| } | ||
| } | ||
|
|
||
| --component-size: 3; | ||
| :host { | ||
| @include sizable(); | ||
|
|
||
| --component-size: 3; | ||
|
|
||
|
|
||
| position: relative; | ||
| box-sizing: border-box; | ||
|
|
||
| @include ig-scrollbar( | ||
| var(--ig-scrollbar-size, var(--sb-size)), | ||
| var(--ig-scrollbar-track-background, var(--sb-track-bg-color)), | ||
| var(--ig-scrollbar-thumb-background, var(--sb-thumb-bg-color)) | ||
| ); | ||
|
|
||
| *, | ||
| *::before, | ||
| *::after { | ||
| box-sizing: border-box; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,33 @@ | ||
| @use '../common' as *; | ||
| @use '../themes/light/themes' as *; | ||
|
|
||
| $row-border-width: var(--igx-row-border-width, var(--header-border-width)); | ||
| $row-border-style: var(--igx-row-border-style, var(--header-border-style)); | ||
| $row-border-color: var(--igx-row-border-color, var(--header-border-color)); | ||
| $row-odd-background: var(--igx-row-odd-background, var(--row-odd-background)); | ||
| $row-odd-text-color: var(--igx-row-odd-text-color, var(--row-odd-text-color)); | ||
| $row-even-background: var(--igx-row-even-background, var(--row-even-background)); | ||
| $row-even-text-color: var(--igx-row-even-text-color, var(--row-even-text-color)); | ||
| $row-hover-background: var(--igx-row-hover-background, var(--row-hover-background)); | ||
| $row-hover-text-color: var(--igx-row-hover-text-color, var(--row-hover-text-color)); | ||
| $theme: $material; | ||
|
|
||
| :host { | ||
| display: grid; | ||
| width: 100%; | ||
| min-height: $ig-cells-min-height; | ||
| border-block-end: $row-border-width $row-border-style $row-border-color; | ||
| background: $row-odd-background; | ||
| color: $row-odd-text-color; | ||
| border-block-end: rem(1px) solid var-get($theme, 'row-border-color'); | ||
| background: var-get($theme, 'content-background'); | ||
| color: var-get($theme, 'row-odd-text-color'); | ||
| z-index: var(--z-index-base); | ||
| } | ||
|
|
||
| :host(:last-of-type) { | ||
| border-bottom: 0; | ||
| } | ||
|
|
||
| :host(:nth-of-type(odd)) { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should use the odd colors here. |
||
| background: var-get($theme, 'row-odd-background'); | ||
| color: var-get($theme, 'row-odd-text-color'); | ||
| } | ||
|
|
||
| :host(:nth-of-type(even)) { | ||
| background: $row-even-background; | ||
| color: $row-even-text-color; | ||
| background: var-get($theme, 'row-even-background'); | ||
| color: var-get($theme, 'row-even-text-color'); | ||
| } | ||
|
|
||
| :host(:hover) { | ||
| background: $row-hover-background; | ||
| color: $row-hover-text-color; | ||
| background: var-get($theme, 'row-hover-background'); | ||
| color: var-get($theme, 'row-hover-text-color'); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can use --row-border-style and --row-border-width as before, instead of hardcoded values.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The grid schema does not contain those props