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

Conflicts:
	4chan_x.user.js
This commit is contained in:
Nicolas Stepien 2011-06-25 20:13:39 +02:00
commit d60f4fde60
2 changed files with 2 additions and 6 deletions

View File

@ -2899,11 +2899,9 @@
#floaty {\ #floaty {\
float: left;\ float: left;\
}\ }\
#options #main {\
overflow: auto;\
}\
#content > * {\ #content > * {\
height: 500px;\ height: 500px;\
overflow: auto;\
}\ }\
#content textarea {\ #content textarea {\
margin: 0;\ margin: 0;\

View File

@ -2298,11 +2298,9 @@ main =
#floaty { #floaty {
float: left; float: left;
} }
#options #main {
overflow: auto;
}
#content > * { #content > * {
height: 500px; height: 500px;
overflow: auto;
} }
#content textarea { #content textarea {
margin: 0; margin: 0;