Merge branch 'master' into QR

2011-09-03 22:27:39 -07:00 · 2011-09-03 22:27:39 -07:00 · 1fbc04b34b
commit 1fbc04b34b
parent d1608b0646 eb6a6d947f
3 changed files with 16 additions and 0 deletions
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@ -3473,6 +3473,13 @@
      .inlined {\
        opacity: .5;\
      }\
+      .inline td.reply {\
+        background-color: rgba(252, 252, 252, 0.15);\
+        border: 1px solid rgba(128, 128, 128, 0.5);\
+      }\
+      .filetitle, .replytitle, .postername, .commentpostername, .postertrip {\
+        background: none;\
+      }\
 \
      /* Firefox bug: hidden tables are not hidden */\
      [hidden] {\
--- a/2
+++ b/2
@ -1,4 +1,6 @@
 master
+- mayhem
+  quote inlining default styling (by xat)

 2.19.2
 - mayhem
--- a/script.coffee
+++ b/script.coffee
@ -2772,6 +2772,13 @@ main =
      .inlined {
        opacity: .5;
      }
+      .inline td.reply {
+        background-color: rgba(252, 252, 252, 0.15);
+        border: 1px solid rgba(128, 128, 128, 0.5);
+      }
+      .filetitle, .replytitle, .postername, .commentpostername, .postertrip {
+        background: none;
+      }

      /* Firefox bug: hidden tables are not hidden */
      [hidden] {