Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Political Memory
memopol
Commits
dee7cc3c
Commit
dee7cc3c
authored
Aug 11, 2016
by
Nicolas Joyard
Browse files
Use bootstrap version from mockup
parent
f38ec595
Changes
2
Hide whitespace changes
Inline
Side-by-side
bin/install_client_deps.sh
View file @
dee7cc3c
...
...
@@ -8,7 +8,7 @@
# starting with 'downloadFromGithub' at the bottom.
# The last argument is expected to be a git ref (ie
# a branch name, tag or commit-ish).
#
#
set
-e
...
...
@@ -39,6 +39,5 @@ mkdir -p ${DEST}
downloadFromGithub jquery jquery/jquery 2.1.4
downloadFromGithub fontawesome FortAwesome/Font-Awesome v4.3.0
downloadFromGithub flag-icon-css lipis/flag-icon-css 0.7.1
downloadFromGithub bootstrap twbs/bootstrap v3.3.5
echo
"* Done."
templates/base.html
View file @
dee7cc3c
...
...
@@ -14,7 +14,7 @@
{% load compress %}
{% load staticfiles %}
{% compress css %}
<link
rel=
"stylesheet"
href=
"{% static '
libs/bootstrap/dist/
css/bootstrap.min.css' %}"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"{% static 'css/bootstrap.min.css' %}"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"{% static 'libs/fontawesome/css/font-awesome.min.css' %}"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"{% static 'libs/flag-icon-css/css/flag-icon.min.css' %}"
type=
"text/css"
/>
<link
rel=
"stylesheet"
href=
"{% static 'css/custom.css' %}"
type=
"text/css"
/>
...
...
@@ -22,7 +22,7 @@
{% compress js %}
<script
type=
"text/javascript"
src=
"{% static 'libs/jquery/dist/jquery.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static '
libs/bootstrap/dist/
js/bootstrap.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'js/bootstrap.js' %}"
></script>
{% endcompress %}
{% block head %}{% endblock %}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment