Skip to content

Commit 6433c6b

Browse files
authored
Merge pull request #3202 from IgniteUI/promote-vNext
Even vNext
2 parents 4f0acd2 + 770024d commit 6433c6b

5 files changed

Lines changed: 31 additions & 6 deletions

File tree

projects/app-lob/src/app/grid-finjs/controllers.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<div class="controls-holder">
33
<div class="switches">
44
<div class="control-item" *ngIf="isThemeSwitchVisible">
5-
<igx-switch [checked]="false" [(ngModel)]="theme" (change)="onChange('theme', $event)">Dark</igx-switch>
5+
<igx-switch class="theme-switch" [checked]="false" [(ngModel)]="theme"
6+
(change)="onChange('theme', $event)">Dark</igx-switch>
67
</div>
78
<div class="control-item">
89
<igx-switch [checked]="true" (change)="onChange('grouped', $event)" color="blue"

projects/app-lob/src/app/grid-finjs/main.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { AfterViewInit, Component, HostBinding, OnDestroy, ViewChild } from '@angular/core';
2+
import { Router } from '@angular/router';
23
import { IgxDialogComponent, IgxOverlayOutletDirective, OverlaySettings } from 'igniteui-angular';
34
import { IgxCategoryChartComponent } from 'igniteui-angular-charts';
45
import { Stock } from '../data/financialData';
@@ -31,6 +32,7 @@ export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
3132
public frequency = 500;
3233
private _timer: ReturnType<typeof setInterval>;
3334

35+
3436
public onSwitchChanged(event: { action: string; value: boolean }): void {
3537
switch (event.action) {
3638
case 'toolbar': {

projects/app-lob/src/app/treegrid-finjs/tree-grid-finjs-sample.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use '../../variables' as *;
22

33
:host ::ng-deep {
4-
.fin-dark-theme {
4+
.fin-dark-theme {
55
.finjs-slider,
66
.sample-toolbar,
77
.group-drop-area {

projects/app-lob/src/app/treegrid-finjs/tree-grid-finjs-sample.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,14 @@ export class TreeGridFinJSComponent implements OnDestroy, OnInit {
166166
* the below code is needed when accessing the sample through the navigation
167167
* it will style all the space below the sample component element, but not the navigation menu
168168
*/
169-
public onThemeChanged(event: any) {
169+
public onThemeChanged(event: any) {
170170
const parentEl = this.parentComponentEl();
171171
if (event.checked && parentEl.classList.contains('main')) {
172172
parentEl.classList.add('fin-dark-theme');
173173
} else {
174174
parentEl.classList.remove('fin-dark-theme');
175175
}
176176
}
177-
178177
public ngOnDestroy() {
179178
this.stopFeed();
180179
}

projects/app-lob/src/styles.scss

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,41 @@
11
@use 'igniteui-angular/theming' as *;
22
@use 'variables' as *;
33
@use 'app-layout';
4-
54
/* autoprefixer grid: on */
65
html,
76
body {
87
height: 100%;
98
overflow: hidden;
109
margin: 0;
1110
}
12-
1311
@include core();
1412
@include typography();
1513
@include theme(
1614
$palette: $palette,
1715
$schema: $schema
1816
);
17+
:root {
18+
@include palette($palette);
19+
}
20+
.light-theme {
21+
@include light-theme($palette);
22+
}
23+
.dark-theme {
24+
background: #333;
25+
color: #fff;
26+
@include dark-theme(
27+
$palette: $green-palette
28+
);
29+
.grid-chart-contextmenu-wrapper {
30+
@include fluent-dark-theme($fluent-excel-palette);
31+
}
32+
}
33+
34+
.fin-dark-theme {
35+
@include dark-theme($green-palette);
36+
background: #333;
37+
38+
::-moz-placeholder {
39+
opacity: 1;
40+
}
41+
}

0 commit comments

Comments
 (0)