Merge pull request #5843 from minrk/ff-css

remove Firefox-specific CSS workaround
ipython · May 15, 2014 · 120fad1 · 120fad1
2 parents f936b4d + a67ac8e
commit 120fad1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git 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
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css