Release 4chan X v1.2.34.

CHANGELOG.md

@@ -1,3 +1,9 @@
+### v1.2.34 
+*2013-08-19*
+
+**seaweedchan**:
+- `.icon` to `.fourchanx-icon` to avoid conflicts with 4chan's CSS
+
 ### v1.2.33 
 *2013-08-18*
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.33 - 2013-08-18
+* 4chan X - Version 1.2.34 - 2013-08-19
 *
 * Licensed under the MIT license.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/4chan-X.meta.js

@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.2.33
+// @version      1.2.34
 // @minGMVer     1.13
 // @minFFVer     22
 // @namespace    4chan-X

builds/crx/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan X",
-  "version": "1.2.33",
+  "version": "1.2.34",
   "manifest_version": 2,
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "icons": {

latest.js

@@ -1 +1 @@
-postMessage({version:'1.2.33'},'*')
+postMessage({version:'1.2.34'},'*')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan-X",
-  "version": "1.2.33",
+  "version": "1.2.34",
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",

src/General/Settings.coffee

@@ -2,7 +2,7 @@ Settings =
   init: ->
     # 4chan X settings link
     link = $.el 'a',
-      className:   'settings-link icon icon-wrench'
+      className:   'settings-link fourchanx-icon icon-wrench'
       textContent: 'Settings'
       href:        'javascript:;'
     $.on link, 'click', Settings.open

src/General/css/font-awesome.css

@@ -29,7 +29,7 @@
   font-weight: normal;
   font-style: normal;
 }
-.icon::before {
+.fourchanx-icon::before {
   font-family: FontAwesome;
   font-weight: normal;
   font-style: normal;
@@ -40,18 +40,18 @@
   display: none;
   speak: none;
 }
-:root.shortcut-icons .icon::before {
+:root.shortcut-icons .fourchanx-icon::before {
   display: inline-block;
   font-size: 13px; 
   visibility: visible;
 }
-:root.shortcut-icons #shortcuts .icon::before {
+:root.shortcut-icons #shortcuts .fourchanx-icon::before {
   font-size: 15px !important;
   margin-top: -3px !important;
   position: relative;
   top: 1px;
 }
-:root.shortcut-icons .icon {
+:root.shortcut-icons .fourchanx-icon {
   font-size: 0;
   visibility: hidden;
 }
@@ -60,7 +60,7 @@
   display: none;
 }
 /* makes sure icons active on rollover in links */
-a .icon {
+:root.shortcut-icons a .fourchanx-icon {
   display: inline;
 }
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen

src/Images/ImageExpand.coffee

@@ -3,7 +3,7 @@ ImageExpand =
     return if g.VIEW is 'catalog' or !Conf['Image Expansion']
 
     @EAI = $.el 'a',
-      className: 'expand-all-shortcut icon icon-resize-full'
+      className: 'expand-all-shortcut fourchanx-icon icon-resize-full'
       textContent: 'EAI' 
       title: 'Expand All Images'
       href: 'javascript:;'
@@ -33,11 +33,11 @@ ImageExpand =
     toggleAll: ->
       $.event 'CloseMenu'
       if ImageExpand.on = $.hasClass ImageExpand.EAI, 'expand-all-shortcut'
-        ImageExpand.EAI.className = 'contract-all-shortcut icon icon-resize-small'
+        ImageExpand.EAI.className = 'contract-all-shortcut fourchanx-icon icon-resize-small'
         ImageExpand.EAI.title     = 'Contract All Images'
         func = ImageExpand.expand
       else
-        ImageExpand.EAI.className = 'expand-all-shortcut icon icon-resize-full'
+        ImageExpand.EAI.className = 'expand-all-shortcut fourchanx-icon icon-resize-full'
         ImageExpand.EAI.title     = 'Expand All Images'
         func = ImageExpand.contract
       for ID, post of g.posts

src/Monitoring/ThreadWatcher.coffee

@@ -6,7 +6,7 @@ ThreadWatcher =
       id:   'watcher-link'
       textContent: 'Watcher'
       href: 'javascript:;'
-      className: 'disabled icon icon-eye-open'
+      className: 'disabled fourchanx-icon icon-eye-open'
 
     @db     = new DataBoard 'watchedThreads', @refresh, true
     @dialog = UI.dialog 'thread-watcher', 'top: 50px; left: 0px;', """

src/Posting/QuickReply.coffee

@@ -6,7 +6,7 @@ QR =
 
     if Conf['QR Shortcut']
       sc = $.el 'a',
-        className: "qr-shortcut icon icon-comment #{unless Conf['Persistent QR'] then 'disabled' else ''}"
+        className: "qr-shortcut fourchanx-icon icon-comment #{unless Conf['Persistent QR'] then 'disabled' else ''}"
         textContent: 'QR' 
         title: 'Quick Reply'
         href: 'javascript:;'