Skip to content

Commit bb4b823

Browse files
committed
Merge remote-tracking branch 'origin/v3.2.x'
Conflicts: ci/azure-pipelines-steps.yml - removed on master branch doc/_static/mpl.css - whitespace lib/matplotlib/axes/_axes.py - kept master version, don't forward-port feature fill for older numpys that we no longer support lib/matplotlib/backend_bases.py - PIL in required on master, don't forward port version checking fix - kept master branch version on all doc changes INSTALL.rst doc/api/prev_api_changes/api_changes_3.2.0/deprecations.rst doc/devel/coding_guide.rst doc/devel/min_dep_policy.rst doc/faq/howto_faq.rst examples/user_interfaces/embedding_in_tk_sgskip.py lib/matplotlib/backends/backend_agg.py lib/matplotlib/image.py lib/matplotlib/pyplot.py lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_colorbar.py lib/matplotlib/tests/test_fontconfig_pattern.py lib/mpl_toolkits/axes_grid1/axes_grid.py lib/mpl_toolkits/mplot3d/axes3d.py - kept master branch version
2 parents af49c1b + 1c1b8a5 commit bb4b823

File tree

6 files changed

+1033
-190
lines changed

6 files changed

+1033
-190
lines changed

doc/_static/mpl.css

Lines changed: 6 additions & 6 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
}
@@ -1217,4 +1217,4 @@ hr.box-sep {
12171217
div.box-item {
12181218
flex: 0 0 90%;
12191219
}
1220-
}
1220+
}

doc/_templates/layout.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<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>
3939
<img src="{{pathto("_static/logo2_compressed.svg", 1) }}" height="125px" border="0" alt="matplotlib"/></a>
4040
{%- endif %}
41-
41+
4242
<!-- The "Fork me on github" ribbon -->
4343
<div id="forkongithub"><a href="https://github.com/matplotlib/matplotlib">Fork me on GitHub</a></div>
4444
</div>
@@ -92,9 +92,9 @@
9292
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
9393
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
9494
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
95-
95+
9696
ga('create', 'UA-55954603-1', 'auto');
9797
ga('send', 'pageview');
98-
98+
9999
</script>
100-
{%- endblock %}
100+
{%- endblock %}

0 commit comments

Comments
 (0)