Changeset - a9cbc30e19fa
[Not reviewed]
default
0 3 0
domruf - 8 years ago 2017-10-24 21:47:09
dominikruf@gmail.com
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.
3 files changed with 6 insertions and 2 deletions:
0 comments (0 inline, 0 general)
kallithea/public/less/main.less
Show inline comments
 
@@ -8,6 +8,9 @@
 
 *
 
 */
 

	
 
/* 3rd party styles */
 
@import "node_modules/bootstrap/less/bootstrap.less";
 

	
 
/* kallithea styles */
 
@import "kallithea-variables.less";
 
@import "kallithea-tags.less";
kallithea/public/less/package.json
Show inline comments
 
{
 
  "name": "kallithea",
 
  "private": true,
 
  "dependencies": {},
 
  "dependencies": {
 
    "bootstrap": "3.3.7"
 
  },
 
  "devDependencies": {
 
    "less": "~2.7",
 
    "less-plugin-clean-css": "~1.5"
kallithea/templates/base/root.html
Show inline comments
 
@@ -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"/>
0 comments (0 inline, 0 general)