From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 4 Dec 2015 15:17:46 +0000 (+0100)
Subject: Add include paths for bootstrap sass and avoid to import an entire path
X-Git-Tag: v0.0.1-alpha~1076
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c158027179248b3c8d9e08f9c748d3f1b8dff3fb;p=oweals%2Fpeertube.git

Add include paths for bootstrap sass and avoid to import an entire path
in the sass file
---

diff --git a/Gruntfile.js b/Gruntfile.js
index 028a7773d..51ac10161 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -70,6 +70,9 @@ module.exports = function (grunt) {
       }
     },
     sass: {
+      options: {
+        includePaths: [ 'node_modules/bootstrap-sass/assets/stylesheets/' ]
+      },
       dev: {
         files: {
           'public/stylesheets/global.css': paths.scss
diff --git a/public/stylesheets/index.scss b/public/stylesheets/index.scss
index 5dbb5e85a..16f2ae88f 100644
--- a/public/stylesheets/index.scss
+++ b/public/stylesheets/index.scss
@@ -1,6 +1,6 @@
 $icon-font-path: "/stylesheets/vendor/fonts/bootstrap/";
 
-@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
+@import "_bootstrap";
 
 body {
     padding: 20px;