move style imports back to angular json, keep only type + bootstrap css to material dashboard
This commit is contained in:
parent
6061ee1ef4
commit
efd141b7d4
|
@ -25,6 +25,8 @@
|
|||
{ "glob": "**/*", "input": "node_modules/tinymce", "output": "/tinymce/" }
|
||||
],
|
||||
"styles": [
|
||||
"node_modules/bootstrap/dist/css/bootstrap.min.css",
|
||||
"src/assets/scss/material-dashboard.scss",
|
||||
"src/styles.scss",
|
||||
"node_modules/cookieconsent/build/cookieconsent.min.css"
|
||||
],
|
||||
|
@ -111,6 +113,7 @@
|
|||
"tsConfig": "src/tsconfig.spec.json",
|
||||
"scripts": [],
|
||||
"styles": [
|
||||
"src/assets/scss/material-dashboard.scss",
|
||||
"src/styles.scss",
|
||||
"node_modules/tinymce/tinymce.min.js"
|
||||
],
|
||||
|
|
|
@ -8,35 +8,35 @@
|
|||
@import "/node_modules/bootstrap/scss/bootstrap";
|
||||
|
||||
// Core Components
|
||||
@import "core/buttons";
|
||||
@import "core/checkboxes";
|
||||
@import "core/radios";
|
||||
@import "core/forms";
|
||||
@import "core/input-group";
|
||||
@import "core/images";
|
||||
@import "core/navbar";
|
||||
@import "core/alerts";
|
||||
// @import "core/buttons";
|
||||
// @import "core/checkboxes";
|
||||
// @import "core/radios";
|
||||
// @import "core/forms";
|
||||
// @import "core/input-group";
|
||||
// @import "core/images";
|
||||
// @import "core/navbar";
|
||||
// @import "core/alerts";
|
||||
@import "core/type";
|
||||
@import "core/tabs";
|
||||
@import "core/tooltip";
|
||||
@import "core/popover";
|
||||
@import "core/dropdown";
|
||||
@import "core/togglebutton";
|
||||
@import "core/ripples";
|
||||
@import "core/footers";
|
||||
@import "core/sidebar-and-main-panel";
|
||||
@import "core/fixed-plugin";
|
||||
@import "core/tables";
|
||||
@import "core/misc";
|
||||
// @import "core/tabs";
|
||||
// @import "core/tooltip";
|
||||
// @import "core/popover";
|
||||
// @import "core/dropdown";
|
||||
// @import "core/togglebutton";
|
||||
// @import "core/ripples";
|
||||
// @import "core/footers";
|
||||
// @import "core/sidebar-and-main-panel";
|
||||
// @import "core/fixed-plugin";
|
||||
// @import "core/tables";
|
||||
// @import "core/misc";
|
||||
|
||||
@import "core/cards";
|
||||
@import "core/cards/card-stats";
|
||||
@import "core/cards/card-profile";
|
||||
@import "core/cards/card-plain";
|
||||
// @import "core/cards";
|
||||
// @import "core/cards/card-stats";
|
||||
// @import "core/cards/card-profile";
|
||||
// @import "core/cards/card-plain";
|
||||
|
||||
//plugin scss
|
||||
@import "core/plugins/animate";
|
||||
@import "core/plugins/chartist";
|
||||
@import "core/plugins/perfect-scrollbar";
|
||||
// //plugin scss
|
||||
// @import "core/plugins/animate";
|
||||
// @import "core/plugins/chartist";
|
||||
// @import "core/plugins/perfect-scrollbar";
|
||||
|
||||
@import "core/responsive";
|
||||
// @import "core/responsive";
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
|
||||
//Material-Bootstrap configuration
|
||||
@import '../node_modules/bootstrap/scss/bootstrap.scss';
|
||||
// @import '../node_modules/bootstrap/scss/bootstrap.scss';
|
||||
@import "assets/scss/bootstrap-material";
|
||||
|
||||
// @import "@covalent/core/theming/all-theme";
|
||||
|
@ -23,7 +23,7 @@
|
|||
@include mat.core();
|
||||
|
||||
// styles moved from material-dashboard.scss -> overwrite bootstrap default styles
|
||||
@import "assets/scss/core/type";
|
||||
// @import "assets/scss/core/type";
|
||||
|
||||
|
||||
:root {
|
||||
|
|
Loading…
Reference in New Issue