Skip to content

Commit

Permalink
Merge pull request wbzyl#6 from killion/master
Browse files Browse the repository at this point in the history 
Updated to Font Awesome 3.0.2
  • Loading branch information
Wlodek Bzyl committed Mar 24, 2013
2 parents 54b8512 + 381a6b7 commit deba807
Show file tree
Hide file tree
Showing 8 changed files with 713 additions and 290 deletions.
9 changes: 7 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ With LESS and fonts from [Font Awesome](http://fortawesome.github.com/Font-Aweso

## Updates

March 23, 2013: Now using Font Awesome 3.0.2!

January 2, 2013: Now using Font Awesome 3.0!

June 6 2012: Now using Font Awesome 2.0!

## Installation
Expand All @@ -19,15 +22,17 @@ Add the gem to your *assets* group in the *Gemfile*:
Then in your *app/assets/stylesheets/application.css.less*:

```css
@import 'fontawesome';
@import 'font-awesome';
@import 'font-awesome-ie7';
```

You can also use it with the [less-rails-bootstrap](https://github.com/metaskills/less-rails-bootstrap) gem.
Just import *fontawesome* right after *twitter/bootstrap*:

```css
@import 'twitter/bootstrap';
@import 'fontawesome';
@import 'font-awesome';
@import 'font-awesome-ie7';
```

([simple demo](http://sharp-ocean-6085.herokuapp.com/))
Expand Down
2 changes: 1 addition & 1 deletion lib/less-rails-fontawesome/version.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Font
module Awesome
module Less
module Rails
VERSION = "0.4.0"
VERSION = "0.4.1"
end
end
end
Expand Down
Binary file modified vendor/assets/fonts/fontawesome-webfont.eot
View file
Binary file not shown.
525 changes: 277 additions & 248 deletions vendor/assets/fonts/fontawesome-webfont.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified vendor/assets/fonts/fontawesome-webfont.ttf
View file
Binary file not shown.
Binary file modified vendor/assets/fonts/fontawesome-webfont.woff
View file
Binary file not shown.
350 changes: 350 additions & 0 deletions vendor/assets/stylesheets/font-awesome-ie7.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,350 @@
/*!
* Font Awesome 3.0.2
* the iconic font designed for use with Twitter Bootstrap
* -------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation
* can be found at: http://fortawesome.github.com/Font-Awesome/
*
* License
* -------------------------------------------------------
* - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
* http://opensource.org/licenses/mit-license.html
* - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
* "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
* Contact
* -------------------------------------------------------
* Email: [email protected]
* Twitter: http://twitter.com/fortaweso_me
* Work: Lead Product Designer @ http://kyruus.com
*/

.icon-large {
font-size: 4/3em;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
vertical-align: middle;
}

.nav {
[class^="icon-"],
[class*=" icon-"] {
vertical-align: inherit;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
&.icon-large {
vertical-align: -25%;
}
}
}

.nav-pills, .nav-tabs {
[class^="icon-"],
[class*=" icon-"] {
&.icon-large {
line-height: .75em;
margin-top: -7px;
padding-top: 5px;
margin-bottom: -5px;
padding-bottom: 4px;
}
}
}

.btn {
[class^="icon-"],
[class*=" icon-"] {
&.pull-left, &.pull-right { vertical-align: inherit; }
&.icon-large {
margin-top: -.5em;
}
}
}

a [class^="icon-"],
a [class*=" icon-"] {
cursor: pointer;
}

ul.icons {
text-indent: -1.5em;
margin-left: 3em;
}


.ie7icon(@inner) {
*zoom: ~"expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '@{inner}')";
}

.icon-glass { .ie7icon(''); }
.icon-music { .ie7icon(''); }
.icon-search { .ie7icon(''); }
.icon-envelope { .ie7icon(''); }
.icon-heart { .ie7icon(''); }
.icon-star { .ie7icon(''); }
.icon-star-empty { .ie7icon(''); }
.icon-user { .ie7icon(''); }
.icon-film { .ie7icon(''); }
.icon-th-large { .ie7icon(''); }
.icon-th { .ie7icon(''); }
.icon-th-list { .ie7icon(''); }
.icon-ok { .ie7icon(''); }
.icon-remove { .ie7icon(''); }
.icon-zoom-in { .ie7icon(''); }

.icon-zoom-out { .ie7icon(''); }
.icon-off { .ie7icon(''); }
.icon-signal { .ie7icon(''); }
.icon-cog { .ie7icon(''); }
.icon-trash { .ie7icon(''); }
.icon-home { .ie7icon(''); }
.icon-file { .ie7icon(''); }
.icon-time { .ie7icon(''); }
.icon-road { .ie7icon(''); }
.icon-download-alt { .ie7icon(''); }
.icon-download { .ie7icon(''); }
.icon-upload { .ie7icon(''); }
.icon-inbox { .ie7icon(''); }
.icon-play-circle { .ie7icon(''); }
.icon-repeat { .ie7icon(''); }

.icon-refresh { .ie7icon(''); }
.icon-list-alt { .ie7icon(''); }
.icon-lock { .ie7icon(''); }
.icon-flag { .ie7icon(''); }
.icon-headphones { .ie7icon(''); }
.icon-volume-off { .ie7icon(''); }
.icon-volume-down { .ie7icon(''); }
.icon-volume-up { .ie7icon(''); }
.icon-qrcode { .ie7icon(''); }
.icon-barcode { .ie7icon(''); }
.icon-tag { .ie7icon(''); }
.icon-tags { .ie7icon(''); }
.icon-book { .ie7icon(''); }
.icon-bookmark { .ie7icon(''); }
.icon-print { .ie7icon(''); }

.icon-camera { .ie7icon(''); }
.icon-font { .ie7icon(''); }
.icon-bold { .ie7icon(''); }
.icon-italic { .ie7icon(''); }
.icon-text-height { .ie7icon(''); }
.icon-text-width { .ie7icon(''); }
.icon-align-left { .ie7icon(''); }
.icon-align-center { .ie7icon(''); }
.icon-align-right { .ie7icon(''); }
.icon-align-justify { .ie7icon(''); }
.icon-list { .ie7icon(''); }
.icon-indent-left { .ie7icon(''); }
.icon-indent-right { .ie7icon(''); }
.icon-facetime-video { .ie7icon(''); }
.icon-picture { .ie7icon(''); }

.icon-pencil { .ie7icon(''); }
.icon-map-marker { .ie7icon(''); }
.icon-adjust { .ie7icon(''); }
.icon-tint { .ie7icon(''); }
.icon-edit { .ie7icon(''); }
.icon-share { .ie7icon(''); }
.icon-check { .ie7icon(''); }
.icon-move { .ie7icon(''); }
.icon-step-backward { .ie7icon(''); }
.icon-fast-backward { .ie7icon(''); }
.icon-backward { .ie7icon(''); }
.icon-play { .ie7icon(''); }
.icon-pause { .ie7icon(''); }
.icon-stop { .ie7icon(''); }
.icon-forward { .ie7icon(''); }

.icon-fast-forward { .ie7icon(''); }
.icon-step-forward { .ie7icon(''); }
.icon-eject { .ie7icon(''); }
.icon-chevron-left { .ie7icon(''); }
.icon-chevron-right { .ie7icon(''); }
.icon-plus-sign { .ie7icon(''); }
.icon-minus-sign { .ie7icon(''); }
.icon-remove-sign { .ie7icon(''); }
.icon-ok-sign { .ie7icon(''); }
.icon-question-sign { .ie7icon(''); }
.icon-info-sign { .ie7icon(''); }
.icon-screenshot { .ie7icon(''); }
.icon-remove-circle { .ie7icon(''); }
.icon-ok-circle { .ie7icon(''); }
.icon-ban-circle { .ie7icon(''); }

.icon-arrow-left { .ie7icon(''); }
.icon-arrow-right { .ie7icon(''); }
.icon-arrow-up { .ie7icon(''); }
.icon-arrow-down { .ie7icon(''); }
.icon-share-alt { .ie7icon(''); }
.icon-resize-full { .ie7icon(''); }
.icon-resize-small { .ie7icon(''); }
.icon-plus { .ie7icon(''); }
.icon-minus { .ie7icon(''); }
.icon-asterisk { .ie7icon(''); }
.icon-exclamation-sign { .ie7icon(''); }
.icon-gift { .ie7icon(''); }
.icon-leaf { .ie7icon(''); }
.icon-fire { .ie7icon(''); }
.icon-eye-open { .ie7icon(''); }

.icon-eye-close { .ie7icon(''); }
.icon-warning-sign { .ie7icon(''); }
.icon-plane { .ie7icon(''); }
.icon-calendar { .ie7icon(''); }
.icon-random { .ie7icon(''); }
.icon-comment { .ie7icon(''); }
.icon-magnet { .ie7icon(''); }
.icon-chevron-up { .ie7icon(''); }
.icon-chevron-down { .ie7icon(''); }
.icon-retweet { .ie7icon(''); }
.icon-shopping-cart { .ie7icon(''); }
.icon-folder-close { .ie7icon(''); }
.icon-folder-open { .ie7icon(''); }
.icon-resize-vertical { .ie7icon(''); }
.icon-resize-horizontal { .ie7icon(''); }

.icon-bar-chart { .ie7icon(''); }
.icon-twitter-sign { .ie7icon(''); }
.icon-facebook-sign { .ie7icon(''); }
.icon-camera-retro { .ie7icon(''); }
.icon-key { .ie7icon(''); }
.icon-cogs { .ie7icon(''); }
.icon-comments { .ie7icon(''); }
.icon-thumbs-up { .ie7icon(''); }
.icon-thumbs-down { .ie7icon(''); }
.icon-star-half { .ie7icon(''); }
.icon-heart-empty { .ie7icon(''); }
.icon-signout { .ie7icon(''); }
.icon-linkedin-sign { .ie7icon(''); }
.icon-pushpin { .ie7icon(''); }
.icon-external-link { .ie7icon(''); }

.icon-signin { .ie7icon(''); }
.icon-trophy { .ie7icon(''); }
.icon-github-sign { .ie7icon(''); }
.icon-upload-alt { .ie7icon(''); }
.icon-lemon { .ie7icon(''); }
.icon-phone { .ie7icon(''); }
.icon-check-empty { .ie7icon(''); }
.icon-bookmark-empty { .ie7icon(''); }
.icon-phone-sign { .ie7icon(''); }
.icon-twitter { .ie7icon(''); }
.icon-facebook { .ie7icon(''); }
.icon-github { .ie7icon(''); }
.icon-unlock { .ie7icon(''); }
.icon-credit-card { .ie7icon(''); }
.icon-rss { .ie7icon(''); }

.icon-hdd { .ie7icon(''); }
.icon-bullhorn { .ie7icon(''); }
.icon-bell { .ie7icon(''); }
.icon-certificate { .ie7icon(''); }
.icon-hand-right { .ie7icon(''); }
.icon-hand-left { .ie7icon(''); }
.icon-hand-up { .ie7icon(''); }
.icon-hand-down { .ie7icon(''); }
.icon-circle-arrow-left { .ie7icon(''); }
.icon-circle-arrow-right { .ie7icon(''); }
.icon-circle-arrow-up { .ie7icon(''); }
.icon-circle-arrow-down { .ie7icon(''); }
.icon-globe { .ie7icon(''); }
.icon-wrench { .ie7icon(''); }
.icon-tasks { .ie7icon(''); }

.icon-filter { .ie7icon(''); }
.icon-briefcase { .ie7icon(''); }
.icon-fullscreen { .ie7icon(''); }

.icon-group { .ie7icon(''); }
.icon-link { .ie7icon(''); }
.icon-cloud { .ie7icon(''); }
.icon-beaker { .ie7icon(''); }
.icon-cut { .ie7icon(''); }
.icon-copy { .ie7icon(''); }
.icon-paper-clip { .ie7icon(''); }
.icon-save { .ie7icon(''); }
.icon-sign-blank { .ie7icon(''); }
.icon-reorder { .ie7icon(''); }
.icon-list-ul { .ie7icon(''); }
.icon-list-ol { .ie7icon(''); }
.icon-strikethrough { .ie7icon(''); }
.icon-underline { .ie7icon(''); }
.icon-table { .ie7icon(''); }

.icon-magic { .ie7icon(''); }
.icon-truck { .ie7icon(''); }
.icon-pinterest { .ie7icon(''); }
.icon-pinterest-sign { .ie7icon(''); }
.icon-google-plus-sign { .ie7icon(''); }
.icon-google-plus { .ie7icon(''); }
.icon-money { .ie7icon(''); }
.icon-caret-down { .ie7icon(''); }
.icon-caret-up { .ie7icon(''); }
.icon-caret-left { .ie7icon(''); }
.icon-caret-right { .ie7icon(''); }
.icon-columns { .ie7icon(''); }
.icon-sort { .ie7icon(''); }
.icon-sort-down { .ie7icon(''); }
.icon-sort-up { .ie7icon(''); }

.icon-envelope-alt { .ie7icon(''); }
.icon-linkedin { .ie7icon(''); }
.icon-undo { .ie7icon(''); }
.icon-legal { .ie7icon(''); }
.icon-dashboard { .ie7icon(''); }
.icon-comment-alt { .ie7icon(''); }
.icon-comments-alt { .ie7icon(''); }
.icon-bolt { .ie7icon(''); }
.icon-sitemap { .ie7icon(''); }
.icon-umbrella { .ie7icon(''); }
.icon-paste { .ie7icon(''); }
.icon-lightbulb { .ie7icon(''); }
.icon-exchange { .ie7icon(''); }
.icon-cloud-download { .ie7icon(''); }
.icon-cloud-upload { .ie7icon(''); }

.icon-user-md { .ie7icon(''); }
.icon-stethoscope { .ie7icon(''); }
.icon-suitcase { .ie7icon(''); }
.icon-bell-alt { .ie7icon(''); }
.icon-coffee { .ie7icon(''); }
.icon-food { .ie7icon(''); }
.icon-file-alt { .ie7icon(''); }
.icon-building { .ie7icon(''); }
.icon-hospital { .ie7icon(''); }
.icon-ambulance { .ie7icon(''); }
.icon-medkit { .ie7icon(''); }
.icon-fighter-jet { .ie7icon(''); }
.icon-beer { .ie7icon(''); }
.icon-h-sign { .ie7icon(''); }
.icon-plus-sign-alt { .ie7icon(''); }

.icon-double-angle-left { .ie7icon(''); }
.icon-double-angle-right { .ie7icon(''); }
.icon-double-angle-up { .ie7icon(''); }
.icon-double-angle-down { .ie7icon(''); }
.icon-angle-left { .ie7icon(''); }
.icon-angle-right { .ie7icon(''); }
.icon-angle-up { .ie7icon(''); }
.icon-angle-down { .ie7icon(''); }
.icon-desktop { .ie7icon(''); }
.icon-laptop { .ie7icon(''); }
.icon-tablet { .ie7icon(''); }
.icon-mobile-phone { .ie7icon(''); }
.icon-circle-blank { .ie7icon(''); }
.icon-quote-left { .ie7icon(''); }
.icon-quote-right { .ie7icon(''); }

.icon-spinner { .ie7icon(''); }
.icon-circle { .ie7icon(''); }
.icon-reply { .ie7icon(''); }
.icon-github-alt { .ie7icon(''); }
.icon-folder-close-alt { .ie7icon(''); }
.icon-folder-open-alt { .ie7icon(''); }
Loading

0 comments on commit deba807

Please sign in to comment.