Skip to content

Commit b032c39

Browse files
committed
Merge remote-tracking branch 'origin/master' into sstoychev/master-to-vnext
2 parents 776cd54 + 1456bb1 commit b032c39

6 files changed

Lines changed: 32 additions & 22 deletions

File tree

live-editing/configs/AccordionConfigGenerator.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,17 @@ export class AccordionConfigGenerator implements IConfigGenerator {
4040
shortenComponentPathBy: '/layouts/accordion/'
4141
}));
4242

43+
configs.push(new Config({
44+
component: 'AccordionStyleComponent',
45+
additionalFiles: ["/src/app/layouts/accordion/accordion-style/layout.scss"],
46+
appModuleConfig: new AppModuleConfig({
47+
imports: ['AccordionStyleComponent', 'IgxAccordionModule', 'IgxSwitchModule'],
48+
ngDeclarations: ['AccordionStyleComponent'],
49+
ngImports: ['IgxAccordionModule', 'IgxSwitchModule']
50+
}),
51+
shortenComponentPathBy: '/layouts/accordion/'
52+
}));
53+
4354
return configs;
4455
}
4556
}

live-editing/configs/SelectConfigGenerator.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ export class SelectConfigGenerator implements IConfigGenerator {
3737
shortenComponentPathBy: "/data-entries/select/"
3838
}));
3939

40-
configs.push(new Config({
41-
additionalFiles: ["/src/app/data-entries/select/select-styling/layout.scss"],
42-
appConfig: BaseAppConfig,
43-
component: 'SelectStylingComponent',
44-
shortenComponentPathBy: "/data-entries/select/"
45-
}));
46-
4740
configs.push(new Config({
4841
appConfig: BaseAppConfig,
4942
component: 'SelectInputDirectivesComponent'

live-editing/configs/TreeConfigGenerator.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ export class TreeConfigGenerator implements IConfigGenerator {
2222
appConfig: BaseAppConfig
2323
}));
2424

25+
configs.push(new Config({
26+
component: 'TreeStylingComponent',
27+
additionalFiles: ['/src/app/data/animations-data.ts', '/src/app/lists/tree/tree-styling/layout.scss'],
28+
appModuleConfig: new AppModuleConfig({
29+
imports: ['IgxTreeModule', 'IgxIconModule', 'TreeStylingComponent'],
30+
ngDeclarations: ['TreeStylingComponent'],
31+
ngImports: ['IgxTreeModule', 'IgxIconModule']
32+
}),
33+
}));
34+
2535
configs.push(new Config({
2636
component: 'TreeAdvancedSampleComponent',
2737
additionalFiles: ['/src/app/data/tree-file-data.ts',

src/app/grid/grid-row-editing-style/grid-row-editing-style.component.scss

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
@use "igniteui-angular/theming" as *;
33

44
$banner-theme: banner-theme(
5-
$banner-background: #494949,
6-
$banner-message-color: #ffcd0f,
7-
);
8-
9-
$icon-button-theme: icon-button-theme(
10-
$foreground: #ffcd0f,
11-
$hover-foreground: #ffffff
5+
$banner-background: #e3e3e3,
6+
$banner-message-color: color($purple-palette, "secondary", 600)
127
);
138

149
:host {
1510
::ng-deep {
1611
@include css-vars($banner-theme);
1712
@include css-vars($icon-button-theme);
1813
}
14+
}
15+
16+
igx-grid {
17+
@include palette($purple-palette);
1918
}

src/app/layouts/carousel/carousel-animations-sample/carousel-animations-sample.component.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,28 @@
1010
</span>
1111
</div>
1212
<div class="carousel-wrapper">
13-
<igx-carousel #carousel>
13+
<igx-carousel #carousel [indicators]="false">
1414
<igx-slide *ngFor="let slide of slides;">
1515
<div class="slide-wrapper">
1616
<igx-card elevated>
1717
<igx-card-header>
1818
<h4 igxCardHeaderTitle>{{slide.heading}}</h4>
1919
</igx-card-header>
20-
20+
2121
<igx-card-content>
2222
<p>{{slide.description}}</p>
2323
</igx-card-content>
24-
24+
2525
<igx-card-media>
2626
<img [src]="slide.image">
2727
</igx-card-media>
28-
28+
2929
<igx-card-actions>
3030
<a igxButton href="{{slide.link}}" target="_blank" rel="noopener" style="text-decoration: none;" igxStart>visit page</a>
3131
</igx-card-actions>
3232
</igx-card>
3333
</div>
3434
</igx-slide>
35-
<ng-template igxCarouselIndicator></ng-template>
3635
</igx-carousel>
3736
</div>
3837
</div>
39-

src/app/layouts/carousel/carousel-no-navigation-sample/carousel-no-navigation-sample.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="carousel-animation-wrapper">
22
<div class="carousel-wrapper">
3-
<igx-carousel [navigation]="false" [pause]="false" animationType="fade" [interval]="2000">
3+
<igx-carousel [navigation]="false" [indicators]="false" [pause]="false" animationType="fade" [interval]="2000" [gesturesSupport]="false">
44
<igx-slide #slide *ngFor="let item of slides">
55
<div style="height: 100%" [ngStyle]="slideStyle(item.image)">
66
<section class="promo-price" [ngClass]="{'animated': slide.active}">
@@ -9,7 +9,6 @@
99
</section>
1010
</div>
1111
</igx-slide>
12-
<ng-template igxCarouselIndicator></ng-template>
1312
</igx-carousel>
1413
</div>
1514
<div class="list-wrapper">

0 commit comments

Comments
 (0)