Skip to content

Commit ceb8964

Browse files
author
Konstantin Dinev
committed
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-samples into kdinev-patch-2
2 parents 375e7c0 + 08f549d commit ceb8964

102 files changed

Lines changed: 1153 additions & 1201 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

angular.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"optimization": false,
3131
"namedChunks": true,
3232
"sourceMap": false,
33-
"progress": true
33+
"progress": true,
34+
"stylePreprocessorOptions": {
35+
"includePaths": ["node_modules"]
36+
}
3437
},
3538
"configurations": {
3639
"production": {
@@ -140,7 +143,10 @@
140143
},
141144
"progress": true,
142145
"optimization": false,
143-
"namedChunks": true
146+
"namedChunks": true,
147+
"stylePreprocessorOptions": {
148+
"includePaths": ["node_modules"]
149+
}
144150
},
145151
"configurations": {
146152
"production": {
@@ -267,7 +273,10 @@
267273
},
268274
"progress": true,
269275
"optimization": false,
270-
"namedChunks": true
276+
"namedChunks": true,
277+
"stylePreprocessorOptions": {
278+
"includePaths": ["node_modules"]
279+
}
271280
},
272281
"configurations": {
273282
"production": {

live-editing/configs/SliderConfigGenerator.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { HammerModule } from '@angular/platform-browser';
66
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
77
export class SliderConfigGenerator implements IConfigGenerator {
88

9-
109
public generateConfigs(): Config[] {
1110
const configs = new Array<Config>();
1211

package-lock.json

Lines changed: 27 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@
6363
"domino": "^2.1.4",
6464
"file-saver": "^2.0.2",
6565
"hammerjs": "^2.0.8",
66-
"igniteui-angular": "^14.2.0",
66+
"igniteui-angular": "^15.0.0-beta.1",
6767
"igniteui-angular-charts": "^14.0.0",
6868
"igniteui-angular-core": "^14.0.0",
6969
"igniteui-angular-i18n": "^14.2.0",
7070
"igniteui-dockmanager": "^1.8.0",
7171
"igniteui-live-editing": "^2.0.4",
72+
"igniteui-theming": "^1.0.2",
7273
"igniteui-webcomponents": "^3.4.0",
7374
"immediate": "^3.2.3",
7475
"intl": "^1.2.5",
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
@use 'igniteui-angular/theming' as *;
22
@forward 'igniteui-angular/theming';
33

4-
5-
$legacy-support: true;
64
$palette: $light-material-palette;
75
$schema: $light-material-schema;
86

9-
$default-palette: $palette;
10-
$igx-legacy-support: $legacy-support;
11-
127
$green-palette: palette(
138
$primary: #09f,
149
$secondary: #72da67,
15-
$grays: #fff,
16-
$surface: #333
10+
$gray: #fff,
11+
$surface: #333,
12+
$info: color($palette, 'info'),
13+
$success: color($palette, 'success'),
14+
$warn: color($palette, 'warn'),
15+
$error: color($palette, 'error'),
1716
);
1817

19-
$grays-btn-color: color($green-palette, 'grays', 800);
18+
$gray-btn-color: color($green-palette, 'gray', 800);

0 commit comments

Comments
 (0)