{% endif %}
diff -Nru alabaster-0.7.6/alabaster/layout.html alabaster-0.7.7/alabaster/layout.html
--- alabaster-0.7.6/alabaster/layout.html 2015-06-23 05:22:37.000000000 +0000
+++ alabaster-0.7.7/alabaster/layout.html 2015-12-22 02:25:26.000000000 +0000
@@ -5,7 +5,7 @@
{% if theme_touch_icon %}
{% endif %}
-
+
{% endblock %}
{# Disable base theme's top+bottom related navs; we have our own in sidebar #}
diff -Nru alabaster-0.7.6/alabaster/static/alabaster.css_t alabaster-0.7.7/alabaster/static/alabaster.css_t
--- alabaster-0.7.6/alabaster/static/alabaster.css_t 2015-06-23 05:22:37.000000000 +0000
+++ alabaster-0.7.7/alabaster/static/alabaster.css_t 2015-12-22 02:25:26.000000000 +0000
@@ -56,6 +56,10 @@
padding: 0 30px 0 30px;
}
+div.body > .section {
+ text-align: {{ theme_body_text_align }};
+}
+
div.footer {
width: {{ theme_page_width }};
margin: 20px auto 30px auto;
@@ -168,8 +172,8 @@
div.sphinxsidebar hr {
border: none;
height: 1px;
- color: {{ theme_sidebar_link_underscore }};
- background: {{ theme_sidebar_link_underscore }};
+ color: {{ theme_sidebar_hr }};
+ background: {{ theme_sidebar_hr }};
text-align: left;
margin-left: 0;
@@ -350,6 +354,10 @@
padding: 0;
}
+table.field-list p {
+ margin-bottom: 0.8em;
+}
+
table.footnote td.label {
width: 0px;
padding: 0.3em 0 0.3em 0.5em;
diff -Nru alabaster-0.7.6/alabaster/theme.conf alabaster-0.7.7/alabaster/theme.conf
--- alabaster-0.7.6/alabaster/theme.conf 2015-06-23 05:22:37.000000000 +0000
+++ alabaster-0.7.7/alabaster/theme.conf 2015-12-22 02:25:26.000000000 +0000
@@ -16,6 +16,7 @@
github_type = watch
github_count = true
travis_button = false
+codecov_button = false
gratipay_user =
gittip_user =
analytics_id =
@@ -33,6 +34,7 @@
pink_2 = #FAA
body_text = #3E4349
+body_text_align = left
footer_text = #888
link = #004B6B
link_hover = #6D4100
diff -Nru alabaster-0.7.6/alabaster/_version.py alabaster-0.7.7/alabaster/_version.py
--- alabaster-0.7.6/alabaster/_version.py 2015-06-23 05:22:37.000000000 +0000
+++ alabaster-0.7.7/alabaster/_version.py 2015-12-22 02:25:26.000000000 +0000
@@ -1,2 +1,2 @@
-__version_info__ = (0, 7, 6)
+__version_info__ = (0, 7, 7)
__version__ = '.'.join(map(str, __version_info__))
diff -Nru alabaster-0.7.6/debian/changelog alabaster-0.7.7/debian/changelog
--- alabaster-0.7.6/debian/changelog 2016-03-03 09:10:31.000000000 +0000
+++ alabaster-0.7.7/debian/changelog 2016-03-05 12:03:50.000000000 +0000
@@ -1,8 +1,16 @@
-alabaster (0.7.6-2~cloud0) trusty-mitaka; urgency=medium
+alabaster (0.7.7-1~cloud0) trusty-mitaka; urgency=medium
- * New update for the Ubuntu Cloud Archive.
+ * New upstream release for the Ubuntu Cloud Archive.
- -- Openstack Ubuntu Testing Bot Thu, 03 Mar 2016 09:10:31 +0000
+ -- Openstack Ubuntu Testing Bot Sat, 05 Mar 2016 12:03:50 +0000
+
+alabaster (0.7.7-1) unstable; urgency=medium
+
+ * Imported Upstream version 0.7.7
+ * Update debian/copyright for setup.cfg
+ * Update debian/watch to use pypi.debian.net
+
+ -- Jeremy T. Bouse Thu, 03 Mar 2016 09:58:46 -0500
alabaster (0.7.6-2) unstable; urgency=medium
diff -Nru alabaster-0.7.6/debian/copyright alabaster-0.7.7/debian/copyright
--- alabaster-0.7.6/debian/copyright 2015-07-08 14:03:23.000000000 +0000
+++ alabaster-0.7.7/debian/copyright 2016-03-03 14:15:40.000000000 +0000
@@ -27,6 +27,7 @@
alabaster/support.py
alabaster/theme.conf
setup.py
+ setup.cfg
tasks.py
dev-requirements.txt
Copyright: 2014, Jeff Forcier
diff -Nru alabaster-0.7.6/debian/watch alabaster-0.7.7/debian/watch
--- alabaster-0.7.6/debian/watch 2015-03-13 01:23:58.000000000 +0000
+++ alabaster-0.7.7/debian/watch 2016-03-03 14:50:05.000000000 +0000
@@ -1,8 +1,3 @@
-# watch control file for uscan
-
-# See uscan(1) for how to set this file properly
-# * uupdate(1) for upgrade a source code package
-# * gbp-import-orig(1) with --uscan for upgrade GIT repo
-
version=3
-https://github.com/bitprophet/alabaster/tags .*/(\d[\d\.]*)\.(?:tar.gz|tar.bz2|tar.xz)
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+https://pypi.debian.net/alabaster/alabaster-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff -Nru alabaster-0.7.6/README.rst alabaster-0.7.7/README.rst
--- alabaster-0.7.6/README.rst 2015-06-23 05:22:37.000000000 +0000
+++ alabaster-0.7.7/README.rst 2015-12-22 02:25:26.000000000 +0000
@@ -2,10 +2,15 @@
Alabaster: a Sphinx theme
=========================
-This theme is a modified "Kr" Sphinx theme from @kennethreitz (especially as
-used in his `Requests `_ project), which was
-itself originally based on @mitsuhiko's theme used for `Flask
-`_ & related projects.
+What is Alabaster?
+==================
+
+Alabaster is a visually (c)lean, responsive, configurable theme for the `Sphinx
+`_ documentation system. It is Python 2+3 compatible.
+
+It began as a third-party theme, and is still maintained separately, but as of
+Sphinx 1.3, Alabaster is an install-time dependency of Sphinx and is selected
+as the default theme.
Live examples of this theme can be seen on `paramiko.org
`_, `fabfile.org `_ and `pyinvoke.org
@@ -13,8 +18,6 @@
A changelog_ can be found at the bottom of this page.
-Alabaster is Python 2+3 compatible.
-
Features
========
@@ -24,9 +27,9 @@
* Easy ability to install/use as a Python package (tip o' the hat to `Dave &
Eric's sphinx_rtd_theme `_ for
showing the way);
-* Style tweaks, such as better code-block alignment, Gratipay and Github button
- placement, page source link moved to footer, improved (optional)
- related-items sidebar item, etc;
+* Style tweaks, such as better code-block alignment, Github button placement,
+ page source link moved to footer, improved (optional) related-items sidebar
+ item, etc;
* Many customization hooks, including toggle of various sidebar & footer
components; header/link/etc color control; etc;
* Improved documentation for all customizations (pre-existing & new).
@@ -132,6 +135,8 @@
project name itself. Defaults to ``false``.
* ``logo_text_align``: Which CSS ``text-align`` value to use for logo text
(if there is any.)
+* ``body_text_align``: Which CSS ``text-align`` value to use for body text
+ (if there is any.)
* ``description``: Text blurb about your project, to appear under the logo.
* ``description_font_style``: Which CSS ``font-style`` to use for description
text. Defaults to ``normal``.
@@ -145,8 +150,8 @@
`Github Buttons' README
`_:
- * ``github_button_type``: Defaults to ``watch``.
- * ``github_button_count``: Defaults to ``true``.
+ * ``github_type``: Defaults to ``watch``.
+ * ``github_count``: Defaults to ``true``.
* ``github_banner``: ``true`` or ``false`` (default: ``false``) - whether to
apply a 'Fork me on Github' banner in the top right corner of the page.
@@ -156,10 +161,14 @@
``$PROJECT/_static/``) to be used as the banner image instead of the
default.
-* ``travis_button``: ``true``, ``false`` or a Github-style
- ``"account/repo"`` string - used to display a Travis-CI build status
+* ``travis_button``: ``true``, ``false`` or a Github-style ``"account/repo"``
+ string - used to display a `Travis-CI `_ build status
button in the sidebar. If ``true``, uses your ``github_(user|repo)``
settings; defaults to ``false.``
+* ``codecov_button``: ``true``, ``false`` or a Github-style
+ ``"account/repo"`` string - used to display a `Codecov`_
+ build status button in the sidebar. If ``true``, uses your
+ ``github_(user|repo)`` settings; defaults to ``false.``
* ``gratipay_user``: Set to your `Gratipay `_ username
if you want a Gratipay 'Donate' section in your sidebar.
@@ -256,8 +265,19 @@
monospace``.
-Additional info / background
-============================
+Project background
+==================
+
+Alabaster is a modified (with permission) version of `Kenneth Reitz's
+`_ "Kr" `Sphinx `_ theme (no
+official repo, but it's the one used in his `Requests
+`_ project). Kenneth's theme was itself originally
+based on Armin Ronacher's `Flask `_ theme. Many thanks
+to both for their hard work.
+
+
+Implementation notes
+====================
* `Fabric #419 `_ contains a lot of
general exposition & thoughts as I developed Alabaster, specifically with a
@@ -426,3 +446,22 @@
* Expose page & sidebar widths as theme options ``page_width`` and
``sidebar_width``. Their defaults are the same as the previously static
values.
+
+0.7.7 (2015-12-21)
+------------------
+
+* Add some ``margin-bottom`` to ``table.field-list p`` so field lists (e.g.
+ Python function parameter lists in docstrings) written as multiple
+ paragraphs, look like actual paragraphs instead of all globbing together.
+* Fix incorrect notes in README re: renamed ``github_button_*`` options - the
+ ``button_`` was dropped but docs did not reflect this. Thanks to Nik Nyby.
+* Fix ``sidebar_hr`` setting - stylesheet wasn't correctly referencing the
+ right variable name. Thanks to Jannis Leidel.
+* Allow configuring body text-align via ``body_text_align``. Credit to Marçal
+ Solà.
+* Fix a handful of mismatched/unclosed HTML tags in the templates. Thanks to
+ Marvin Pinto for catch & patch.
+* Add `Codecov`_ badge support to sidebar.
+
+
+.. _Codecov: https://codecov.io
diff -Nru alabaster-0.7.6/setup.cfg alabaster-0.7.7/setup.cfg
--- alabaster-0.7.6/setup.cfg 1970-01-01 00:00:00.000000000 +0000
+++ alabaster-0.7.7/setup.cfg 2015-12-22 02:25:26.000000000 +0000
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
+ />
+
+
+{% endif %}
+
+{% if theme_codecov_button|lower != 'false' %}
+{% if theme_codecov_button|lower == 'true' %}
+ {% set path = theme_github_user + '/' + theme_github_repo %}
+{% else %}
+ {% set path = theme_codecov_button %}
+{% endif %}
+