Merge branch 'master' of github.com:aeosynth/4chan-x

Conflicts: 4chan_x.user.js
2011-06-25 20:13:39 +02:00 · 2011-06-25 20:13:39 +02:00 · d60f4fde60
commit d60f4fde60
parent 1f4aedfcb8 0f4a5891f2
2 changed files with 2 additions and 6 deletions
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@ -2899,11 +2899,9 @@
      #floaty {\
        float: left;\
      }\
-      #options #main {\
-        overflow: auto;\
-      }\
      #content > * {\
        height: 500px;\
+        overflow: auto;\
      }\
      #content textarea {\
        margin: 0;\
--- a/script.coffee
+++ b/script.coffee
@ -2298,11 +2298,9 @@ main =
      #floaty {
        float: left;
      }
-      #options #main {
-        overflow: auto;
-      }
      #content > * {
        height: 500px;
+        overflow: auto;
      }
      #content textarea {
        margin: 0;