plotly · alexcjohnson · Jun 6, 2018 · May 29, 2018 · May 29, 2018 · May 30, 2018
diff --git a/src/plots/plots.js b/src/plots/plots.js
@@ -1632,7 +1632,13 @@ plots.autoMargin = function(gd, id, o) {
             delete pushMarginIds[id];
         }
         else {
-            var pad = o.pad === undefined ? 12 : o.pad;
+            var pad = o.pad;
+            if(pad === undefined) {
+                var margin = fullLayout.margin;
+                // if no explicit pad is given, use 12px unless there's a
+                // specified margin that's smaller than that
+                pad = Math.min(12, margin.l, margin.r, margin.t, margin.b);
+            }
 
             // if the item is too big, just give it enough automargin to
             // make sure you can still grab it and bring it back

diff --git a/test/image/baselines/11.png b/test/image/baselines/11.png
diff --git a/test/image/baselines/15.png b/test/image/baselines/15.png
diff --git a/test/image/baselines/28.png b/test/image/baselines/28.png
diff --git a/test/image/baselines/5.png b/test/image/baselines/5.png
diff --git a/test/image/baselines/benchmarks.png b/test/image/baselines/benchmarks.png
diff --git a/test/image/baselines/dendrogram.png b/test/image/baselines/dendrogram.png
diff --git a/test/image/baselines/gl3d_cufflinks.png b/test/image/baselines/gl3d_cufflinks.png
diff --git a/test/image/baselines/gl3d_ibm-plot.png b/test/image/baselines/gl3d_ibm-plot.png
diff --git a/test/image/baselines/gl3d_opacity-scaling-spikes.png b/test/image/baselines/gl3d_opacity-scaling-spikes.png