Merge branch 'master' into qr

Conflicts: 4chan_x.user.js
2012-01-10 16:55:18 +01:00 · 2012-01-10 16:55:18 +01:00 · 8638e455f0
commit 8638e455f0
parent 4f2c1eb775 ca8d119e57
2 changed files with 2 additions and 4 deletions
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@ -2410,7 +2410,7 @@
      var el, id, qp, quote, replyID, threadID, _i, _len, _ref, _results;
      qp = ui.el = $.el('div', {
        id: 'qp',
-        className: 'reply'
+        className: 'reply dialog'
      });
      $.add(d.body, qp);
      id = this.hash.slice(1);
@ -3165,7 +3165,6 @@
      }\
 \
      #qp {\
-        border: 1px solid;\
        padding-bottom: 5px;\
      }\
      .qphl {\
--- a/script.coffee
+++ b/script.coffee
@ -1946,7 +1946,7 @@ quotePreview =
  mouseover: (e) ->
    qp = ui.el = $.el 'div',
      id: 'qp'
-      className: 'reply'
+      className: 'reply dialog'
    $.add d.body, qp

    id = @hash[1..]
@ -2603,7 +2603,6 @@ Main =
      }

      #qp {
-        border: 1px solid;
        padding-bottom: 5px;
      }
      .qphl {