Merge pull request matplotlib#16121 from timhoffm/auto-backport-of-pr-16065-on-v2.2.x

QuLogic · web-flow · commit fa368df7b383 · 2020-01-10T00:10:22.000-05:00
Backport PR matplotlib#16065 on branch v2.2.x (Nicer formatting of community aspects on front page)
diff --git a/doc/_static/fa/LICENSE b/doc/_static/fa/LICENSE
@@ -0,0 +1,5 @@
+Font Awsome SVG Icons are covered by CC BY 4.0 License.
+
+https://fontawesome.com/license/free
+
+Icons are based on Font Awesome 5.11.2 and colors have been adapted.
diff --git a/doc/_static/fa/discourse-brands.svg b/doc/_static/fa/discourse-brands.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="discourse" class="svg-inline--fa fa-discourse fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#aaa" d="M225.9 32C103.3 32 0 130.5 0 252.1 0 256 .1 480 .1 480l225.8-.2c122.7 0 222.1-102.3 222.1-223.9C448 134.3 348.6 32 225.9 32zM224 384c-19.4 0-37.9-4.3-54.4-12.1L88.5 392l22.9-75c-9.8-18.1-15.4-38.9-15.4-61 0-70.7 57.3-128 128-128s128 57.3 128 128-57.3 128-128 128z"></path></svg>
diff --git a/doc/_static/fa/envelope-regular.svg b/doc/_static/fa/envelope-regular.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="envelope" class="svg-inline--fa fa-envelope fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#aaa" d="M464 64H48C21.49 64 0 85.49 0 112v288c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V112c0-26.51-21.49-48-48-48zm0 48v40.805c-22.422 18.259-58.168 46.651-134.587 106.49-16.841 13.247-50.201 45.072-73.413 44.701-23.208.375-56.579-31.459-73.413-44.701C106.18 199.465 70.425 171.067 48 152.805V112h416zM48 400V214.398c22.914 18.251 55.409 43.862 104.938 82.646 21.857 17.205 60.134 55.186 103.062 54.955 42.717.231 80.509-37.199 103.053-54.947 49.528-38.783 82.032-64.401 104.947-82.653V400H48z"></path></svg>
diff --git a/doc/_static/fa/github-brands.svg b/doc/_static/fa/github-brands.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="github" class="svg-inline--fa fa-github fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path fill="#aaa" d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"></path></svg>
diff --git a/doc/_static/fa/gitter-brands.svg b/doc/_static/fa/gitter-brands.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="gitter" class="svg-inline--fa fa-gitter fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="#aaa" d="M66.4 322.5H16V0h50.4v322.5zM166.9 76.1h-50.4V512h50.4V76.1zm100.6 0h-50.4V512h50.4V76.1zM368 76h-50.4v247H368V76z"></path></svg>
diff --git a/doc/_static/fa/hashtag-solid.svg b/doc/_static/fa/hashtag-solid.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="hashtag" class="svg-inline--fa fa-hashtag fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#aaa" d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"></path></svg>
diff --git a/doc/_static/fa/plus-square-regular.svg b/doc/_static/fa/plus-square-regular.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="plus-square" class="svg-inline--fa fa-plus-square fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#aaa" d="M352 240v32c0 6.6-5.4 12-12 12h-88v88c0 6.6-5.4 12-12 12h-32c-6.6 0-12-5.4-12-12v-88h-88c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h88v-88c0-6.6 5.4-12 12-12h32c6.6 0 12 5.4 12 12v88h88c6.6 0 12 5.4 12 12zm96-160v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h352c26.5 0 48 21.5 48 48zm-48 346V86c0-3.3-2.7-6-6-6H54c-3.3 0-6 2.7-6 6v340c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"></path></svg>
diff --git a/doc/_static/fa/question-circle-regular.svg b/doc/_static/fa/question-circle-regular.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="question-circle" class="svg-inline--fa fa-question-circle fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#aaa" d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm107.244-255.2c0 67.052-72.421 68.084-72.421 92.863V300c0 6.627-5.373 12-12 12h-45.647c-6.627 0-12-5.373-12-12v-8.659c0-35.745 27.1-50.034 47.579-61.516 17.561-9.845 28.324-16.541 28.324-29.579 0-17.246-21.999-28.693-39.784-28.693-23.189 0-33.894 10.977-48.942 29.969-4.057 5.12-11.46 6.071-16.666 2.124l-27.824-21.098c-5.107-3.872-6.251-11.066-2.644-16.363C184.846 131.491 214.94 112 261.794 112c49.071 0 101.45 38.304 101.45 88.8zM298 368c0 23.159-18.841 42-42 42s-42-18.841-42-42 18.841-42 42-42 42 18.841 42 42z"></path></svg>
diff --git a/doc/_static/fa/stack-overflow-brands.svg b/doc/_static/fa/stack-overflow-brands.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="stack-overflow" class="svg-inline--fa fa-stack-overflow fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="#aaa" d="M290.7 311L95 269.7 86.8 309l195.7 41zm51-87L188.2 95.7l-25.5 30.8 153.5 128.3zm-31.2 39.7L129.2 179l-16.7 36.5L293.7 300zM262 32l-32 24 119.3 160.3 32-24zm20.5 328h-200v39.7h200zm39.7 80H42.7V320h-40v160h359.5V320h-40z"></path></svg>
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -932,7 +932,7 @@ div.responsive_subfig img {
     width: 100%;
 }
 
-@media only screen and (max-width: 1000px){
+@media only screen and (max-width: 930px){
     /* The value of 1000px was handcrafted to provide a more or less */
     /* smooth transition between the 1x4 and the 2x2 layouts. It is  */
     /* NB: it is slightly below 1024px: so one should still have a   */
@@ -1016,3 +1016,78 @@ div.viewcode-block:target {
 .sidebar-announcement p {
     margin: 0.4em 0.4em 0.6em 0.4em;
 }
+
+/* new main nav */
+nav.main-nav{
+    background-color: #002b47;
+    font-family: 'CarlogoRegular', 'Carlito', sans-serif;
+    font-size: 16px;
+  }
+  
+  nav.main-nav ul{
+    margin: 0;
+    padding: 0;
+    display: flex;
+    flex-direction: row;
+  }
+  
+  nav.main-nav li{
+    margin: 8px 15px;
+    list-style-type: none;
+  }
+
+  nav.main-nav a{
+    color: white;
+  }
+  
+  nav.main-nav a:hover{
+    text-decoration: underline;
+  }
+
+  nav.main-nav li.nav-right{
+    margin: 6px 15px 0 auto;
+  }
+
+  nav.main-nav input {
+    border: 0;
+    padding: 3px 6px;
+    width: 198px;
+  }
+
+/* community items on main page */
+div.box {
+    display: flex;
+    flex-flow: row wrap;
+}
+
+div.box-item {
+    flex: 0 0 45%;
+    padding: 4px;
+    margin: 8px 12px;
+}
+
+div.box-item img {
+    float: left;
+    width: 30px;
+    height: 30px;
+    fill: #888;
+
+}
+div.box-item p {
+    margin: 0 0 0 50px;
+}
+
+div.box-item ul {
+    margin: 0 0 0 50px;
+    padding-left: 20px;
+}
+
+hr.box-sep {
+    margin: 1em 2em;
+}
+
+@media only screen and (max-width: 930px){
+    div.box-item {
+        flex: 0 0 90%;
+    }
+}
diff --git a/doc/index.rst b/doc/index.rst
@@ -117,37 +117,71 @@ Software Foundation Code of Conduct <coc_>`_ in everything we do.
 
 .. _coc: http://www.python.org/psf/codeofconduct/
 
-- Join our community at `discourse.matplotlib.org`_  to get help, discuss
-  contributing & development, and share your work.
-- If you have questions, be sure to check the :doc:`FAQ <faq/index>`, the
-  :doc:`API <api/index>` docs, and the `search <search.html>`_ tool
-  searches all of the documentation, including full text search of over 350
-  complete examples which exercise almost every corner of Matplotlib.
-- If its something quick join the `gitter channel`_ to chat with the
-  community.
-- If you prefer email there are the  matplotlib-users_, matplotlib-devel_,
-  and matplotlib-announce_ mailing lists.
-- Check out the Matplotlib tag on stackoverflow_.
-- Tweet us at Twitter_! or see cool plots on Instagram_!
-
-.. _discourse.matplotlib.org: https://discourse.matplotlib.org
-.. _gitter channel: https://gitter.im/matplotlib/matplotlib
-.. _matplotlib-users: https://mail.python.org/mailman/listinfo/matplotlib-users
-.. _matplotlib-devel: https://mail.python.org/mailman/listinfo/matplotlib-devel
-.. _matplotlib-announce: https://mail.python.org/mailman/listinfo/matplotlib-announce
-.. _stackoverflow: http://stackoverflow.com/questions/tagged/matplotlib
-.. _Twitter: https://twitter.com/matplotlib
-.. _Instagram: https://www.instagram.com/matplotart/
-
-You can file bugs, patches and feature requests on the `issue tracker`_, but it
-is a good idea to ping us on Discourse_ as well.
-
-.. _Discourse: https://discourse.matplotlib.org
-
-To keep up to date with what's going on in Matplotlib, see the :doc:`what's
-new <users/whats_new>` page or browse the `source code`_.  Anything that could
-require changes to your existing code is logged in the :doc:`API changes
-<api/api_changes>` file.
+
+.. raw:: html
+
+    <h3>Get help</h3>
+    <div class="box">
+      <div class="box-item">
+        <img src="_static/fa/discourse-brands.svg" alt="Discourse">
+        <p>Join our community at <a href="https://discourse.matplotlib.org">discourse.matplotlib.org</a>
+        to get help, discuss contributing &amp; development, and share your work.</p>
+      </div>
+      <div class="box-item">
+        <img src="_static/fa/question-circle-regular.svg" alt="Questions">
+        <p>If you have questions, be sure to check the <a href="faq/index.html">FAQ</a>,
+        the <a href="api/index.html">API</a> docs. The full text
+        <a href="search.html">search</a> is a good way to discover the docs including the many examples.</p>
+      </div>
+      <div class="box-item">
+        <img src="_static/fa/stack-overflow-brands.svg" alt="Stackoverflow">
+        <p>Check out the Matplotlib tag on <a href="http://stackoverflow.com/questions/tagged/matplotlib">stackoverflow</a>.</p>
+      </div>
+      <div class="box-item">
+        <img src="_static/fa/gitter-brands.svg" alt="Gitter">
+        <p>Short questions may be posted on the <a href="https://gitter.im/matplotlib/matplotlib">gitter channel</a>.</p>
+      </div>
+    </div>
+    <hr class='box-sep'>
+    <h3>News</h3>
+    <div class="box">
+      <div class="box-item">
+        <img src="_static/fa/plus-square-regular.svg" alt="News">
+        <p>To keep up to date with what's going on in Matplotlib, see the
+        <a href="users/whats_new.html">what's new</a> page or browse the
+        <a href="https://github.com/matplotlib/matplotlib">source code</a>.  Anything that could
+        require changes to your existing code is logged in the
+        <a href="api/api_changes.html">API changes</a> file.</p>
+      </div>
+      <div class="box-item">
+        <img src="_static/fa/hashtag-solid.svg" alt="Social media">
+        <p>Tweet us at <a href="https://twitter.com/matplotlib">Twitter</a>!
+        or see cool plots on <a href="https://www.instagram.com/matplotart/">Instagram</a>!</p>
+      </div>
+    </div>
+    <hr class='box-sep'>
+    <h3>Development</h3>
+    <div class="box">
+      <div class="box-item">
+        <img src="_static/fa/github-brands.svg" alt="Github">
+        <p>Matplotlib is hosted on <a href="https://github.com/matplotlib/matplotlib">GitHub</a>.</p>
+        <ul>
+        <li>File bugs and feature requests on the <a href="https://github.com/matplotlib/matplotlib/issues">issue tracker</a>.</li>
+        <li><a href="https://github.com/matplotlib/matplotlib/pulls">Pull requests</a> are always welcome.</li>
+        </ul>
+        <p>It is a good idea to ping us on <a href="https://discourse.matplotlib.org">Discourse</a> as well.</p>
+      </div>
+      <div class="box-item">
+        <img src="_static/fa/envelope-regular.svg" alt="Mailing lists">
+        <p>Mailing lists</p>
+        <ul>
+        <li><a href="https://mail.python.org/mailman/listinfo/matplotlib-users">matplotlib-users</a> for usage questions</li>
+        <li><a href="https://mail.python.org/mailman/listinfo/matplotlib-devel">matplotlib-devel</a> for development</li>
+        <li><a href="https://mail.python.org/mailman/listinfo/matplotlib-announce">matplotlib-announce</a> for project announcements</li>
+        </ul>
+      </div>
+    </div>
+
 
 Toolkits
 ========
@@ -206,10 +240,3 @@ Foundation (PSF) license <psf-license_>`_.
 
 There is an active developer community and a long list of people who have made
 significant :doc:`contributions <users/credits>`.
-
-Matplotlib is hosted on `Github <source code_>`_.  `Issues <issue tracker_>`_
-and `Pull requests`_ are tracked at Github too.
-
-.. _source code: https://github.com/matplotlib/matplotlib
-.. _issue tracker: https://github.com/matplotlib/matplotlib/issues
-.. _pull requests: https://github.com/matplotlib/matplotlib/pulls
