Skip to content

Commit ab6f821

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v2.2.x'
 Conflicts: .travis.yml INSTALL.rst doc/_static/mpl.css doc/api/api_changes.rst doc/api/index.rst doc/api/pyplot_summary.rst doc/conf.py doc/contents.rst doc/faq/howto_faq.rst doc/sphinxext/mock_gui_toolkits.py doc/users/prev_whats_new/whats_new_1.1.rst examples/axes_grid1/inset_locator_demo.py examples/color/color_cycler.py examples/images_contours_and_fields/contour_demo.py examples/images_contours_and_fields/contourf_demo.py lib/matplotlib/_constrained_layout.py lib/matplotlib/axes/_axes.py lib/matplotlib/axes/_base.py lib/matplotlib/backends/backend_agg.py lib/matplotlib/backends/qt_compat.py lib/matplotlib/cbook/__init__.py lib/matplotlib/contour.py lib/matplotlib/figure.py lib/matplotlib/font_manager.py lib/matplotlib/lines.py lib/matplotlib/pyplot.py lib/matplotlib/sphinxext/plot_directive.py lib/matplotlib/tests/test_axes.py lib/matplotlib/tests/test_backends_interactive.py lib/matplotlib/tests/test_figure.py lib/matplotlib/tests/test_image.py lib/matplotlib/tests/test_lines.py lib/matplotlib/tests/test_pyplot.py lib/matplotlib/tests/test_tightlayout.py lib/mpl_toolkits/axes_grid1/colorbar.py lib/mpl_toolkits/axes_grid1/inset_locator.py lib/mpl_toolkits/tests/test_axes_grid1.py setupext.py tutorials/advanced/transforms_tutorial.py tutorials/intermediate/constrainedlayout_guide.py tutorials/intermediate/imshow_extent.py In all cases kept the master branch version of conflicted file.
2 parents 0e95b73 + 00daa8f commit ab6f821

File tree

6 files changed

+784
-56
lines changed

6 files changed

+784
-56
lines changed

‎doc/_static/mpl.css‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ dl.method, dl.classmethod, dl.staticmethod, dl.attribute {
735735
}
736736

737737

738-
dl.class > dt, dl.classmethod > dt, dl.method > dt, dl.function > dt,
738+
dl.class > dt, dl.classmethod > dt, dl.method > dt, dl.function > dt,
739739
dl.attribute > dt, dl.staticmethod > dt {
740740
background-color: #eff3f4;
741741
padding-left: 6px;
@@ -861,25 +861,6 @@ figcaption {
861861
}
862862

863863

864-
/* "Summer Fellowship" message. */
865-
#summer-fellowship {
866-
background: #11557C;
867-
box-sizing: border-box;
868-
color: #fffa;
869-
font-weight: bold;
870-
left: 0;
871-
min-height: 3em;
872-
padding: 0.7em;
873-
top: 0;
874-
width: 100%;
875-
z-index: 10000;
876-
}
877-
878-
#summer-fellowship a {
879-
color: #fff;
880-
text-decoration:underline;
881-
}
882-
883864
/* "Go to released version" message. */
884865
#unreleased-message {
885866
background: #d62728;

‎doc/_templates/layout.html‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,7 @@ <h3>{{ _('Navigation') }}</h3>
172172
</a>
173173
</div>
174174
{%- endif %}
175-
<div id="summer-fellowship">
176-
Applications are open for the 2018 John Hunter Matplotlib Summer Fellowship.
177-
<a href="https://www.numfocus.org/programs/john-hunter-technology-fellowship">
178-
Apply now!
179-
</a>
180-
</div>
175+
181176
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
182177
{%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
183178
<a href="{{ pathto('index') }}">

‎doc/api/pyplot_summary.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Pyplot function overview
99

1010
pyplot
1111

12-
1312
.. currentmodule:: matplotlib.pyplot
1413

1514
.. autofunction:: plotting

0 commit comments

Comments
 (0)