Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 3de5f14

Browse filesBrowse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'origin/v3.0.0-doc' into v3.0.x
2 parents 13c962a + 9db5400 commit 3de5f14
Copy full SHA for 3de5f14

File tree

Expand file treeCollapse file tree

5 files changed

+13
-105
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+13
-105
lines changed

‎INSTALL.rst

Copy file name to clipboardExpand all lines: INSTALL.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ Installing an official release
1717
Matplotlib and its dependencies are available as wheel packages for macOS,
1818
Windows and Linux distributions::
1919

20-
python -mpip install -U pip
21-
python -mpip install -U matplotlib
20+
python -m pip install -U pip
21+
python -m pip install -U matplotlib
2222

2323
.. note::
2424

‎doc/_templates/layout.html

Copy file name to clipboardExpand all lines: doc/_templates/layout.html
+1-102Lines changed: 1 addition & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ <h3>{{ _('Navigation') }}</h3>
246246
{%- endif %}
247247
{%- if show_sphinx %}
248248
{% trans sphinx_version=sphinx_version|e %}Created using
249-
<ahref="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
249+
<a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
250250
{%- endif %}
251251
{%- if sha %}
252252
Doc version {{ sha }}.
@@ -266,106 +266,5 @@ <h3>{{ _('Navigation') }}</h3>
266266
</script>
267267
</body>
268268
<footer>
269-
<!--Flipcause Integration v3.0// Flipcause Integration Instructions:
270-
Install the following code block once in the website Header (after <head> tag) -->
271-
272-
<style>
273-
274-
.fc-black_overlay{
275-
display:none; position: fixed; z-index:1000001; top: 0%;left: 0%;width: 100%;height: 100%;
276-
background-color: black; filter: alpha(opacity=50); cursor:pointer; opacity:0.5;
277-
}
278-
279-
.fc-white_content {
280-
opacity:1; display:none; margin-top: -320px; margin-left: -485px; width:970px; height:640px;
281-
position:fixed; top:50%; left:50%; border: none;z-index:1000002;overflow: auto;
282-
}
283-
284-
.fc-main-box{
285-
opacity:1; display:none; margin:15px auto 0 auto; width:930px; position:relative; z-index:1000003;
286-
}
287-
288-
.fc-widget_close{
289-
opacity:1; content:url(http://i1338.photobucket.com/albums/o691/WeCause/X_zpse4a7e538.png);
290-
position:absolute; z-index=1000004; right:-16px; top:-16px; display:block; cursor:pointer;
291-
}
292-
293-
.floating_button{
294-
display: block; margin-top: 0px; margin-left: 0px; width:auto ; height: auto;
295-
position:fixed; z-index:999999; overflow: auto;
296-
}
297-
298-
@keyframes backfadesin {
299-
from { opacity:0; }
300-
to {opacity:.5;}
301-
}
302-
303-
@-moz-keyframes backfadesin {
304-
from { opacity:0; }
305-
to {opacity:.5;}
306-
}
307-
308-
@-webkit-keyframes backfadesin {
309-
from { opacity:0; }
310-
to {opacity:.5;}
311-
}
312-
313-
@-o-keyframes backfadesin {
314-
from { opacity:0; }
315-
to {opacity:.5;}
316-
}
317-
318-
319-
@-ms-keyframes backfadesin {
320-
from { opacity:0; }
321-
to {opacity:.5;}
322-
}
323-
324-
@keyframes fadesin {
325-
0%{ opacity:0; }
326-
50%{ opacity:0; }
327-
75% {opacity: 0; transform: translateY(20px);}
328-
100% {opacity: 1; transform: translateY(0);}
329-
}
330-
331-
@-moz-keyframes fadesin {
332-
0%{ opacity:0; }
333-
50%{ opacity:0; }
334-
75% {opacity: 0; -moz-transform: translateY(20px);}
335-
100% {opacity: 1; -moz-transform: translateY(0);}
336-
}
337-
338-
@-webkit-keyframes fadesin {
339-
0%{ opacity:0; }
340-
50%{ opacity:0; }
341-
75% {opacity: 0; -webkit-transform: translateY(20px);}
342-
100% {opacity: 1; -webkit-transform: translateY(0);}
343-
}
344-
345-
@-o-keyframes fadesin {
346-
0%{ opacity:0; }
347-
50%{ opacity:0; }
348-
75% {opacity: 0; -o-transform: translateY(20px);}
349-
100% {opacity: 1; -o-transform: translateY(0);}
350-
}
351-
352-
@-ms-keyframes fadesin {
353-
0%{ opacity:0; }
354-
50%{ opacity:0; }
355-
75% {opacity: 0; -ms-transform: translateY(20px);}
356-
100% {opacity: 1; -ms-transform: translateY(0);}
357-
}
358-
359-
</style>
360-
361-
<div id="fc-fade" class="fc-black_overlay" onclick="close_window()"></div>
362-
<div id="fc-light" class="fc-white_content">
363-
<div id="fc-main" class="fc-main-box">
364-
<div id="fc-close" class="fc-widget_close" onclick="close_window()">
365-
</div><iframe id="fc-myFrame" iframe height="580" width="925" style="border: 0;
366-
border-radius:5px 5px 5px 5px; box-shadow:0 0 8px rgba(0, 0, 0, 0.5);" scrolling="no" src=""></iframe></div>
367-
</div>
368-
369-
<!--END Flipcause Main Integration Code-->
370269
</footer>
371270
</html>

‎doc/_templates/sidebar_announcement.html

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="sidebar-announcement">
2-
<p>The upcoming version Matplotlib 3.0 will be Python 3 only.</p>
2+
<p>Matplotlib 3.0 is Python 3 only.</p>
33
<p>For Python 2 support, Matplotlib 2.2.x will be continued as a LTS release
44
and updated with bugfixes until January 1, 2020.</p>
55
</div>

‎doc/conf.py

Copy file name to clipboardExpand all lines: doc/conf.py
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,3 +333,10 @@ def _check_deps():
333333
# numpydoc config
334334

335335
numpydoc_show_class_members = False
336+
337+
latex_engine = 'xelatex' # or 'lualatex'
338+
339+
latex_elements = {
340+
'babel': r'\usepackage{babel}',
341+
'fontpkg': r'\setmainfont{DejaVu Serif}',
342+
}

‎doc/devel/documenting_mpl.rst

Copy file name to clipboardExpand all lines: doc/devel/documenting_mpl.rst
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,8 @@ rules expand on them where the numpydoc conventions are not specific.
426426

427427
Use ``float`` for a type that can be any number.
428428

429+
Use ``(float, float)`` to describe a 2D position.
430+
429431
Use ``array-like`` for homogeneous numeric sequences, which could
430432
typically be a numpy.array. Dimensionality may be specified using ``2D``,
431433
``3D``, ``n-dimensional``. If you need to have variables denoting the

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.