From 4ff5fd287a4950c4cf4e4774c19bc7831881ddb8 Mon Sep 17 00:00:00 2001
From: Mayhem <stepien.nicolas@gmail.com>
Date: Wed, 23 Oct 2013 21:13:10 +0200
Subject: [PATCH] Update FontAwesome.

---
 css/style.css                       | 6 +++---
 html/Monitoring/ThreadWatcher.html  | 2 +-
 package.json                        | 2 +-
 src/General/Header.coffee           | 2 +-
 src/General/Main.coffee             | 2 +-
 src/Images/ImageExpand.coffee       | 6 +++---
 src/Monitoring/ThreadWatcher.coffee | 4 ++--
 src/Posting/QR.coffee               | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/css/style.css b/css/style.css
index dbba61fa3..a67c82043 100644
--- a/css/style.css
+++ b/css/style.css
@@ -842,7 +842,7 @@ a.hide-announcement {
 .menu-button {
   position: relative;
 }
-.menu-button i:not(.icon-reorder) {
+.menu-button i:not(.fa-reorder) {
   border-top:   6px solid;
   border-right: 4px solid transparent;
   border-left:  4px solid transparent;
@@ -851,10 +851,10 @@ a.hide-announcement {
   vertical-align: middle;
 }
 @media screen and (resolution: 1dppx) {
-  .icon-reorder {
+  .fa-reorder {
     font-size: 14px;
   }
-  #shortcuts .icon-reorder {
+  #shortcuts .fa-reorder {
     vertical-align: -1px;
   }
 }
diff --git a/html/Monitoring/ThreadWatcher.html b/html/Monitoring/ThreadWatcher.html
index c0b5810b2..3d5b180b0 100644
--- a/html/Monitoring/ThreadWatcher.html
+++ b/html/Monitoring/ThreadWatcher.html
@@ -1,5 +1,5 @@
 <div>
   <span class="move">Thread Watcher <span id="watcher-status"></span></span>
-  <a class="menu-button" href="javascript:;"><i class="icon-reorder"></i></a>
+  <a class="menu-button" href="javascript:;"><i class="fa fa-reorder"></i></a>
 </div>
 <div id="watched-threads"></div>
diff --git a/package.json b/package.json
index d125f0509..a52639338 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     ]
   },
   "devDependencies": {
-    "font-awesome": "git://github.com/MayhemYDG/Font-Awesome.git#df4285951124f9ca1f3907438462e5ba9e464bcb",
+    "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.0.0.tar.gz",
     "grunt": "~0.4.1",
     "grunt-bump": "~0.0.11",
     "grunt-concurrent": "~0.4.0",
diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 5515c70e6..e16001638 100644
--- a/src/General/Header.coffee
+++ b/src/General/Header.coffee
@@ -12,7 +12,7 @@ Header =
     @menu = new UI.Menu 'header'
     menuButton = $.el 'a',
       className: 'menu-button'
-      innerHTML: '<i class=icon-reorder></i>'
+      innerHTML: '<i class="fa fa-reorder"></i>'
       href: 'javascript:;'
     $.on menuButton, 'click', @menuToggle
     @addShortcut menuButton, 0
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 2d7d1c3e6..b86b5c7c5 100644
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -311,7 +311,7 @@ Main =
   css: """
   @font-face {
     font-family: 'FontAwesome';
-    src: url('data:application/font-woff;base64,<%= grunt.file.read('node_modules/font-awesome/font/fontawesome-webfont.woff', {encoding: 'base64'}) %>') format('woff');
+    src: url('data:application/font-woff;base64,<%= grunt.file.read('node_modules/font-awesome/fonts/fontawesome-webfont.woff', {encoding: 'base64'}) %>') format('woff');
     font-weight: normal;
     font-style: normal;
   }
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index b8e8e7b15..17b8066d3 100644
--- a/src/Images/ImageExpand.coffee
+++ b/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-resize-full'
+      className: 'expand-all-shortcut fa fa-resize-full'
       title: 'Expand All Images'
       href: 'javascript:;'
     $.on @EAI, 'click', ImageExpand.cb.toggleAll
@@ -32,11 +32,11 @@ ImageExpand =
     toggleAll: ->
       $.event 'CloseMenu'
       if ImageExpand.on = $.hasClass ImageExpand.EAI, 'expand-all-shortcut'
-        ImageExpand.EAI.className = 'contract-all-shortcut icon-resize-small'
+        ImageExpand.EAI.className = 'contract-all-shortcut fa fa-resize-small'
         ImageExpand.EAI.title     = 'Contract All Images'
         func = ImageExpand.expand
       else
-        ImageExpand.EAI.className = 'expand-all-shortcut icon-resize-full'
+        ImageExpand.EAI.className = 'expand-all-shortcut fa fa-resize-full'
         ImageExpand.EAI.title     = 'Expand All Images'
         func = ImageExpand.contract
       for ID, post of g.posts
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index a682d8df0..54bfb9435 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -149,10 +149,10 @@ ThreadWatcher =
     for threadID, thread of g.BOARD.threads
       $.extend $('.watcher-toggler', thread.OP.nodes.post),
         if ThreadWatcher.db.get {boardID: thread.board.ID, threadID}
-          className: 'watcher-toggler icon-bookmark'
+          className: 'watcher-toggler fa fa-bookmark'
           title:     'Unwatch thread'
         else
-          className: 'watcher-toggler icon-bookmark-empty'
+          className: 'watcher-toggler fa fa-bookmark-o'
           title:     'Watch thread'
 
     for refresher in ThreadWatcher.menu.refreshers
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 751ac6a53..d0be4c445 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -19,7 +19,7 @@ QR =
     return unless QR.postingIsEnabled
 
     sc = $.el 'a',
-      className: 'qr-shortcut icon-comment-alt'
+      className: 'qr-shortcut fa fa-comment-o'
       title: 'Quick Reply'
       href: 'javascript:;'
     $.on sc, 'click', ->