diff --git a/web-src/src/assets/css/index.css b/web-src/src/assets/css/index.css index fcd4aa5f..95db8950 100644 --- a/web-src/src/assets/css/index.css +++ b/web-src/src/assets/css/index.css @@ -17,10 +17,6 @@ body { font-weight: 300; } -h1, h2, h3, h4, h5, h6 { - margin: 0; -} - h1.header { font-size: 2rem; padding: 1rem; diff --git a/web-src/src/common/style_imports.js b/web-src/src/common/style_imports.js index 8c673267..2ddbd021 100644 --- a/web-src/src/common/style_imports.js +++ b/web-src/src/common/style_imports.js @@ -2,9 +2,10 @@ import 'material-design-icons/iconfont/material-icons.css'; import 'materialize-css/js/cash'; import 'materialize-css/js/global'; import 'materialize-css/js/waves' -import 'materialize-css/sass/components/_buttons.scss'; +import 'typeface-roboto'; +// DO NOT TOUCH ORDER import 'materialize-css/sass/components/_color-classes.scss'; import 'materialize-css/sass/components/_grid.scss'; -import 'materialize-css/sass/components/_waves.scss'; -import 'typeface-roboto'; \ No newline at end of file +import 'materialize-css/sass/components/_buttons.scss'; +import 'materialize-css/sass/components/_waves.scss'; \ No newline at end of file diff --git a/web-src/src/main-app/MainApp.vue b/web-src/src/main-app/MainApp.vue index 74a3ad4d..35a165e0 100644 --- a/web-src/src/main-app/MainApp.vue +++ b/web-src/src/main-app/MainApp.vue @@ -59,4 +59,7 @@ </script> <style scoped> + h1, h2, h3, h4, h5, h6 { + margin: 0; + } </style> \ No newline at end of file