aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2015-12-04 16:17:46 +0100
committerChocobozzz <florian.bigard@gmail.com>2015-12-04 16:17:46 +0100
commitc158027179248b3c8d9e08f9c748d3f1b8dff3fb (patch)
tree11a2767425dc728dade8446c8077d4dd94038fe3
parent0b69752270f1ceea06a29872b3db23660a55d6d3 (diff)
downloadPeerTube-c158027179248b3c8d9e08f9c748d3f1b8dff3fb.tar.gz
PeerTube-c158027179248b3c8d9e08f9c748d3f1b8dff3fb.tar.zst
PeerTube-c158027179248b3c8d9e08f9c748d3f1b8dff3fb.zip
Add include paths for bootstrap sass and avoid to import an entire path
in the sass file
-rw-r--r--Gruntfile.js3
-rw-r--r--public/stylesheets/index.scss2
2 files changed, 4 insertions, 1 deletions
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) {
70 } 70 }
71 }, 71 },
72 sass: { 72 sass: {
73 options: {
74 includePaths: [ 'node_modules/bootstrap-sass/assets/stylesheets/' ]
75 },
73 dev: { 76 dev: {
74 files: { 77 files: {
75 'public/stylesheets/global.css': paths.scss 78 '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 @@
1$icon-font-path: "/stylesheets/vendor/fonts/bootstrap/"; 1$icon-font-path: "/stylesheets/vendor/fonts/bootstrap/";
2 2
3@import "../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap"; 3@import "_bootstrap";
4 4
5body { 5body {
6 padding: 20px; 6 padding: 20px;