From 256c3f2cbbf5e285ed01ae6bee778e529197396f Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Tue, 22 Oct 2019 16:45:50 -0400 Subject: [PATCH 1/3] Fix #837 Duplicate CSS Properties --- src/sass/_theme_layout.sass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/sass/_theme_layout.sass b/src/sass/_theme_layout.sass index 17577e6..ffd9912 100644 --- a/src/sass/_theme_layout.sass +++ b/src/sass/_theme_layout.sass @@ -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 From c04c214a8591a0290f30026b89bf3215fb1061b4 Mon Sep 17 00:00:00 2001 From: Reinout van Rees Date: Wed, 23 Oct 2019 10:36:31 +0200 Subject: [PATCH 2/3] Documenting that google analytics is supported (#829) See #411, released in `0.4.3`. It is now supported, so I've changed the documentation accordingly. --- docs/configuring.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/configuring.rst b/docs/configuring.rst index 40ce51f..42b6434 100644 --- a/docs/configuring.rst +++ b/docs/configuring.rst @@ -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 From a4bacd2babf95cf5bf2413db522ed2681c93fd8b Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Wed, 23 Oct 2019 11:08:08 -0400 Subject: [PATCH 3/3] Docs: Fix use of code console --- README.rst | 2 +- docs/contributing.rst | 16 ++++++++-------- docs/installing.rst | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index 26251f8..4c7f6db 100644 --- a/README.rst +++ b/README.rst @@ -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: diff --git a/docs/contributing.rst b/docs/contributing.rst index 971e6ca..5206b62 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -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/ diff --git a/docs/installing.rst b/docs/installing.rst index cf209e9..7b78ee6 100644 --- a/docs/installing.rst +++ b/docs/installing.rst @@ -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: