Skip to content

Commit

Permalink
Upgrade Bootstrap and Bootswatch to v3.4.1, jQuery to v1.12.4 (#198)
Browse files Browse the repository at this point in the history
* Upgrade Bootstrap and Bootswatch to v3.4.1 (#190)

Solar theme is unfortunately removed as it was never officially released with
v3.4.1 and instead came out only with Bootswatch v3.3.7 and v4.x.

* Upgrade jQuery to v1.12.4
  • Loading branch information
vedranmiletic authored and ryan-roemer committed Sep 25, 2019
1 parent d8af0b0 commit 15ed025
Show file tree
Hide file tree
Showing 65 changed files with 1,142 additions and 865 deletions.
8 changes: 8 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
History
=========

==========
UNRELEASED
==========
* Upgrade Bootstrap and Bootswatch to v3.4.1. (`@vedranmiletic`_)
`#190 <https://github.com/ryan-roemer/sphinx-bootstrap-theme/issues/190>`_.
* Upgrade jQuery to v1.12.4. (`@vedranmiletic`_)

======
v0.7.1
======
Expand Down Expand Up @@ -364,5 +371,6 @@ v0.0.1
.. _@tristanlins: https://github.com/tristanlins
.. _@troeger: https://github.com/troeger
.. _@vkoby: https://github.com/vkoby
.. _@vedranmiletic: https://github.com/vedranmiletic
.. _@zyga: https://github.com/zyga

4 changes: 2 additions & 2 deletions sphinx_bootstrap_theme/bootstrap/layout.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "basic/layout.html" %}

{% if theme_bootstrap_version == "3" %}
{% set bootstrap_version, navbar_version = "3.3.7", "" %}
{% set bootstrap_version, navbar_version = "3.4.1", "" %}
{% set bs_span_prefix = "col-md-" %}
{% else %}
{% set bootstrap_version, navbar_version = "2.3.2", "-2" %}
Expand Down Expand Up @@ -52,7 +52,7 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="{{ pathto('_static/js/jquery-1.11.0.min.js', 1) }} "></script>
<script type="text/javascript" src="{{ pathto('_static/js/jquery-1.12.4.min.js', 1) }} "></script>
<script type="text/javascript" src="{{ pathto('_static/js/jquery-fix.js', 1) }} "></script>
<script type="text/javascript" src="{{ pathto('_static', 1) + '/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js' }} "></script>
<script type="text/javascript" src="{{ pathto('_static/bootstrap-sphinx.js', 1) }} "></script>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit 15ed025

Please sign in to comment.