Skip to content

Commit b67c6d6

Browse files
committed
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular-samples into zkolev/promote-to-prod-1210
2 parents e000bac + 9ae0462 commit b67c6d6

9 files changed

Lines changed: 77 additions & 17 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "igniteui-live-editing-samples"]
22
path = igniteui-live-editing-samples
33
url = https://github.com/IgniteUI/igniteui-live-editing-samples
4-
branch = vNext
4+
branch = master

angular.json

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,30 @@
8080
}
8181
],
8282
"tsConfig": "src/tsconfig-es5.app.json"
83-
}
83+
},
84+
"es5Prod": {
85+
"budgets": [
86+
{
87+
"type": "anyComponentStyle",
88+
"maximumWarning": "900kb"
89+
}
90+
],
91+
"optimization": true,
92+
"outputHashing": "all",
93+
"sourceMap": false,
94+
"namedChunks": false,
95+
"aot": true,
96+
"extractLicenses": true,
97+
"vendorChunk": false,
98+
"buildOptimizer": true,
99+
"fileReplacements": [
100+
{
101+
"replace": "src/environments/environment.ts",
102+
"with": "src/environments/environment.prod.ts"
103+
}
104+
],
105+
"tsConfig": "src/tsconfig-es5.app.json"
106+
}
84107
}
85108
},
86109
"serve": {

package-lock.json

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

projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@
168168
</igx-tabs>
169169
</igx-dialog>
170170

171-
172171
<igx-dialog #chartPreviewDialog title="Preview Chart">
173172
<div class="preview-wrapper">
174173
<ng-template #chartPreview chartHost></ng-template>

projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,14 @@
206206
}
207207
}
208208

209+
::ng-deep {
210+
.preview-wrapper {
211+
.igx-data-chart {
212+
height: 200px !important;
213+
}
214+
}
215+
}
216+
209217
.btn {
210218

211219
&.condition {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, EventEmitter, HostBinding, OnDestroy, Output, ViewChild, ViewEncapsulation } from '@angular/core';
1+
import { Component, EventEmitter, HostBinding, OnDestroy, Output, ViewChild } from '@angular/core';
22
import { IDialogEventArgs, IgxDialogComponent } from 'igniteui-angular';
33
import { IgxCategoryChartComponent } from 'igniteui-angular-charts';
44
import { ControllerComponent } from './controllers.component';

projects/app-lob/src/app/grid/grid-boston-marathon/grid.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,4 +249,4 @@ $progressBar-sample-theme: igx-progress-linear-theme(
249249

250250
.linear-bar-container {
251251
margin: auto;
252-
}
252+
}

src/app/services/services-routing.module.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ export const servicesRoutes: Routes = [
6666
data: servicesRoutesData['localization-all-resources'],
6767
path: 'localization-all-resources'
6868
},
69+
{
70+
component: LocalizationAllResourcesComponent,
71+
data: servicesRoutesData['localization-all-resources'],
72+
path: 'localization-all-resources'
73+
},
6974
{
7075
component: TransactionBaseComponent,
7176
data: servicesRoutesData['transaction-base'],

src/styles.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
@import './variables';
22
@import './app-layout';
33

4+
5+
.light-theme {
6+
@include igx-light-theme($default-palette);
7+
}
8+
9+
$grays-btn-color: igx-color($green-palette, 'grays', 800);
10+
411
/* autoprefixer grid: on */
512
html,
613
body {

0 commit comments

Comments
 (0)