Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

refactor: styles refactoring. disable commonChunk #653

Merged
merged 1 commit into from
Oct 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
],
"styles": [
{
"input": "src/main.scss"
"input": "src/styles.scss"
},
{
"input": "src/highlightjs/material-light.scss"
Expand Down Expand Up @@ -76,6 +76,7 @@
"maximumWarning": "6kb"
}
],
"commonChunk": false,
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand Down Expand Up @@ -121,7 +122,7 @@
"scripts": [],
"styles": [
{
"input": "src/main.scss"
"input": "src/styles.scss"
},
{
"input": "src/highlightjs/material-light.scss"
Expand Down Expand Up @@ -192,4 +193,4 @@
"cli": {
"analytics": "cf155f04-1636-4df9-9ce2-870ba25ad38d"
}
}
}
7 changes: 6 additions & 1 deletion src/_app-theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
@import './styles/svg-theme';
@import './styles/tables-theme';


// Styles for the docs app that are based on the current theme.
@mixin material-docs-app-theme($theme) {
$primary: map-get($theme, primary);
Expand Down Expand Up @@ -61,3 +60,9 @@
@include nav-bar-theme($theme);
@include table-of-contents-theme($theme);
}

// Define the light theme.
$primary: mat-palette($mat-indigo);
$accent: mat-palette($mat-pink, A200, A100, A400);

$theme: mat-light-theme($primary, $accent);
8 changes: 0 additions & 8 deletions src/main.scss → src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
@import '~@angular/material/theming';
@import './app-theme';
@import './styles/api';
@import './styles/markdown';
@import './styles/tables';
@import './styles/general';


// Include material core styles.
@include mat-core();


// Define the light theme.
$primary: mat-palette($mat-indigo);
$accent: mat-palette($mat-pink, A200, A100, A400);

$theme: mat-light-theme($primary, $accent);
@include angular-material-theme($theme);
@include material-docs-app-theme($theme);