# HG changeset patch # User domruf # Date 2017-10-24 21:47:09 # Node ID a9cbc30e19fa65e2a7fee220349a97fb7480943b # Parent 6085ccdf56a814420ae615fa5ff52ce1d16e92a0 less: build custom Bootstrap from bootstrap.less instead of using plain upstream version - add current version of bootstrap to package.json dependencies - import bootstrap.less in main.less - remove bootstrap.css from root.html (the file will be removed later) bootstrap.js is still handled as before. diff --git a/kallithea/public/less/main.less b/kallithea/public/less/main.less --- a/kallithea/public/less/main.less +++ b/kallithea/public/less/main.less @@ -8,6 +8,9 @@ * */ +/* 3rd party styles */ +@import "node_modules/bootstrap/less/bootstrap.less"; + /* kallithea styles */ @import "kallithea-variables.less"; @import "kallithea-tags.less"; diff --git a/kallithea/public/less/package.json b/kallithea/public/less/package.json --- a/kallithea/public/less/package.json +++ b/kallithea/public/less/package.json @@ -1,7 +1,9 @@ { "name": "kallithea", "private": true, - "dependencies": {}, + "dependencies": { + "bootstrap": "3.3.7" + }, "devDependencies": { "less": "~2.7", "less-plugin-clean-css": "~1.5" diff --git a/kallithea/templates/base/root.html b/kallithea/templates/base/root.html --- a/kallithea/templates/base/root.html +++ b/kallithea/templates/base/root.html @@ -11,7 +11,6 @@ ## CSS ### -