Merge pull request #21085 from meeseeksmachine/auto-backport-of-pr-21082-on-v3.5.x

QuLogic · web-flow · commit 69ddca25a8b3 · 2021-09-16T03:08:28.000-04:00
Backport PR #21082 on branch v3.5.x (Fix layout of sidebar entries)
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -213,10 +213,11 @@ table.property-table td {
     padding: 4px 10px;
 }
 
-.donate-button {
-    margin: 1em 0;
+.sidebar-cheatsheets, .sidebar-donate {
+    margin: 2.75rem 0;
 }
 
-.sphinxsidebarwrapper {
-    margin: 0 1em;
+.sidebar-donate .mpl-button {
+    /* fix width to width of cheatsheet */
+    width: 210px;
 }
diff --git a/doc/_templates/cheatsheet_sidebar.html b/doc/_templates/cheatsheet_sidebar.html
@@ -1,5 +1,5 @@
 
-<div class="sphinxsidebarwrapper">
+<div class="sidebar-cheatsheets">
   <h3>Matplotlib cheatsheets</h3>
   <a href="https://github.com/matplotlib/cheatsheets#cheatsheets">
     <img src="_static/mpl_cheatsheet1.png"
diff --git a/doc/_templates/donate_sidebar.html b/doc/_templates/donate_sidebar.html
@@ -1,7 +1,7 @@
 
 
 
-<div id="sidebar-donations" class="donate-button">
+<div class="sidebar-donate">
   <a href="https://numfocus.org/donate-to-matplotlib" target="_blank">
     <span class="mpl-button" >Support Matplotlib</span>
   </a>

Original file line number	Diff line number	Diff line change
`@@ -213,10 +213,11 @@ table.property-table td {`
`213`	`213`	`padding: 4px 10px;`
`214`	`214`	`}`
`215`	`215`
`216`		`-.donate-button {`
`217`		`- margin: 1em 0;`
	`216`	`+.sidebar-cheatsheets, .sidebar-donate {`
	`217`	`+ margin: 2.75rem 0;`
`218`	`218`	`}`
`219`	`219`
`220`		`-.sphinxsidebarwrapper {`
`221`		`- margin: 0 1em;`
	`220`	`+.sidebar-donate .mpl-button {`
	`221`	`+ /* fix width to width of cheatsheet */`
	`222`	`+ width: 210px;`
`222`	`223`	`}`