##// END OF EJS Templates
front-end: Use the existing bootstrap.js from node_modules and stop bundling Bootstrap
Mads Kiilerich -
r7382:585dee5e default
parent child Browse files
Show More
@@ -25,6 +25,7 b' syntax: regexp'
25 ^kallithea/front-end/package-lock\.json$
25 ^kallithea/front-end/package-lock\.json$
26 ^kallithea/front-end/tmp$
26 ^kallithea/front-end/tmp$
27 ^kallithea/public/css/style\.css(\.map)?$
27 ^kallithea/public/css/style\.css(\.map)?$
28 ^kallithea/public/js/bootstrap\.js$
28 ^theme\.less$
29 ^theme\.less$
29 ^kallithea\.db$
30 ^kallithea\.db$
30 ^test\.db$
31 ^test\.db$
@@ -38,16 +38,16 b' and licensed under the MIT-permissive li'
38 Bootstrap
38 Bootstrap
39 ---------
39 ---------
40
40
41 Kallithea incorporates the web framework called
41 Kallithea uses the web framework called
42 [Bootstrap](http://getbootstrap.com/), which is:
42 [Bootstrap](http://getbootstrap.com/), which is:
43
43
44 Copyright © 2011-2016 Twitter, Inc.
44 Copyright © 2011-2016 Twitter, Inc.
45
45
46 and licensed under the MIT-permissive license, which is
46 and licensed under the MIT-permissive license, which is
47 [included in this distribution](MIT-Permissive-License.txt),
47 [included in this distribution](MIT-Permissive-License.txt).
48 which can be found together with its Corresponding Source in
48
49 https://github.com/twbs/bootstrap at tag v3.3.7 (mirrored at
49 It is not distributed with Kallithea, but will be downloaded
50 https://kallithea-scm.org/repos/mirror/bootstrap/ ).
50 using the ''kallithea-cli front-end-build'' command.
51
51
52
52
53
53
@@ -16,6 +16,7 b' import click'
16 import kallithea.bin.kallithea_cli_base as cli_base
16 import kallithea.bin.kallithea_cli_base as cli_base
17
17
18 import os
18 import os
19 import shutil
19 import subprocess
20 import subprocess
20 import json
21 import json
21
22
@@ -48,7 +49,7 b' def front_end_build(install_deps, genera'
48 if not os.path.isdir(tmp_dir):
49 if not os.path.isdir(tmp_dir):
49 os.mkdir(tmp_dir)
50 os.mkdir(tmp_dir)
50
51
51 click.echo("Generating CSS")
52 click.echo("Building CSS styling based on Bootstrap")
52 with open(os.path.join(tmp_dir, 'pygments.css'), 'w') as f:
53 with open(os.path.join(tmp_dir, 'pygments.css'), 'w') as f:
53 subprocess.check_call(['pygmentize',
54 subprocess.check_call(['pygmentize',
54 '-S', 'default',
55 '-S', 'default',
@@ -62,6 +63,9 b' def front_end_build(install_deps, genera'
62 '--source-map-less-inline', lesspath, csspath],
63 '--source-map-less-inline', lesspath, csspath],
63 cwd=front_end_dir)
64 cwd=front_end_dir)
64
65
66 click.echo("Preparing Bootstrap JS")
67 shutil.copy(os.path.join(front_end_dir, 'node_modules', 'bootstrap', 'dist', 'js', 'bootstrap.js'), os.path.join(public_dir, 'js', 'bootstrap.js'))
68
65 click.echo("Generating LICENSES.txt")
69 click.echo("Generating LICENSES.txt")
66 check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json')
70 check_licensing_json_path = os.path.join(tmp_dir, 'licensing.json')
67 licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt')
71 licensing_txt_path = os.path.join(public_dir, 'LICENSES.txt')
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (6757 lines changed) Show them Hide them
1 NO CONTENT: file was removed
NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (2377 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now