Skip to content

Commit 68aed97

Browse files
committed
Merge branch 'master' of github.com:readthedocs/sphinx_rtd_theme into HEAD
2 parents 1421fb5 + 17d51de commit 68aed97

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2173
-610
lines changed

.circleci/config.yml

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
version: 2.1
22

3+
orbs:
4+
node: circleci/[email protected]
5+
36
commands:
47
run-tox:
58
description: "Run tox"
@@ -8,13 +11,35 @@ commands:
811
type: string
912
sphinx-version:
1013
type: string
11-
default: "16,17,18,20,21,22,23,24,30,31,32,33,34,latest"
14+
default: "16,17,18,20,21,22,23,24,30,31,32,33,34,35,40,41,latest"
1215
steps:
1316
- checkout
1417
- run: pip install --user tox
1518
- run: tox -e "<<parameters.version>>-sphinx{<<parameters.sphinx-version>>}"
19+
run-build:
20+
description: "Ensure built assets are up to date"
21+
steps:
22+
- checkout
23+
- node/install:
24+
node-version: '14.20'
25+
- run: npm ci
26+
- run: npm run build
27+
- run:
28+
name: Ensure built assets are up to date
29+
command: |
30+
if [[ `git status sphinx_rtd_theme/ --porcelain` ]]
31+
then
32+
echo "ERROR: assets are out of date. Make sure to run 'npm run build' on your branch."
33+
git status sphinx_rtd_theme/ --porcelain
34+
exit 1
35+
fi
1636
1737
jobs:
38+
build:
39+
docker:
40+
- image: 'cimg/python:3.9-node'
41+
steps:
42+
- run-build: {}
1843
py27:
1944
docker:
2045
- image: 'cimg/python:2.7'
@@ -50,8 +75,19 @@ workflows:
5075
version: 2
5176
tests:
5277
jobs:
53-
- py39
54-
- py38
55-
- py37
56-
- py36
57-
- py27
78+
- build
79+
- py39:
80+
requires:
81+
- build
82+
- py38:
83+
requires:
84+
- build
85+
- py37:
86+
requires:
87+
- build
88+
- py36:
89+
requires:
90+
- build
91+
- py27:
92+
requires:
93+
- build

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @readthedocs/theme

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,9 @@ sphinx_rtd_theme/static/fonts/Lato/
2121
sphinx_rtd_theme/static/fonts/RobotoSlab/
2222
.python-version
2323
.node-version
24+
.tool-versions
25+
.nvmrc
2426
sphinx_rtd_theme/static/js/html5shiv.min.js
2527
sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js
28+
.direnv/
29+
.envrc

.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
file_filter = sphinx_rtd_theme/locale/<lang>/LC_MESSAGES/sphinx.po
33
source_file = sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
44
source_lang = en
5-
minimum_perc = 90
5+
minimum_perc = 60
66

77
[main]
88
host = https://www.transifex.com

README.rst

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ a working demo of the theme in the `theme documentation`_
2222

2323
.. _Sphinx: http://www.sphinx-doc.org
2424
.. _Read the Docs: http://www.readthedocs.org
25-
.. _theme documentation: https://sphinx-rtd-theme.readthedocs.io/en/latest/
25+
.. _theme documentation: https://sphinx-rtd-theme.readthedocs.io/en/stable/
2626

2727
Installation
2828
============
@@ -33,24 +33,28 @@ This theme is distributed on PyPI_ and can be installed with ``pip``:
3333
3434
$ pip install sphinx-rtd-theme
3535
36-
To use the theme in your Sphinx project, you will need to add the following to
37-
your ``conf.py`` file:
36+
To use the theme in your Sphinx project, you will need to edit
37+
your ``conf.py`` file's ``html_theme`` setting:
3838

3939
.. code:: python
4040
41-
import sphinx_rtd_theme
41+
html_theme = "sphinx_rtd_theme"
4242
43-
extensions = [
44-
...
45-
"sphinx_rtd_theme",
46-
]
43+
.. admonition:: See also:
4744

48-
html_theme = "sphinx_rtd_theme"
45+
`Supported browsers`_
46+
Officially supported and tested browser/operating system combinations
47+
48+
`Supported dependencies`_
49+
Supported versions of Python, Sphinx, and other dependencies.
4950

50-
For more information read the full documentation on `installing the theme`_
51+
`Example documentation`_
52+
A full example of this theme output, with localized strings enabled.
5153

5254
.. _PyPI: https://pypi.python.org/pypi/sphinx_rtd_theme
53-
.. _installing the theme: https://sphinx-rtd-theme.readthedocs.io/en/latest/installing.html
55+
.. _Supported browsers: https://sphinx-rtd-theme.readthedocs.io/en/stable/development.html#supported-browsers
56+
.. _Supported dependencies: https://sphinx-rtd-theme.readthedocs.io/en/stable/development.html#supported-dependencies
57+
.. _Example documentation: https://sphinx-rtd-theme.readthedocs.io/en/stable/
5458

5559
Configuration
5660
=============
@@ -59,12 +63,12 @@ This theme is highly customizable on both the page level and on a global level.
5963
To see all the possible configuration options, read the documentation on
6064
`configuring the theme`_.
6165

62-
.. _configuring the theme: https://sphinx-rtd-theme.readthedocs.io/en/latest/configuring.html
66+
.. _configuring the theme: https://sphinx-rtd-theme.readthedocs.io/en/stable/configuring.html
6367

6468
Contributing
6569
============
6670

6771
If you would like to help modify or translate the theme, you'll find more
6872
information on contributing in our `contributing guide`_.
6973

70-
.. _contributing guide: https://sphinx-rtd-theme.readthedocs.io/en/latest/contributing.html
74+
.. _contributing guide: https://sphinx-rtd-theme.readthedocs.io/en/stable/contributing.html

0 commit comments

Comments
 (0)