Merge pull request seiyria#788 from patchman-sebastiaan/master

Remove bootstrap from dependencies and make use of node_modules bootstrap
AiratNig · Nov 9, 2017 · 458d7ab · 458d7ab
2 parents efad43f + 2f402f6
commit 458d7ab
Show file tree

Hide file tree

Showing 5 changed files with 3,850 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -159,7 +159,7 @@ module.exports = function(grunt) {
             },
             css : {
               highlightjs: '<%= pkg.gruntConfig.css.highlightjs %>',
-              bootstrap : '<%= pkg.gruntConfig.css.bootstrap %>',
+              bootstrap : 'css/bootstrap.min.css',
               slider : 'css/bootstrap-slider.css'
             }
           }

diff --git a/dependencies/css/bootstrap.min.css b/dependencies/css/bootstrap.min.css