Skip to content

Commit ce8a1f0

Browse files
desig9steindesig9stein
authored
Merge branch 'vNext' into mpopov/fin_js_styling_refactoring
2 parents 5f11248 + 5afe60b commit ce8a1f0

2 files changed

Lines changed: 86 additions & 10 deletions

File tree

‎projects/app-crm/src/app/grid-crm/grid-crm.component.scss‎

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,32 @@
55

66
:host ::ng-deep {
77
$crm-grid-palette: palette($primary: #09f, $secondary: #ffbf00);
8+
$crm-grid-dark-palette: palette($primary: #09f, $secondary: #fff);
89
@include theme($crm-grid-palette);
910

1011
$checkbox-theme: checkbox-theme($fill-color: color($crm-grid-palette, 'secondary', 500), $tick-color: black);
12+
$checkbox-dark-theme: checkbox-theme($fill-color: color($crm-grid-palette, 'grays', 50), $tick-color: black);
1113
$summary-theme: grid-summary-theme($background-color: #f0f8fe, $result-color: color($crm-grid-palette, 'primary', 500));
1214
$search-theme: input-group-theme($search-background: color($crm-grid-palette, 'primary', 600), $idle-text-color: color($crm-grid-palette, 'primary', 100), $filled-text-color: color($crm-grid-palette, 'grays', 600), $focused-text-color: color($crm-grid-palette, 'grays', 600));
1315
$crm-grid-theme: grid-theme($header-background: #f0f8fe, $header-border-color: #dde5eb);
16+
$crm-dark-grid-theme: grid-theme(
17+
$row-selected-background: color($crm-grid-palette, 'grays', 800),
18+
$row-hover-background: color($crm-grid-palette, 'grays', 700),
19+
$row-selected-hover-background: color($crm-grid-palette, 'grays', 700),
20+
$cell-active-border-color: color($crm-grid-palette, 'primary', 50),
21+
$cell-selected-background: color($crm-grid-palette, 'grays', 50),
22+
);
1423
$crm-grid-toolbar: grid-toolbar-theme($background-color: color($crm-grid-palette, 'primary', 500));
1524
$crm-grid-toolbar-button: button-theme($background: color($crm-grid-palette, 'primary', 800), $hover-background: color($crm-grid-palette, 'primary', 900), $focus-foreground: #fff);
1625
$crm-grid-search-button: button-theme($background: transparent, $focus-background: color($crm-grid-palette, 'grays', 200), $hover-background: color($crm-grid-palette, 'grays', 200));
26+
$crm-grid-dark-button: button-theme(
27+
$foreground: color($crm-grid-dark-palette, 'primary', 500),
28+
$hover-foreground: color($crm-grid-dark-palette, 'primary', 500),
29+
$focus-foreground: color($crm-grid-dark-palette, 'primary', 500),
30+
);
31+
$crm-grid-dark-progress: progress-linear-theme(
32+
$track-color: color($crm-grid-palette, 'grays', 500)
33+
);
1734
$crm-input-drop-down: input-group-theme($placeholder-color: color($crm-grid-palette, 'grays', 500), $idle-text-color: color($crm-grid-palette, 'grays', 900));
1835

1936
.grid__wrapper {
@@ -67,7 +84,7 @@
6784
width: 70%
6885
}
6986

70-
@include grid-toolbar($crm-grid-toolbar);
87+
@include css-vars($crm-grid-toolbar);
7188

7289
.igx-grid-toolbar__actions {
7390
.igx-button--outlined {
@@ -105,7 +122,7 @@
105122
}
106123

107124
.igx-grid-toolbar__actions {
108-
@include button($crm-grid-toolbar-button);
125+
@include css-vars($crm-grid-toolbar-button);
109126
}
110127

111128
.crm-sample-toolbar__title {
@@ -175,7 +192,7 @@
175192
margin-left: 4px;
176193
}
177194

178-
@include input-group($search-theme);
195+
@include css-vars($search-theme);
179196

180197
.case-sensitive--active {
181198
background: color($crm-grid-palette, 'primary', 200);
@@ -191,7 +208,7 @@
191208
}
192209

193210
.igx-drop-down__list {
194-
@include input-group($crm-input-drop-down)
211+
@include css-vars($crm-input-drop-down)
195212
}
196213

197214
.sample-flex-container {
@@ -268,20 +285,24 @@
268285
.igx-input-group--search .igx-input-group__bundle {
269286
background-color: color($crm-grid-palette, 'primary', 800);
270287

271-
@include button($crm-grid-search-button);
288+
@include css-vars($crm-grid-search-button);
272289
}
273290

274291
// Not dark theme
275292
.grid__wrapper:not(.dark_grid) {
276-
@include grid($crm-grid-theme);
277-
@include grid-summary($summary-theme);
293+
@include css-vars($crm-grid-theme);
294+
@include css-vars($summary-theme);
278295
}
279296

280297
.dark_grid {
281-
@include dark-theme($dark-material-palette);
282-
@include grid-toolbar($crm-grid-toolbar);
298+
@include dark-theme($crm-grid-dark-palette);
299+
@include css-vars($checkbox-dark-theme);
300+
@include css-vars($crm-grid-toolbar);
301+
@include css-vars($crm-dark-grid-theme);
302+
@include css-vars($crm-grid-dark-button);
303+
@include css-vars($crm-grid-dark-progress);
283304
.igx-grid-toolbar__actions {
284-
@include button($crm-grid-toolbar-button);
305+
@include css-vars($crm-grid-toolbar-button);
285306
}
286307
}
287308
}

‎projects/app-crm/web.config‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<system.webServer>
4+
<httpCompression directory="%SystemDrive%\inetpub\temp\IIS Temporary Compressed Files">
5+
<scheme name="gzip" dll="%Windir%\system32\inetsrv\gzip.dll" />
6+
<dynamicTypes>
7+
<add enabled="true" mimeType="text/*"/>
8+
<add enabled="true" mimeType="message/*"/>
9+
<add enabled="true" mimeType="application/javascript"/>
10+
<add enabled="true" mimeType="application/json"/>
11+
<add enabled="false" mimeType="*/*"/>
12+
</dynamicTypes>
13+
<staticTypes>
14+
<add enabled="true" mimeType="text/*"/>
15+
<add enabled="true" mimeType="message/*"/>
16+
<add enabled="true" mimeType="application/javascript"/>
17+
<add enabled="true" mimeType="application/json"/>
18+
<add enabled="false" mimeType="*/*"/>
19+
</staticTypes>
20+
</httpCompression>
21+
<rewrite>
22+
<rules>
23+
<rule name="Angular Routes" stopProcessing="true">
24+
<match url=".*" />
25+
<conditions logicalGrouping="MatchAll">
26+
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
27+
<add input="{REQUEST_FILENAME}" matchType="IsDirectory" negate="true" />
28+
</conditions>
29+
<action type="Rewrite" url="/angular-demos/" />
30+
</rule>
31+
</rules>
32+
</rewrite>
33+
<staticContent>
34+
<clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="365.00:00:00" />
35+
<remove fileExtension=".json" />
36+
<remove fileExtension=".csv" />
37+
<remove fileExtension=".shp" />
38+
<remove fileExtension=".dbf" />
39+
<remove fileExtension=".itf" />
40+
<remove fileExtension=".svg" />
41+
42+
<mimeMap fileExtension=".json" mimeType="application/json;charset=UTF-8;" />
43+
<mimeMap fileExtension=".csv" mimeType="application/csv;charset=UTF-8;" />
44+
<mimeMap fileExtension=".shp" mimeType="application/octet-stream" />
45+
<mimeMap fileExtension=".dbf" mimeType="application/octet-stream" />
46+
<mimeMap fileExtension=".itf" mimeType="application/octet-stream" />
47+
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
48+
</staticContent>
49+
<httpProtocol>
50+
<customHeaders>
51+
<add name="X-XSS-Protection" value="0" />
52+
</customHeaders>
53+
</httpProtocol>
54+
</system.webServer>
55+
</configuration>

0 commit comments

Comments
 (0)