Skip to content

Commit 8d1f07e

Browse files
authored
Merge pull request #3593 from IgniteUI/sstoychev/master-to-vnext
Bringing master changes to vnext
2 parents 776cd54 + f601923 commit 8d1f07e

File tree

6 files changed

+27
-30
lines changed

6 files changed

+27
-30
lines changed

live-editing/configs/HierarchicalGridConfigGenerator.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
IgxDialogModule,
1313
IgxDragDropModule,
1414
IgxGridModule,
15-
IgxHierarchicalGridAPIService,
1615
IgxHierarchicalGridModule,
1716
IgxIconModule,
1817
IgxInputGroupModule,

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'
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
@use "layout.scss";
22
@use "igniteui-angular/theming" as *;
33

4+
$banner-theme: banner-theme(
5+
$banner-background: #e3e3e3,
6+
$banner-message-color: color($purple-palette, "secondary", 600),
7+
);
48
$banner-theme: banner-theme(
59
$banner-background: #494949,
610
$banner-message-color: #ffcd0f,
@@ -12,8 +16,12 @@ $icon-button-theme: icon-button-theme(
1216
);
1317

1418
:host {
15-
::ng-deep {
16-
@include css-vars($banner-theme);
17-
@include css-vars($icon-button-theme);
18-
}
19-
}
19+
::ng-deep {
20+
@include css-vars($banner-theme);
21+
@include css-vars($icon-button-theme);
22+
}
23+
}
24+
25+
igx-grid {
26+
@include palette($purple-palette);
27+
}

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">

src/app/theming/angular/angular-sample.component.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -183,31 +183,31 @@ igx-expansion-panel-body {
183183

184184
.mat-mdc-slider.secondary .mdc-slider__track--inactive,
185185
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
186-
background-color: color($custom-mat-dark-theme, 'accent');
186+
background-color: color($custom-mat-dark-theme, accent, default);
187187
}
188188

189189
.mat-mdc-slider.secondary .mdc-slider__track--active_fill,
190190
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
191-
border-color: color($custom-mat-dark-theme, 'accent');
191+
border-color: color($custom-mat-dark-theme, accent, default);
192192
}
193193

194194
.mat-mdc-slider.secondary .mat-mdc-slider-visual-thumb .mat-ripple > * {
195-
background-color: color($custom-mat-dark-theme, 'accent');
195+
background-color: color($custom-mat-dark-theme, accent, default);
196196
opacity: .12;
197197
}
198198

199199
.mat-step-header .mat-step-icon-selected {
200-
background-color: color($custom-dark-palette, 'secondary');
200+
background-color: color($custom-dark-palette, secondary);
201201
}
202202

203203
.mat-stepper-horizontal,
204204
.mat-mdc-form-field-focus-overlay,
205205
.mdc-text-field--filled:not(.mdc-text-field--disabled) {
206-
background: color($custom-dark-palette, 'surface');
206+
background: color($custom-dark-palette, surface);
207207
}
208208

209209
igx-expansion-panel h5 {
210-
color: color($custom-dark-palette, 'gray', 800);
210+
color: color($custom-dark-palette, "gray", 800);
211211
}
212212
}
213213
}
@@ -233,16 +233,16 @@ igx-expansion-panel-body {
233233

234234
.mat-mdc-slider.secondary .mdc-slider__track--inactive,
235235
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
236-
background-color: color($custom-mat-light-theme, 'accent');
236+
background-color: color($custom-mat-light-theme, accent, default);
237237
}
238238

239239
.mat-mdc-slider.secondary .mdc-slider__track--active_fill,
240240
.mat-mdc-slider.secondary .mdc-slider__thumb-knob {
241-
border-color: color($custom-mat-light-theme, 'accent');
241+
border-color: color($custom-mat-light-theme, accent, default);
242242
}
243243

244244
.mat-mdc-slider.secondary .mat-mdc-slider-visual-thumb .mat-ripple > * {
245-
background-color: color($custom-mat-light-theme, 'accent');
245+
background-color: color($custom-mat-light-theme, accent, default);
246246
opacity: .12;
247247
}
248248

0 commit comments

Comments
 (0)