inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicate style file

Browse Source
This commit is contained in:
Eugenio Romano 2017-10-30 11:18:11 +00:00
parent 42aa4c04ce
commit 8ad9017c1a
3 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demo-shell-ng2/.angular-cli.json
View File

@ -113,7 +113,7 @@
"testTsconfig": "tsconfig.spec.json", "testTsconfig": "tsconfig.spec.json",
"prefix": "app", "prefix": "app",
"styles": [ "styles": [
"styles.css", "styles.scss",
"custom-style.scss" "custom-style.scss"
], ],
"stylePreprocessorOptions": { "stylePreprocessorOptions": {
@ -324,7 +324,7 @@
"testTsconfig": "tsconfig.spec.json", "testTsconfig": "tsconfig.spec.json",
"prefix": "app-dev", "prefix": "app-dev",
"styles": [ "styles": [
"styles.css", "styles.scss",
"custom-style.scss" "custom-style.scss"
], ],
"stylePreprocessorOptions": { "stylePreprocessorOptions": {

15
demo-shell-ng2/src/styles.css
View File

@ -1,15 +0,0 @@
/* You can add global styles to this file, and also import other style files */
/*@import "~@angular/material/prebuilt-themes/indigo-pink.css";*/
.mat-form-field input.mat-input-element {
line-height: normal;
}
body, html {
height: 100%;
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
body {
margin: 0;
}

26
demo-shell-ng2/src/styles.scss
View File

@ -1,22 +1,12 @@
@import '~@angular/material/prebuilt-themes/deeppurple-amber.css'; .mat-form-field input.mat-input-element {
line-height: normal;
}
body, html {
height: 100%;
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
body { body {
font-family: Roboto, Arial, sans-serif;
margin: 0; margin: 0;
} }
.basic-container {
padding: 5px;
}
.version-info {
font-size: 8pt;
float: right;
}
/**
* Copyright Google LLC All Rights Reserved.
*
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/