Merge branch 'master' into qr

Conflicts:
	4chan_x.user.js
This commit is contained in:
Nicolas Stepien 2012-01-10 16:55:18 +01:00
commit 8638e455f0
2 changed files with 2 additions and 4 deletions

View File

@ -2410,7 +2410,7 @@
var el, id, qp, quote, replyID, threadID, _i, _len, _ref, _results; var el, id, qp, quote, replyID, threadID, _i, _len, _ref, _results;
qp = ui.el = $.el('div', { qp = ui.el = $.el('div', {
id: 'qp', id: 'qp',
className: 'reply' className: 'reply dialog'
}); });
$.add(d.body, qp); $.add(d.body, qp);
id = this.hash.slice(1); id = this.hash.slice(1);
@ -3165,7 +3165,6 @@
}\ }\
\ \
#qp {\ #qp {\
border: 1px solid;\
padding-bottom: 5px;\ padding-bottom: 5px;\
}\ }\
.qphl {\ .qphl {\

View File

@ -1946,7 +1946,7 @@ quotePreview =
mouseover: (e) -> mouseover: (e) ->
qp = ui.el = $.el 'div', qp = ui.el = $.el 'div',
id: 'qp' id: 'qp'
className: 'reply' className: 'reply dialog'
$.add d.body, qp $.add d.body, qp
id = @hash[1..] id = @hash[1..]
@ -2603,7 +2603,6 @@ Main =
} }
#qp { #qp {
border: 1px solid;
padding-bottom: 5px; padding-bottom: 5px;
} }
.qphl { .qphl {