Merge branch 'v3'

Conflicts:
	src/Quotelinks/QuoteYou.coffee

builds/4chan-X.user.js

@@ -3487,7 +3487,7 @@
           textContent: 'Show thread',
           href: 'javascript:;'
         });
-        $.on(show, 'click', ThreadHiding.menu.show);
+        $.on(div, 'click', ThreadHiding.menu.show);
         $.event('AddMenuEntry', {
           type: 'post'
         });
@@ -4223,12 +4223,14 @@
     },
     cb: {
       seek: function(type) {
-        var post, posts, result, str;
+        var highlight, post, posts, result, str;
 
         if (!(Conf['Mark Quotes of You'] && Conf['Quick Reply'])) {
           return;
         }
-        $.rmClass($('.highlight'), 'highlight');
+        if (highlight = $('.highlight')) {
+          $.rmClass(highlight, 'highlight');
+        }
         if (!QuoteYou.lastRead) {
           if (!(post = QuoteYou.lastRead = $('.quotesYou'))) {
             new Notification('warning', 'No posts are currently quoting you, loser.', 20);

src/General/Globals.coffee

@@ -3066,7 +3066,9 @@ textarea,
 #unread-line {
   margin: -1px;
 }
-#qp { border: none !important; }
+#qp {
+  border: none !important;
+}
 #unread-line {
   padding: 1px;
   border: 1px solid #111 !important;

src/General/css/themeoptions.css

@@ -26,7 +26,7 @@
 .lit {
   color: #368c72;
 }
-"} else {"
+" else "
 .prettyprint {
   background-color: rgba(0,0,0,.1);
   border: 1px solid rgba(0,0,0,0.5);

src/Quotelinks/QuoteYou.coffee

@@ -34,7 +34,7 @@ QuoteYou =
   cb:
     seek: (type) ->
       return unless Conf['Mark Quotes of You']
-      $.rmClass $('.highlight'), 'highlight'
+      $.rmClass highlight, 'highlight' if highlight = $ '.highlight'
 
       unless QuoteYou.lastRead
         unless post = QuoteYou.lastRead = $ '.quotesYou'