#282 fixed wrong css priorities due to file order issues

bugy · Apr 4, 2020 · 5b09a45 · 5b09a45
1 parent 197f8d4
commit 5b09a45
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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';
+import 'materialize-css/sass/components/_buttons.scss';
+import 'materialize-css/sass/components/_waves.scss';
diff --git 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>