Merge pull request #11028 from timhoffm/py2support-note

dstansby · web-flow · commit 4650534b06c6 · 2018-04-12T09:53:32.000+01:00
Add note concerning python2 support on doc start page
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -309,11 +309,11 @@ h2 {
     margin: 0.5em 0 0.2em 0;
     padding-top: 0.5em;
     font-size: 1.7em;
-    padding: 0;
 }
 
 h3 {
     margin: 0.2em 0 0.1em 0;
+    padding-top: 0.5em;
     font-size: 1.2em;
 }
 
@@ -846,14 +846,12 @@ figcaption {
 }
 
 #sidebar-donations {
-    margin-top: 28px;
+    margin-top: 40px;
 }
 
 .donate_button {
     background:#11557C;
     font-weight:normal;
-    border:solid 1px #fff;
-    outline: solid 1px #11557C;
     clear: both;
     display: block;
     width:200px;
@@ -864,6 +862,7 @@ figcaption {
     color:#fff;
     text-decoration: none;
     margin: 30px auto 0;
+    border-radius: 6px;
     z-index:1;
     transition: background .25s ease;
 }
@@ -972,3 +971,13 @@ p.sphx-glr-signature a.reference.external {
     font-weight: 400;
 }
 
+.sidebar-announcement {
+    border: 1px solid #11557C;
+    background: #eff9ff;
+    padding: 2px;
+    margin-top: 40px;
+}
+
+.sidebar-announcement p {
+    margin: 0.4em 0.4em 0.6em 0.4em;
+}
diff --git a/doc/_templates/sidebar_announcement.html b/doc/_templates/sidebar_announcement.html
@@ -0,0 +1,5 @@
+<div class="sidebar-announcement">
+  <p>The upcoming version Matplotlib 3.0 will be Python 3 only.</p>
+  <p>For Python 2 support, Matplotlib 2.2.x will be continued as a LTS release
+      and updated with bugfixes until January 1, 2020.</p>
+</div>
diff --git a/doc/conf.py b/doc/conf.py
@@ -233,7 +233,8 @@ def _check_deps():
 
 # Custom sidebar templates, maps page names to templates.
 html_sidebars = {
-    'index': ['searchbox.html', 'donate_sidebar.html'],
+    'index': ['searchbox.html', 'sidebar_announcement.html',
+              'donate_sidebar.html'],
     '**': ['searchbox.html', 'localtoc.html', 'relations.html',
            'pagesource.html']
 }

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,8 @@ def _check_deps():`
`233`	`233`
`234`	`234`	`# Custom sidebar templates, maps page names to templates.`
`235`	`235`	`html_sidebars = {`
`236`		`- 'index': ['searchbox.html', 'donate_sidebar.html'],`
	`236`	`+ 'index': ['searchbox.html', 'sidebar_announcement.html',`
	`237`	`+ 'donate_sidebar.html'],`
`237`	`238`	`'**': ['searchbox.html', 'localtoc.html', 'relations.html',`
`238`	`239`	`'pagesource.html']`
`239`	`240`	`}`