Skip to content

Commit

Permalink
Updated to use FontAwesome 4.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jmb committed Feb 22, 2016
1 parent 5c44600 commit 1b1e390
Show file tree
Hide file tree
Showing 9 changed files with 1,592 additions and 729 deletions.
Binary file added templates/project/assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file modified templates/project/assets/fonts/fontawesome-webfont.eot
Binary file not shown.
330 changes: 293 additions & 37 deletions templates/project/assets/fonts/fontawesome-webfont.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified templates/project/assets/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file modified templates/project/assets/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file not shown.
1,981 changes: 1,294 additions & 687 deletions templates/project/assets/stylesheets/font-awesome.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions templates/project/dashboards/sampletv.erb
Expand Up @@ -14,7 +14,7 @@ $(function() {
<ul>
<li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
<div data-view="Clock"></div>
<i class="icon-time icon-background"></i>
<i class="fa fa-clock-o icon-background"></i>
</li>

<li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
Expand All @@ -39,7 +39,7 @@ $(function() {

<li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
<div data-id="karma" data-view="Number" data-title="Karma" style="background-color:#96bf48;"></div>
<i class="icon-heart icon-background"></i>
<i class="fa fa-heart icon-background"></i>
</li>

<li data-row="1" data-col="1" data-sizex="2" data-sizey="2">
Expand All @@ -48,9 +48,9 @@ $(function() {

<li data-row="1" data-col="1" data-sizex="2" data-sizey="1">
<div data-id="twitter_mentions" data-view="Comments" style="background-color:#ff9618;" data-moreinfo="Tweets tagged with #todayilearned"></div>
<i class="icon-twitter icon-background"></i>
<i class="fa fa-twitter icon-background"></i>
</li>

</ul>
<center><div style="font-size: 12px">Try this: curl -d '{ "auth_token": "YOUR_AUTH_TOKEN", "text": "Hey, Look what I can do!" }' \http://<%=request.host%>:<%=request.port%>/widgets/welcome</div></center>
</div>
</div>
2 changes: 1 addition & 1 deletion templates/project/widgets/number/number.coffee
Expand Up @@ -13,7 +13,7 @@ class Dashing.Number extends Dashing.Widget

@accessor 'arrow', ->
if @get('last')
if parseInt(@get('current')) > parseInt(@get('last')) then 'icon-arrow-up' else 'icon-arrow-down'
if parseInt(@get('current')) > parseInt(@get('last')) then 'fa fa-arrow-up' else 'fa fa-arrow-down'

onData: (data) ->
if data.status
Expand Down

0 comments on commit 1b1e390

Please sign in to comment.