8000 Merge remote-tracking branch 'origin/v3.1.1-doc' into v3.1.x · matplotlib/matplotlib@b126d3b · GitHub
[go: up one dir, main page]
Skip to content

Commit b126d3b

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'origin/v3.1.1-doc' into v3.1.x
Conflicts: doc/_static/mpl.css - trailing whitespace issues. Kept versions from 3.1.x (new search bar) doc/_templates/layout.html - issues with where nav-bar is in layout when backported to v3.1.1-doc. It went to the wrong place in the backport, this was fixed on v3.1.1-doc. Moving the search bar is on v3.1.x, but was still in the wrong place. Kept html from v3.1.x branch, but moved to correct location. doc/sphinxext/custom_roles.py - bug fix was on v3.1.x but not backported to 3.1.1-doc, kept v3.1.x version
2 parents 7537a79 + 2e48cf3 commit b126d3b

File tree

4 files changed

+33
-32
lines changed

4 files changed

+33
-32
lines changed

‎doc/_static/logo2_compressed.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/mpl.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
font-family: 'CarlogoRegular';
99
font-style: normal;
1010
src: local('Carlito'),
11-
url('fonts/carlogo-regular.woff2') format('woff2'),
11+
url('fonts/carlogo-regular.woff2') format('woff2'),
1212
url('fonts/carlogo-regular.woff') format('woff'),
1313
url('fonts/carlogo-regular.ttf') format('truetype')
1414
}
@@ -17,7 +17,7 @@
1717
font-family: 'CarlogoBold';
1818
font-style: bold;
1919
src: local('Carlito Bold'),
20-
url('fonts/carlogo-bold.woff2') format('woff2'),
20+
url('fonts/carlogo-bold.woff2') format('woff2'),
2121
url('fonts/carlogo-bold.woff') format('woff'),
2222
url('fonts/carlogo-bold.ttf') format('truetype')
2323
}
@@ -1150,14 +1150,14 @@ nav.main-nav{
11501150
font-family: 'CarlogoRegular', 'Carlito', sans-serif;
11511151
font-size: 16px;
11521152
}
1153-
1153+
11541154
nav.main-nav ul{
11551155
margin: 0;
11561156
padding: 0;
11571157
display: flex;
11581158
flex-direction: row;
11591159
}
1160-
1160+
11611161
nav.main-nav li{
11621162
margin: 8px 15px;
11631163
list-style-type: none;
@@ -1166,7 +1166,7 @@ nav.main-nav{
11661166
nav.main-nav a{
11671167
color: white;
11681168
}
1169-
1169+
11701170
nav.main-nav a:hover{
11711171
text-decoration: underline;
11721172
}

‎doc/_templates/layout.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,26 @@ <h3>{{ _('Navigation') }}</h3>
190190
{%- else %}
191191
<a href="{{ pathto('index') }}">
192192
<div style="float: left; position: absolute; width: 496px; bottom: 0; padding-bottom: 24px"><span style="float: right; color: #789; background: white">Version {{ version|e }}</span></div>
193-
<img src="{{pathto("_static/logo2.png", 1) }}" height="125px" border="0" alt="matplotlib"/></a>
193+
<img src="{{pathto("_static/logo2_compressed.svg", 1) }}" height="125px" border="0" alt="matplotlib"/></a>
194194
{%- endif %}
195195

196196
<!-- The "Fork me on github" ribbon -->
197197
<div id="forkongithub"><a href="https://github.com/matplotlib/matplotlib">Fork me on GitHub</a></div>
198198
</div>
199-
199+
<nav class="main-nav">
200+
<ul>
201+
<li><a href="{{ pathto('users/installing') }}">Installation</a></li>
202+
<li><a href="{{ pathto('contents') }}">Documentation</a></li>
203+
<li><a href="{{ pathto('gallery/index') }}">Examples</a></li>
204+
<li><a href="{{ pathto('tutorials/index') }}">Tutorials</a></li>
205+
<li><a href="{{ pathto('devel/index') }}">Contributing</a></li>
206+
<li class="nav-right">
207+
<form class="search" action="{{ pathto('search') }}" method="get">
208+
<input type="text" name="q" aria-labelledby="searchlabel" placeholder="Search"/>
209+
</form>
210+
</li>
211+
</ul>
212+
</nav>
200213
{% endblock %}
201214

202215
{%- block relbar2 %}
@@ -229,20 +242,7 @@ <h3>{{ _('Navigation') }}</h3>
229242
<div class="clearer"></div>
230243
</div>
231244

232-
<nav class="main-nav">
233-
<ul>
234-
<li><a href="{{ pathto('users/installing') }}">Installation</a></li>
235-
<li><a href="{{ pathto('contents') }}">Documentation</a></li>
236-
<li><a href="{{ pathto('gallery/index') }}">Examples</a></li>
237-
<li><a href="{{ pathto('tutorials/index') }}">Tutorials</a></li>
238-
<li><a href="{{ pathto('devel/index') }}">Contributing</a></li>
239-
<li class="nav-right">
240-
<form class="search" action="{{ pathto('search') }}" method="get">
241-
<input type="text" name="q" aria-labelledby="searchlabel" placeholder="Search"/>
242-
</form>
243-
</li>
244-
</ul>
245-
</nav>
245+
246246
{%- endblock %}
247247

248248
{%- block footer %}

‎tutorials/colors/colormapnorms.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
case).
1313
1414
Matplotlib does this mapping in two steps, with a normalization from
15-
[0,1] occurring first, and then mapping onto the indices in the
16-
colormap. Normalizations are classes defined in the
17-
:func:`matplotlib.colors` module. The default, linear normalization is
18-
:func:`matplotlib.colors.Normalize`.
15+
the input data to [0, 1] occurring first, and then mapping onto the
16+
indices in the colormap. Normalizations are classes defined in the
17+
:func:`matplotlib.colors` module. The default, linear normalization
18+
is :func:`matplotlib.colors.Normalize`.
1919
2020
Artists that map data to color pass the arguments *vmin* and *vmax* to
2121
construct a :func:`matplotlib.colors.Normalize` instance, then call it:
@@ -35,13 +35,13 @@
3535
Logarithmic
3636
-----------
3737
38-
One of the most common transformations is to plot data by taking
39-
its logarithm (to the base-10). This transformation is useful to
40-
display changes across disparate scales. Using :func:`colors.LogNorm`
41-
normalizes the data via :math:`log_{10}`. In the example below,
42< 80E3 /td>-
there are two bumps, one much smaller than the other. Using
43-
:func:`colors.LogNorm`, the shape and location of each bump can clearly
44-
be seen:
38+
One of the most common transformations is to plot data by taking its logarithm
39+
(to the base-10). This transformation is useful to display changes across
40+
disparate scales. Using `.colors.LogNorm` normalizes the data via
41+
:math:`log_{10}`. In the example below, there are two bumps, one much smaller
42+
than the other. Using `.colors.LogNorm`, the shape and location of each bump
43+
can clearly be seen:
44+
4545
"""
4646
import numpy as np
4747
import matplotlib.pyplot as plt

0 commit comments

Comments
 (0)
0