kallithea Changeset - a9cbc30e19fa

Changeset - a9cbc30e19fa

Parent rev.

Child rev.

[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:

kallithea/public/less/main.less

kallithea/public/less/package.json

kallithea/templates/base/root.html

0 comments (0 inline, 0 general)

kallithea/public/less/main.less

➞

Show inline comments

 /*!
  * Don't edit the css file directly.
+ *
  * Instead, edit the less file(s) and regenerate the css:
+ *
  * npm --prefix kallithea/public/less install
  * npm --prefix kallithea/public/less run less
+ *
  */
 /* 3rd party styles */
 @import "node_modules/bootstrap/less/bootstrap.less";
 /* kallithea styles */
 @import "kallithea-variables.less";
 @import "kallithea-tags.less";
 @import "yui-ac.less";
 @import "kallithea-select2.less";
 @import "kallithea-diff.less";
 @import "style.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"
   },
   "scripts": {
     "less": "lessc main.less ../css/style.css"
+  }
+}

kallithea/templates/base/root.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title><%block name="title"/><%block name="branding_title"/></title>
         <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
         <meta name="robots" content="index, nofollow"/>
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <link rel="icon" href="${h.url('/images/favicon.ico')}" type="image/x-icon" />
         ## 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"/>
         <link rel="stylesheet" type="text/css" href="${h.url('/css/contextbar.css', ver=c.kallithea_version)}" media="screen"/>
         <link rel="stylesheet" type="text/css" href="${h.url('/fontello/css/kallithea.css', ver=c.kallithea_version)}">
         <%block name="css_extra"/>
         ## JAVASCRIPT ##
         <script type="text/javascript">
             ## JS translations map
             var TRANSLATION_MAP = {
                 'Cancel': ${h.jshtml(_("Cancel"))},
                 'Retry': ${h.jshtml(_("Retry"))},
                 'Submitting ...': ${h.jshtml(_("Submitting ..."))},
                 'Unable to post': ${h.jshtml(_("Unable to post"))},
                 'Add Another Comment': ${h.jshtml(_("Add Another Comment"))},
                 'Stop following this repository': ${h.jshtml(_('Stop following this repository'))},
                 'Start following this repository': ${h.jshtml(_('Start following this repository'))},
                 'Group': ${h.jshtml(_('Group'))},
                 'Loading ...': ${h.jshtml(_('Loading ...'))},
                 'loading ...': ${h.jshtml(_('loading ...'))},
                 'Search truncated': ${h.jshtml(_('Search truncated'))},
                 'No matching files': ${h.jshtml(_('No matching files'))},
                 'Open New Pull Request from {0}': ${h.jshtml(_('Open New Pull Request from {0}'))},

0 comments (0 inline, 0 general)