diff --git a/README.md b/README.md index fab6b7a459..af51772423 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

- Iris is a powerful, easy to use, and community-driven Python library for + Iris is a powerful, format-agnostic, and community-driven Python library for analysing and visualising Earth science data

diff --git a/docs/iris/src/_static/favicon-16x16.png b/docs/iris/src/_static/favicon-16x16.png new file mode 100644 index 0000000000..54a743670f Binary files /dev/null and b/docs/iris/src/_static/favicon-16x16.png differ diff --git a/docs/iris/src/_static/favicon-32x32.png b/docs/iris/src/_static/favicon-32x32.png new file mode 100644 index 0000000000..e3fadd6c65 Binary files /dev/null and b/docs/iris/src/_static/favicon-32x32.png differ diff --git a/docs/iris/src/_static/style.css b/docs/iris/src/_static/style.css index 08e6f8fa17..69fa84394e 100644 --- a/docs/iris/src/_static/style.css +++ b/docs/iris/src/_static/style.css @@ -1,3 +1,7 @@ +body { + font-family: 'Noto Sans', sans-serif; +} + .sidebar { z-index: 10; } .highlight { background: none; } @@ -29,4 +33,67 @@ p.hr_p:after { left: 0.5em; margin-right: -50%; } - + +.header-content { + background-color: white; + text-align: left; + padding: 0px; + height: 149px; +} + +.header-content img { + height: 100px; + vertical-align: middle; + float: left; + margin: 20px 2em 0.8em 4%; + padding: 0px; +} + +.header-content .strapline { + display: inline-block; + width: calc(100% - 110px - 2em - 4%); +} + +.strapline p { + font-size: medium; + font-family: 'Alike', serif; + font-weight: bold; + color: #444444; + max-width: 52ch; + margin-top: 0.25em; +} + +.header-content h1 { + font-size: 3.5rem; + font-family: 'Alike', serif; + margin-top: 40px; + padding: 0px; + color: #323232; + padding-bottom: 0.2em; +} + +.header-content h1 span.version { + font-size: 1.5rem; +} + +.github-forkme { + position: absolute; + top: 0; + right: 80px; + border: 0; +} + +/* Take into account the resizing effect of the page (which has a minimum */ +/* width of 740px + 80px margins). */ +@media screen and (max-width: calc(740px + 80px + 80px)) { + .github-forkme { + right: calc(100% - 740px - 80px); + } +} + +@media screen and (max-width: calc(740px + 80px)) { + .github-forkme { + left: calc(740px + 80px - 149px); + right: 0px; + } +} diff --git a/docs/iris/src/_templates/index.html b/docs/iris/src/_templates/index.html index 2a9dc7913f..f9e5da5f47 100644 --- a/docs/iris/src/_templates/index.html +++ b/docs/iris/src/_templates/index.html @@ -4,7 +4,7 @@ {{ super() }} - + - - + + + + {% endblock %} @@ -23,49 +25,24 @@ {% block relbar1 %} - - - - - - Fork me on GitHub + + Fork Iris on GitHub -
+
- Logo + Iris logo -
-

- Iris v2.1 +
+

+ Iris v2.1

-

- a powerful, easy to use, community-driven Python library for analysing and - visualising Earth science data -

+

+ A powerful, format-agnostic, and community-driven Python library for analysing and + visualising Earth science data. +

@@ -90,5 +67,5 @@

- + {% endblock %} diff --git a/docs/iris/src/conf.py b/docs/iris/src/conf.py index 506e6d006c..937a4e6a83 100644 --- a/docs/iris/src/conf.py +++ b/docs/iris/src/conf.py @@ -56,12 +56,13 @@ # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = ['sphinx.ext.autodoc', - 'sphinx.ext.coverage', - 'sphinx.ext.imgmath', 'sphinx.ext.autosummary', + 'sphinx.ext.coverage', + 'sphinx.ext.doctest', + 'sphinx.ext.extlinks', 'sphinx.ext.graphviz', + 'sphinx.ext.imgmath', 'sphinx.ext.intersphinx', - 'sphinx.ext.doctest', 'matplotlib.sphinxext.mathmpl', 'matplotlib.sphinxext.only_directives', 'matplotlib.sphinxext.plot_directive', @@ -163,6 +164,12 @@ 'scipy': ('http://docs.scipy.org/doc/scipy/reference/', None), } +# -- Extlinks extension ------------------------------------------------------- + +extlinks = {'issue': ('https://github.com/SciTools/iris/issues/%s', + 'Issue #'), + 'pull': ('https://github.com/SciTools/iris/pull/%s', 'PR #'), + } # -- Doctest ------------------------------------------------------------------ diff --git a/docs/iris/src/whatsnew/2.1.rst b/docs/iris/src/whatsnew/2.1.rst index e8c91aba29..ea02c2b888 100644 --- a/docs/iris/src/whatsnew/2.1.rst +++ b/docs/iris/src/whatsnew/2.1.rst @@ -52,24 +52,25 @@ Iris 2.1 Features if the originals were. * Added :meth:`iris.analysis.trajectory.interpolate` that allows you to interpolate to find values along a trajectory. -* It is now possible to add an attribute of ``missing_value`` to a cube. - https://github.com/SciTools/iris/issues/1588 +* It is now possible to add an attribute of ``missing_value`` to a cube + (:issue:`1588`). * Iris can now represent data on the Albers Equal Area Projection, - and the NetCDF loader and saver were updated to handle this. - https://github.com/SciTools/iris/issues/2943 + and the NetCDF loader and saver were updated to handle this. (:issue:`2943`) * The :class:`~iris.coord_systems.Mercator` projection has been updated to accept - the ``standard_parallel`` keyword argument. + the ``standard_parallel`` keyword argument (:pull:`3041`). Bugs Fixed ========== * All var names being written to NetCDF are now CF compliant. Non alpha-numeric characters are replaced with '_', and var names now always - have a leading letter. https://github.com/SciTools/iris/pull/2930 + have a leading letter (:pull:`2930`). * A cube resulting from a regrid operation using the `iris.analysis.AreaWeighted` regridding scheme will now have the smallest floating point data type to which the source cube's data type can be safely converted using NumPy's type promotion rules. +* :mod:`iris.quickplot` labels now honour the axes being drawn to when using the + ``axes`` keyword (:pull:`3010`). Incompatible Changes ==================== diff --git a/setup.py b/setup.py index 470a7cfbad..f156b707f6 100644 --- a/setup.py +++ b/setup.py @@ -239,7 +239,7 @@ def extract_version(): url='http://scitools.org.uk/iris/', author='UK Met Office', author_email='scitools-iris-dev@googlegroups.com', - description="A powerful, easy to use, and community-driven Python " + description="A powerful, format-agnostic, and community-driven Python " "library for analysing and visualising Earth science data", long_description=description, long_description_content_type='text/markdown',