[SCSS review] preparatory steps

- Merge previously scoped and global styles - Use our own normalize.css instead of Bootstrap's Prepares #111
cyChop · Jan 3, 2018 · b1fe3f9 · b1fe3f9
1 parent b2aa4d4
commit b1fe3f9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "axios": "^0.17.1",
     "bootstrap": "4.0.0-alpha.6",
     "lodash": "^4.17.4",
+    "normalize.css": "^7.0.0",
     "vue": "^2.5.13",
     "vuex": "^3.0.1"
   },

diff --git a/src/app/app-global.scss b/src/app/app-global.scss
@@ -1,12 +0,0 @@
-@import "../scss/font-variables";
-@import "../scss/variables";
-@import "../scss/bootstrap";
-
-@font-face {
-  font-family: 'BevIcons';
-  src: url('#{$icomoon-font-path}/icomoon.ttf') format('truetype'),
-  url('#{$icomoon-font-path}/icomoon.woff') format('woff'),
-  url('#{$icomoon-font-path}/icomoon.svg#icomoon') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}

diff --git a/src/app/app.scss b/src/app/app.scss
@@ -3,8 +3,20 @@
 @import "../scss/variables";
 @import "../scss/mixins";
 
+@import "node_modules/normalize.css/normalize";
+
 @import "node_modules/bootstrap/scss/custom";
 @import "node_modules/bootstrap/scss/variables";
+@import "../scss/bootstrap";
+
+@font-face {
+  font-family: 'BevIcons';
+  src: url('#{$icomoon-font-path}/icomoon.ttf') format('truetype'),
+  url('#{$icomoon-font-path}/icomoon.woff') format('woff'),
+  url('#{$icomoon-font-path}/icomoon.svg#icomoon') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
 
 .app {
 

diff --git a/src/app/app.vue b/src/app/app.vue
@@ -1,4 +1,3 @@
 <template src="./app.html"></template>
 <script src="./app"></script>
-<style src="./app-global.scss" lang="scss"></style>
 <style src="./app.scss" lang="scss"></style>
diff --git a/src/scss/_bootstrap.scss b/src/scss/_bootstrap.scss
@@ -11,7 +11,7 @@
 @import "node_modules/bootstrap/scss/mixins";
 
 // Reset and dependencies
-@import "node_modules/bootstrap/scss/normalize";
+//@import "node_modules/bootstrap/scss/normalize";
 //@import "node_modules/bootstrap/scss/print";
 
 // Core CSS

diff --git a/yarn.lock b/yarn.lock
@@ -6501,6 +6501,10 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+normalize.css@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf"
+
 now-and-later@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.0.tgz#bc61cbb456d79cb32207ce47ca05136ff2e7d6ee"