Merge pull request #1 from kununu/switch-to-node-module

[www] Update paths for npm
kununu · May 9, 2016 · def0de2 · def0de2
2 parents b0937ae + 8c8c1ec
commit def0de2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ kununu's basic styling
 All the styles are sass and need to be compiled.
 
 #Dependencies
-These styles should be used with Bootstap
+These styles should be used with Bootstap and loaded using webpack
 
 
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kununu-theme",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Base scss styles for kununu",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/scss/base/icons.scss b/scss/base/icons.scss
@@ -8,12 +8,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('~bower_components/font-awesome/fonts/fontawesome-webfont.eot');
-  src: url('~bower_components/font-awesome/fonts/fontawesome-webfont.eot') format('embedded-opentype'),
-    url('~bower_components/font-awesome/fonts/fontawesome-webfont.woff2') format('woff2'),
-    url('~bower_components/font-awesome/fonts/fontawesome-webfont.woff') format('woff'),
-    url('~bower_components/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'),
-    url('~bower_components/font-awesome/fonts/fontawesome-webfont.svg#fontawesomeregular') format('svg');
+  src: url('~font-awesome/fonts/fontawesome-webfont.eot');
+  src: url('~font-awesome/fonts/fontawesome-webfont.eot') format('embedded-opentype'),
+    url('~font-awesome/fonts/fontawesome-webfont.woff2') format('woff2'),
+    url('~font-awesome/fonts/fontawesome-webfont.woff') format('woff'),
+    url('~font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'),
+    url('~font-awesome/fonts/fontawesome-webfont.svg#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }

diff --git a/scss/base/mixins.scss b/scss/base/mixins.scss
@@ -1,4 +1,4 @@
-@import 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins';
+@import '~bootstrap-sass/assets/stylesheets/bootstrap/mixins';
 
 @mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
   border-color: $border;

diff --git a/scss/base/variables.scss b/scss/base/variables.scss
@@ -416,4 +416,4 @@ $zindex-accessibility-aid:  1060;
 // Horizontal forms & lists
 $component-offset-horizontal: 66px;
 
-@import 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/variables';
+@import '~bootstrap-sass/assets/stylesheets/bootstrap/variables';