From 631a8b6dfc3860dbab5b0d1d143073af61e1d3fb 2014-05-16 17:13:06
From: MinRK <benjaminrk@gmail.com>
Date: 2014-05-16 17:13:06
Subject: [PATCH] Backport PR #5843: remove Firefox-specific CSS workaround

The bug being worked around appears to be fixed either in CodeMirror or Firefox (tested with FF 29).

Importantly, the workaround appears to *introduce* incorrect behavior

closes #5192
closes #5364

---

diff --git a/IPython/html/static/notebook/less/codemirror.less b/IPython/html/static/notebook/less/codemirror.less
index 4995983..fa9759c 100644
--- a/IPython/html/static/notebook/less/codemirror.less
+++ b/IPython/html/static/notebook/less/codemirror.less
@@ -22,14 +22,6 @@
     overflow-x: auto;
 }
 
-@-moz-document url-prefix() {
-  /* Firefox does weird and terrible things (#3549) when overflow-x is auto */
-  /* It doesn't respect the overflow setting anyway, so we can workaround it with this */
-  .CodeMirror-scroll {
-    overflow-x: hidden;
-  }
-}
-
 .CodeMirror-lines {
     /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */
     /* we have set a different line-height and want this to scale with that. */
diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css
index c6d5a3f..93f2b40 100644
--- a/IPython/html/static/style/ipython.min.css
+++ b/IPython/html/static/style/ipython.min.css
@@ -57,7 +57,7 @@ div.input_area>div.highlight{margin:.4em;border:none;padding:0;background-color:
 div.input_area>div.highlight>pre{margin:0;border:none;padding:0;background-color:transparent}
 .CodeMirror{line-height:1.21429em;height:auto;background:none;}
 .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto}
-@-moz-document url-prefix(){.CodeMirror-scroll{overflow-x:hidden}}.CodeMirror-lines{padding:.4em}
+.CodeMirror-lines{padding:.4em}
 .CodeMirror-linenumber{padding:0 8px 0 4px}
 .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px}
 .CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 2904e93..1fa09c9 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -1362,7 +1362,7 @@ div.input_area>div.highlight{margin:.4em;border:none;padding:0;background-color:
 div.input_area>div.highlight>pre{margin:0;border:none;padding:0;background-color:transparent}
 .CodeMirror{line-height:1.21429em;height:auto;background:none;}
 .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto}
-@-moz-document url-prefix(){.CodeMirror-scroll{overflow-x:hidden}}.CodeMirror-lines{padding:.4em}
+.CodeMirror-lines{padding:.4em}
 .CodeMirror-linenumber{padding:0 8px 0 4px}
 .CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px}
 .CodeMirror pre{padding:0;border:0;border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}