Mercurial > kallithea
changeset 7057:a9cbc30e19fa
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.
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Tue, 24 Oct 2017 21:47:09 +0200 |
| parents | 6085ccdf56a8 |
| children | d5735ad95dc8 |
| files | kallithea/public/less/main.less kallithea/public/less/package.json kallithea/templates/base/root.html |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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";
--- 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"
--- 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"/>