Merge branch 'master' into qr
Conflicts: 4chan_x.user.js
This commit is contained in:
commit
8638e455f0
@ -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 {\
|
||||||
|
|||||||
@ -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 {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user