8000 Merge pull request #16121 from timhoffm/auto-backport-of-pr-16065-on-… · QuLogic/matplotlib@fa368df · GitHub
[go: up one dir, main page]
Skip to content

Commit fa368df

Browse files
QuLogicQuLogic
authored
Merge pull request matplotlib#16121 from timhoffm/auto-backport-of-pr-16065-on-v2.2.x
Backport PR matplotlib#16065 on branch v2.2.x (Nicer formatting of community aspects on front page)
2 parents 5b684c4 + 2e65d5f commit fa368df

11 files changed

+154
-39
lines changed

‎doc/_static/fa/LICENSE

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Font Awsome SVG Icons are covered by CC BY 4.0 License.
2+
3+
https://fontawesome.com/license/free
4+
5+
Icons are based on Font Awesome 5.11.2 and colors have been adapted.

‎doc/_static/fa/discourse-brands.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/fa/envelope-regular.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/fa/github-brands.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/fa/gitter-brands.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/fa/hashtag-solid.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/fa/plus-square-regular.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/fa/question-circle-regular.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/fa/stack-overflow-brands.svg

Lines changed: 1 addition & 0 deletions
Loading

‎doc/_static/mpl.css

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ div.responsive_subfig img {
932932
width: 100%;
933933
}
934934

935-
@media only screen and (max-width: 1000px){
935+
@media only screen and (max-width: 930px){
936936
/* The value of 1000px was handcrafted to provide a more or less */
937937
/* smooth transition between the 1x4 and the 2x2 layouts. It is */
938938
/* NB: it is slightly below 1024px: so one should still have a */
@@ -1016,3 +1016,78 @@ div.viewcode-block:target {
10161016
.sidebar-announcement p {
10171017
margin: 0.4em 0.4em 0.6em 0.4em;
10181018
}
1019+
1020+
/* new main nav */
1021+
nav.main-nav{
1022+
background-color: #002b47;
1023+
font-family: 'CarlogoRegular', 'Carlito', sans-serif;
1024+
font-size: 16px;
1025+
}
1026+
1027+
nav.main-nav ul{
1028+
margin: 0;
1029+
padding: 0;
1030+
display: flex;
1031+
flex-direction: row;
1032+
}
1033+
1034+
nav.main-nav li{
1035+
margin: 8px 15px;
1036+
list-style-type: none;
1037+
}
1038+
1039+
nav.main-nav a{
1040+
color: white;
1041+
}
1042+
1043+
nav.main-nav a:hover{
1044+
text-decoration: underline;
1045+
}
1046+
1047+
nav.main-nav li.nav-right{
1048+
margin: 6px 15px 0 auto;
1049+
}
1050+
1051+
nav.main-nav input {
1052+
border: 0;
1053+
padding: 3px 6px;
1054+
width: 198px;
1055+
}
1056+
1057+
/* community items on main page */
1058+
div.box {
1059+
display: flex;
1060+
flex-flow: row wrap;
1061+
}
1062+
1063+
div.box-item {
1064+
flex: 0 0 45%;
1065+
padding: 4px;
1066+
margin: 8px 12px;
1067+
}
1068+
1069+
div.box-item img {
1070+
float: left;
1071+
width: 30px;
1072+
height: 30px;
1073+
fill: #888;
1074+
1075+
}
1076+
div.box-item p {
1077+
margin: 0 0 0 50px;
1078+
}
1079+
1080+
div.box-item ul {
1081+
margin: 0 0 0 50px;
1082+
padding-left: 20px;
1083+
}
1084+
1085+
hr.box-sep {
1086+
margin: 1em 2em;
1087+
}
1088+
1089+
@media only screen and (max-width: 930px){
1090+
div.box-item {
1091+
flex: 0 0 90%;
1092+
}
1093+
}

‎doc/index.rst

Lines changed: 65 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -117,37 +117,71 @@ Software Foundation Code of Conduct <coc_>`_ in everything we do.
117117

118118
.. _coc: http://www.python.org/psf/codeofconduct/
119119

120-
- Join our community at `discourse.matplotlib.org`_ to get help, discuss
121-
contributing & development, and share your work.
122-
- If you have questions, be sure to check the :doc:`FAQ <faq/index>`, the
123-
:doc:`API <api/index>` docs, and the `search <search.html>`_ tool
124-
searches all of the documentation, including full text search of over 350
125-
complete examples which exercise almost every corner of Matplotlib.
126-
- If its something quick join the `gitter channel`_ to chat with the
127-
community.
128-
- If you prefer email there are the matplotlib-users_, matplotlib-devel_,
129-
and matplotlib-announce_ mailing lists.
130-
- Check out the Matplotlib tag on stackoverflow_.
131-
- Tweet us at Twitter_! or see cool plots on Instagram_!
132-
133-
.. _discourse.matplotlib.org: https://discourse.matplotlib.org
134-
.. _gitter channel: https://gitter.im/matplotlib/matplotlib
135-
.. _matplotlib-users: https://mail.python.org/mailman/listinfo/matplotlib-users
136-
.. _matplotlib-devel: https://mail.python.org/mailman/listinfo/matplotlib-devel
137-
.. _matplotlib-announce: https://mail.python.org/mailman/listinfo/matplotlib-announce
138-
.. _stackoverflow: http://stackoverflow.com/questions/tagged/matplotlib
139-
.. _Twitter: https://twitter.com/matplotlib
140-
.. _Instagram: https://www.instagram.com/matplotart/
141-
142-
You can file bugs, patches and feature requests on the `issue tracker`_, but it
143-
is a good idea to ping us on Discourse_ as well.
144-
145-
.. _Discourse: https://discourse.matplotlib.org
146-
147-
To keep up to date with what's going on in Matplotlib, see the :doc:`what's
148-
new <users/whats_new>` page or browse the `source code`_. Anything that could
149-
require changes to your existing code is logged in the :doc:`API changes
150-
<api/api_changes>` file.
120+
121+
.. raw:: html
122+
123+
<h3>Get help</h3>
124+
<div class="box">
125+
<div class="box-item">
126+
<img src="_static/fa/discourse-brands.svg" alt="Discourse">
127+
<p>Join our community at <a href="https://discourse.matplotlib.org">discourse.matplotlib.org</a>
128+
to get help, discuss contributing &amp; development, and share your work.</p>
129+
</div>
130+
<div class="box-item">
131+
<img src="_static/fa/question-circle-regular.svg" alt="Questions">
132+
<p>If you have questions, be sure to check the <a href="faq/index.html">FAQ</a>,
133+
the <a href="api/index.html">API</a> docs. The full text
134+
<a href="search.html">search</a> is a good way to discover the docs including the many examples.</p>
135+
</div>
136+
<div class="box-item">
137+
<img src="_static/fa/stack-overflow-brands.svg" alt="Stackoverflow">
138+
<p>Check out the Matplotlib tag on <a href="http://stackoverflow.com/questions/tagged/matplotlib">stackoverflow</a>.</p>
139+
</div>
140+
<div class="box-item">
141+
<img src="_static/fa/gitter-brands.svg" alt="Gitter">
142+
<p>Short questions may be posted on the <a href="https://gitter.im/matplotlib/matplotlib">gitter channel</a>.</p>
143+
</div>
144+
</div>
145+
<hr class='box-sep'>
146+
<h3>News</h3>
147+
<div class="box">
148+
<div class="box-item">
149+
<img src="_static/fa/plus-square-regular.svg" alt="News">
150+
<p>To keep up to date with what's going on in Matplotlib, see the
151+
<a href="users/whats_new.html">what's new</a> page or browse the
152+
<a href="https://github.com/matplotlib/matplotlib">source code</a>. Anything that could
153+
require changes to your existing code is logged in the
154+
<a href="api/api_changes.html">API changes</a> file.</p>
155+
</div>
156+
<div class="box-item">
157+
<img src="_static/fa/hashtag-solid.svg" alt="Social media">
158+
<p>Tweet us at <a href="https://twitter.com/matplotlib">Twitter</a>!
159+
or see cool plots on <a href="https://www.instagram.com/matplotart/">Instagram</a>!</p>
160+
</div>
161+
</div>
162+
<hr class='box-sep'>
163+
<h3>Development</h3>
164+
<div class="box">
165+
<div class="box-item">
166+
<img src="_static/fa/github-brands.svg" alt="Github">
167+
<p>Matplotlib is hosted on <a href="https://github.com/matplotlib/matplotlib">GitHub</a>.</p>
168+
<ul>
169+
<li>File bugs and feature requests on the <a href="https://github.com/matplotlib/matplotlib/issues">issue tracker</a>.</li>
170+
<li><a href="https://github.com/matplotlib/matplotlib/pulls">Pull requests</a> are always welcome.</li>
171+
</ul>
172+
<p>It is a good idea to ping us on <a href="https://discourse.matplotlib.org">Discourse</a> as well.</p>
173+
</div>
174+
<div class="box-item">
175+
<img src="_static/fa/envelope-regular.svg" alt="Mailing lists">
176+
<p>Mailing lists</p>
177+
<ul>
178+
<li><a href="https://mail.python.org/mailman/listinfo/matplotlib-users">matplotlib-users</a> for usage questions</li>
179+
<li><a href="https://mail.python.org/mailman/listinfo/matplotlib-devel">matplotlib-devel</a> for development</li>
180+
<li><a href="https://mail.python.org/mailman/listinfo/matplotlib-announce">matplotlib-announce</a> for project announcements</li>
181+
</ul>
182+
</div>
183+
</div>
184+
151185

152186
Toolkits
153187
========
@@ -206,10 +240,3 @@ Foundation (PSF) license <psf-license_>`_.
206240

207241
There is an active developer community and a long list of people who have made
208242
significant :doc:`contributions <users/credits>`.
209-
210-
Matplotlib is hosted on `Github <source code_>`_. `Issues <issue tracker_>`_
211-
and `Pull requests`_ are tracked at Github too.
212-
213-
.. _source code: https://github.com/matplotlib/matplotlib
214-
.. _issue tracker: https://github.com/matplotlib/matplotlib/issues
215-
.. _pull requests: https://github.com/matplotlib/matplotlib/pulls

0 commit comments

Comments
 (0)
0