diff --git a/css/style.css b/css/style.css index 4bebe551d..7968c10b4 100644 --- a/css/style.css +++ b/css/style.css @@ -851,7 +851,7 @@ a.hide-announcement { .menu-button { position: relative; } -.menu-button i:not(.fa-reorder) { +.menu-button i:not(.fa-bars) { border-top: 6px solid; border-right: 4px solid transparent; border-left: 4px solid transparent; @@ -860,10 +860,10 @@ a.hide-announcement { vertical-align: middle; } @media screen and (resolution: 1dppx) { - .fa-reorder { + .fa-bars { font-size: 14px; } - #shortcuts .fa-reorder { + #shortcuts .fa-bars { vertical-align: -1px; } } diff --git a/html/Monitoring/ThreadWatcher.html b/html/Monitoring/ThreadWatcher.html index 3d5b180b0..38374dd0a 100644 --- a/html/Monitoring/ThreadWatcher.html +++ b/html/Monitoring/ThreadWatcher.html @@ -1,5 +1,5 @@
Thread Watcher - +
diff --git a/package.json b/package.json index 2a9b2dfa0..ffe746202 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ } }, "devDependencies": { - "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.0.0.tar.gz", + "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.0.3.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 10359d471..849e9ba24 100644 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -11,7 +11,7 @@ Header = @menu = new UI.Menu 'header' menuButton = $.el 'a', className: 'menu-button' - innerHTML: '' + innerHTML: '' href: 'javascript:;' $.on menuButton, 'click', @menuToggle @addShortcut menuButton, 0 diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 60382bb73..8d20eb4bb 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 fa fa-resize-full' + className: 'expand-all-shortcut fa fa-expand' 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 fa fa-resize-small' + ImageExpand.EAI.className = 'contract-all-shortcut fa fa-compress' ImageExpand.EAI.title = 'Contract All Images' func = ImageExpand.expand else - ImageExpand.EAI.className = 'expand-all-shortcut fa fa-resize-full' + ImageExpand.EAI.className = 'expand-all-shortcut fa fa-expand' ImageExpand.EAI.title = 'Expand All Images' func = ImageExpand.contract for ID, post of g.posts