Skip to content

Commit

Permalink
Merge branch 'vNext' into nalipiev/range-date-picker
Browse files Browse the repository at this point in the history
  • Loading branch information
Lipata authored May 14, 2020
2 parents 0b100e3 + 1d2acf5 commit 298c5a1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions projects/app-lob/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// @import '~minireset.css/minireset';
@import '~igniteui-angular/lib/core/styles/themes/index';
@include igx-core();
@include igx-theme($default-palette);
@include igx-theme($default-palette, $legacy-support: true);

@mixin scrollbar-love($scrollbar-color: null) {
$scrollbar-track: hexrgba(igx-color($default-palette, 'grays', 200));
Expand Down Expand Up @@ -120,7 +120,7 @@ $green-palette: igx-palette($primary: #09f,$secondary: #72da67, $surface: #333);
@include scrollbar-love();

.fin-dark-theme {
@include igx-dark-theme($green-palette);
@include igx-dark-theme($green-palette, $legacy-support: true);
$grays-btn-color: igx-color($green-palette, 'grays', 800);
@include scrollbar-love(lighten($grays-btn-color, 20%));

Expand Down
5 changes: 3 additions & 2 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
// @import '~minireset.css/minireset';
@import '~igniteui-angular/lib/core/styles/themes/index';
@include igx-core();
@include igx-theme($default-palette, $legacy-support: false);
@include igx-theme($default-palette, $legacy-support: true);

:root {
@include css-vars-from-palette($default-palette);
}

/* autoprefixer grid: on */
html,
body {
height: 100%;
Expand Down Expand Up @@ -113,7 +114,7 @@ $green-palette: igx-palette($primary: #09f,$secondary: #72da67, $surface: #333);
.dark-theme {
background: #333;
color: #fff;
@include igx-dark-theme($green-palette);
@include igx-dark-theme($green-palette, $legacy-support: true);

.grid-chart-contextmenu-wrapper{
@include igx-fluent-dark-theme($fluent-excel-palette);
Expand Down

0 comments on commit 298c5a1

Please sign in to comment.