# HG changeset patch
# User domruf <dominikruf@gmail.com>
# Date 1508874429 -7200
# 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 -r 6085ccdf56a8 -r a9cbc30e19fa kallithea/public/less/main.less
--- a/kallithea/public/less/main.less	Sat Dec 16 17:43:57 2017 +0100
+++ b/kallithea/public/less/main.less	Tue Oct 24 21:47:09 2017 +0200
@@ -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 -r 6085ccdf56a8 -r a9cbc30e19fa kallithea/public/less/package.json
--- a/kallithea/public/less/package.json	Sat Dec 16 17:43:57 2017 +0100
+++ b/kallithea/public/less/package.json	Tue Oct 24 21:47:09 2017 +0200
@@ -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 -r 6085ccdf56a8 -r a9cbc30e19fa kallithea/templates/base/root.html
--- a/kallithea/templates/base/root.html	Sat Dec 16 17:43:57 2017 +0100
+++ b/kallithea/templates/base/root.html	Tue Oct 24 21:47:09 2017 +0200
@@ -11,7 +11,6 @@
         ## CSS ###
         <link rel="stylesheet" type="text/css" href="${h.url('/css/jquery.dataTables.css', ver=c.kallithea_version)}"/>
         <link rel="stylesheet" type="text/css" href="${h.url('/js/select2/select2.css', ver=c.kallithea_version)}"/>
-        <link rel="stylesheet" type="text/css" href="${h.url('/css/bootstrap.css', ver=c.kallithea_version)}"/>
         <link rel="stylesheet" type="text/css" href="${h.url('/js/select2/select2-bootstrap.css', ver=c.kallithea_version)}"/>
         <link rel="stylesheet" type="text/css" href="${h.url('/css/pygments.css', ver=c.kallithea_version)}"/>
         <link rel="stylesheet" type="text/css" href="${h.url('/css/style.css', ver=c.kallithea_version)}" media="screen"/>