Merge remote-tracking branch 'matplotlib/v2.0.0-doc' into v2.0.x

tacaswell · tacaswell · commit 571ba3eaf336 · 2017-01-20T11:11:41.000-05:00
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -13,8 +13,9 @@ body {
     padding: 0;
     border: 1px solid #aaa;
     color: #333;
-    margin: 0px 80px 0px 80px;
+    margin: auto;
     min-width: 740px;
+    max-width: 1200px;
 }
 
 a {
diff --git a/doc/_templates/citing.html b/doc/_templates/citing.html
@@ -29,6 +29,7 @@ <h1>Citing Matplotlib</h1>
 
 <h2>DOIs</h2>
 <dl>
+  <dt>v2.0.0</dt><dd><a href="https://doi.org/10.5281/zenodo.248351"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.248351.svg" alt="DOI"></a></dd>
   <dt>v1.5.3</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.61948"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.61948.svg" alt="10.5281/zenodo.61948"></a></dd>
   <dt>v1.5.2</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.56926"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.56926.svg" alt="10.5281/zenodo.56926"></a></dd>
   <dt>v1.5.1</dt><dd><a href="http://dx.doi.org/10.5281/zenodo.44579"><img src="https://zenodo.org/badge/doi/10.5281/zenodo.44579.svg" alt="10.5281/zenodo.44579"></a></dd>
