Skip to content
Permalink
Browse files

Merge branch 'master' into Blendify/fix-787

  • Loading branch information
agjohnson committed Nov 1, 2019
2 parents 80ad848 + 2a1b2e1 commit d040bbace69fe84139a39b5a35d313719998f4aa
Showing with 12 additions and 19 deletions.
  1. +1 −1 README.rst
  2. +2 −4 docs/configuring.rst
  3. +8 −8 docs/contributing.rst
  4. +1 −1 docs/installing.rst
  5. +0 −5 src/sass/_theme_layout.sass
@@ -31,7 +31,7 @@ This theme is distributed on PyPI_ and can be installed with ``pip``:

.. code:: console

pip install sphinx-rtd-theme
$ pip install sphinx-rtd-theme

To use the theme in your Sphinx project, you will need to add the following to
your ``conf.py`` file:
@@ -98,10 +98,8 @@ Miscellaneous options

:type: string

Change the Google Analytics ID that is included on pages.

.. warning::
This configuration option is not yet used.
If specified, Google Analytics' javascript is included in your pages.
Set the value to the ID provided to you by google (like ``UA-XXXXXXX``).

.. confval:: canonical_url

@@ -24,13 +24,13 @@ Set up your environment

.. code:: console

pip install -e '.[dev]'
$ pip install -e '.[dev]'

#. Install Webpack_, node-sass_, and theme dependencies locally.

.. code:: console

npm install
$ npm install

Making changes
--------------
@@ -39,7 +39,7 @@ Changes to the theme can be compiled and tested with Webpack_:

.. code:: console

npm run dev
$ npm run dev

This script will do the following:

@@ -54,7 +54,7 @@ can be used to test built assets:

.. code:: console

npm run build
$ npm run build

.. _Webpack: https://webpack.js.org/
.. _node-sass: https://github.com/sass/node-sass
@@ -76,7 +76,7 @@ the following:

.. code:: console

python setup.py update_translations
$ python setup.py update_translations

This will extract new messages, upload the messages to Transifex, and will
update our local translation files. Changes can be checked in to a branch and
@@ -105,8 +105,8 @@ To release a new version of the theme, core team will take the following steps:

.. code:: console

rm -rf dist/
python setup.py sdist bdist_wheel
twine upload --sign --identity security@readthedocs.org dist/*
$ rm -rf dist/
$ python setup.py sdist bdist_wheel
$ twine upload --sign --identity security@readthedocs.org dist/*

.. _PEP440: https://www.python.org/dev/peps/pep-0440/
@@ -6,7 +6,7 @@ Install the package (or add it to your ``requirements.txt`` file):

.. code:: console

pip install sphinx_rtd_theme
$ pip install sphinx_rtd_theme

In your ``conf.py`` file:

@@ -33,7 +33,6 @@ html
header, p.caption
color: $nav-caption
height: $base-font-size * 2
display: inline-block
line-height: $base-font-size * 2
padding: 0 $gutter
margin: $base-line-height / 2 0 0 0
@@ -149,7 +148,6 @@ html
color: $menu-link-light
font-weight: normal
a
display: inline-block
line-height: 18px
padding: $gutter / 4 $gutter
display: block
@@ -176,10 +174,7 @@ html
z-index: $z-index-popover
background-color: $nav-search-background-color
text-align: center
padding: $gutter / 2
display: block
color: $nav-search-color
margin-bottom: $gutter / 2
input[type=text]
width: 100%
border-radius: 50px

0 comments on commit d040bba

Please sign in to comment.
You can’t perform that action at this time.