Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update FontAwesome.

Browse Source
This commit is contained in:
Mayhem 2013-10-23 21:13:10 +02:00
parent cbd01e9fb9
commit 4ff5fd287a
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/style.css
View File

@ -842,7 +842,7 @@ a.hide-announcement {
.menu-button { .menu-button {
position: relative; position: relative;
} }
.menu-button i:not(.icon-reorder) { .menu-button i:not(.fa-reorder) {
border-top: 6px solid; border-top: 6px solid;
border-right: 4px solid transparent; border-right: 4px solid transparent;
border-left: 4px solid transparent; border-left: 4px solid transparent;
@ -851,10 +851,10 @@ a.hide-announcement {
vertical-align: middle; vertical-align: middle;
} }
@media screen and (resolution: 1dppx) { @media screen and (resolution: 1dppx) {
.icon-reorder { .fa-reorder {
font-size: 14px; font-size: 14px;
} }
#shortcuts .icon-reorder { #shortcuts .fa-reorder {
vertical-align: -1px; vertical-align: -1px;
} }
} }

2
html/Monitoring/ThreadWatcher.html
View File

@ -1,5 +1,5 @@
<div> <div>
<span class="move">Thread Watcher <span id="watcher-status"></span></span> <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>
<div id="watched-threads"></div> <div id="watched-threads"></div>

2
package.json
View File

@ -16,7 +16,7 @@
] ]
}, },
"devDependencies": { "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": "~0.4.1",
"grunt-bump": "~0.0.11", "grunt-bump": "~0.0.11",
"grunt-concurrent": "~0.4.0", "grunt-concurrent": "~0.4.0",

2
src/General/Header.coffee
View File

@ -12,7 +12,7 @@ Header =
@menu = new UI.Menu 'header' @menu = new UI.Menu 'header'
menuButton = $.el 'a', menuButton = $.el 'a',
className: 'menu-button' className: 'menu-button'
innerHTML: '<i class=icon-reorder></i>' innerHTML: '<i class="fa fa-reorder"></i>'
href: 'javascript:;' href: 'javascript:;'
$.on menuButton, 'click', @menuToggle $.on menuButton, 'click', @menuToggle
@addShortcut menuButton, 0 @addShortcut menuButton, 0

2
src/General/Main.coffee
View File

@ -311,7 +311,7 @@ Main =
css: """ css: """
@font-face { @font-face {
font-family: 'FontAwesome'; 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-weight: normal;
font-style: normal; font-style: normal;
} }

6
src/Images/ImageExpand.coffee
View File

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

4
src/Monitoring/ThreadWatcher.coffee
View File

@ -149,10 +149,10 @@ ThreadWatcher =
for threadID, thread of g.BOARD.threads for threadID, thread of g.BOARD.threads
$.extend $('.watcher-toggler', thread.OP.nodes.post), $.extend $('.watcher-toggler', thread.OP.nodes.post),
if ThreadWatcher.db.get {boardID: thread.board.ID, threadID} if ThreadWatcher.db.get {boardID: thread.board.ID, threadID}
className: 'watcher-toggler icon-bookmark' className: 'watcher-toggler fa fa-bookmark'
title: 'Unwatch thread' title: 'Unwatch thread'
else else
className: 'watcher-toggler icon-bookmark-empty' className: 'watcher-toggler fa fa-bookmark-o'
title: 'Watch thread' title: 'Watch thread'
for refresher in ThreadWatcher.menu.refreshers for refresher in ThreadWatcher.menu.refreshers

2
src/Posting/QR.coffee
View File

@ -19,7 +19,7 @@ QR =
return unless QR.postingIsEnabled return unless QR.postingIsEnabled
sc = $.el 'a', sc = $.el 'a',
className: 'qr-shortcut icon-comment-alt' className: 'qr-shortcut fa fa-comment-o'
title: 'Quick Reply' title: 'Quick Reply'
href: 'javascript:;' href: 'javascript:;'
$.on sc, 'click', -> $.on sc, 'click', ->