Skip to content

Commit d4fd57d

Browse files
taglialatagliala
committed
* Font Awesome 4.2.0
1 parent d82a574 commit d4fd57d

File tree

16 files changed

+628
-507
lines changed

16 files changed

+628
-507
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## 2.12.0
44

5+
* Font Awesome 4.2.0
56
* Automatically requires `less-rails` and `therubyracer`
67
* Updated Rails dependency
78
* Using Appraisal to run tests
@@ -27,7 +28,7 @@
2728
## 2.11.0
2829

2930
* bootstrap 3.2.0
30-
* Fontawesome 4.1.0
31+
* Font Awesome 4.1.0
3132
* Updated Rails dependencies
3233

3334
## 2.10.3
@@ -135,5 +136,5 @@
135136
## 1.0.0
136137

137138
* Bootstrap 3.0.0 @ [32468b087b](https://github.com/twbs/bootstrap/tree/32468b087b615d1ed710f9118ff4f669cc5ad5e8)
138-
* Fontawesome 3.2.1 @ [906345058f](https://github.com/FortAwesome/Font-Awesome/tree/906345058f738c2b931f89754a319ed108e17bd8)
139+
* Font Awesome 3.2.1 @ [906345058f](https://github.com/FortAwesome/Font-Awesome/tree/906345058f738c2b931f89754a319ed108e17bd8)
139140
* Respond.js 1.3.0 @ [ad87635f83](https://github.com/scottjehl/Respond/tree/ad87635f83f8b811e1da53c082325a4b35960771)

‎Rakefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ end
124124
def update_fontawesome_paths
125125
file_name = "#{DESTINATION_FOLDERS[:fontawesome_stylesheets]}/path.less"
126126
text = File.read(file_name)
127-
text.gsub! /~?"?url\(\'@{fa-font-path}\/([\w\-.#]+)[^\)]*\)(.*)"/, "asset-url('\\1')\\2"
127+
text.gsub! /url\(\'\@{fa-font-path}\/([\w\-.#]+)[^\)]*\)/, "font-url('\\1')"
128128
text.gsub! "fontawesome-webfont.eot') format('embedded-opentype')", "fontawesome-webfont.eot?\#iefix') format('embedded-opentype')"
129-
text.gsub! "asset-url('fontawesome-webfont.svg') format('svg');", "asset-url('fontawesome-webfont.svg#fontawesomeregular') format('svg');"
130-
text.gsub! "// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts", ''
129+
text.gsub! "font-url('fontawesome-webfont.svg') format('svg');", "font-url('fontawesome-webfont.svg#fontawesomeregular') format('svg');"
130+
text.gsub! "// src: font-url('FontAwesome.otf') format('opentype'); // used when developing fonts", ''
131131
File.open(file_name, 'w') { |file| file.puts text }
132132
end
133133

‎app/assets/fonts/fontawesome-webfont.eot

100755100644
-16.1 KB
Binary file not shown.

‎app/assets/fonts/fontawesome-webfont.svg

100755100644
Lines changed: 479 additions & 463 deletions
Loading

‎app/assets/fonts/fontawesome-webfont.ttf

100755100644
-28.7 KB
Binary file not shown.

‎app/assets/fonts/fontawesome-webfont.woff

100755100644
-17.9 KB
Binary file not shown.

‎src/FortAwesome/Font-Awesome

Submodule Font-Awesome updated 268 files

‎vendor/assets/stylesheets/fontawesome/core.less

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
.@{fa-css-prefix} {
55
display: inline-block;
6-
font-family: FontAwesome;
7-
font-style: normal;
8-
font-weight: normal;
9-
line-height: 1;
6+
font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
7+
font-size: inherit; // can't have font-size inherit on line above, so need to override
8+
text-rendering: auto; // optimizelegibility throws things off #1094
109
-webkit-font-smoothing: antialiased;
1110
-moz-osx-font-smoothing: grayscale;
1211
}

‎vendor/assets/stylesheets/fontawesome/font-awesome.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Font Awesome 4.1.0 by @davegandy - http://fontawesome.io - @fontawesome
2+
* Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
33
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
44
*/
55

‎vendor/assets/stylesheets/fontawesome/icons.less

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
.@{fa-css-prefix}-th:before { content: @fa-var-th; }
1515
.@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; }
1616
.@{fa-css-prefix}-check:before { content: @fa-var-check; }
17+
.@{fa-css-prefix}-remove:before,
18+
.@{fa-css-prefix}-close:before,
1719
.@{fa-css-prefix}-times:before { content: @fa-var-times; }
1820
.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; }
1921
.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; }
@@ -129,7 +131,8 @@
129131
.@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; }
130132
.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; }
131133
.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; }
132-
.@{fa-css-prefix}-bar-chart-o:before { content: @fa-var-bar-chart-o; }
134+
.@{fa-css-prefix}-bar-chart-o:before,
135+
.@{fa-css-prefix}-bar-chart:before { content: @fa-var-bar-chart; }
133136
.@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; }
134137
.@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; }
135138
.@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; }
@@ -432,7 +435,6 @@
432435
.@{fa-css-prefix}-stumbleupon:before { content: @fa-var-stumbleupon; }
433436
.@{fa-css-prefix}-delicious:before { content: @fa-var-delicious; }
434437
.@{fa-css-prefix}-digg:before { content: @fa-var-digg; }
435-
.@{fa-css-prefix}-pied-piper-square:before,
436438
.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; }
437439
.@{fa-css-prefix}-pied-piper-alt:before { content: @fa-var-pied-piper-alt; }
438440
.@{fa-css-prefix}-drupal:before { content: @fa-var-drupal; }
@@ -477,6 +479,7 @@
477479
.@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; }
478480
.@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; }
479481
.@{fa-css-prefix}-life-bouy:before,
482+
.@{fa-css-prefix}-life-buoy:before,
480483
.@{fa-css-prefix}-life-saver:before,
481484
.@{fa-css-prefix}-support:before,
482485
.@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; }
@@ -504,3 +507,46 @@
504507
.@{fa-css-prefix}-share-alt:before { content: @fa-var-share-alt; }
505508
.@{fa-css-prefix}-share-alt-square:before { content: @fa-var-share-alt-square; }
506509
.@{fa-css-prefix}-bomb:before { content: @fa-var-bomb; }
510+
.@{fa-css-prefix}-soccer-ball-o:before,
511+
.@{fa-css-prefix}-futbol-o:before { content: @fa-var-futbol-o; }
512+
.@{fa-css-prefix}-tty:before { content: @fa-var-tty; }
513+
.@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; }
514+
.@{fa-css-prefix}-plug:before { content: @fa-var-plug; }
515+
.@{fa-css-prefix}-slideshare:before { content: @fa-var-slideshare; }
516+
.@{fa-css-prefix}-twitch:before { content: @fa-var-twitch; }
517+
.@{fa-css-prefix}-yelp:before { content: @fa-var-yelp; }
518+
.@{fa-css-prefix}-newspaper-o:before { content: @fa-var-newspaper-o; }
519+
.@{fa-css-prefix}-wifi:before { content: @fa-var-wifi; }
520+
.@{fa-css-prefix}-calculator:before { content: @fa-var-calculator; }
521+
.@{fa-css-prefix}-paypal:before { content: @fa-var-paypal; }
522+
.@{fa-css-prefix}-google-wallet:before { content: @fa-var-google-wallet; }
523+
.@{fa-css-prefix}-cc-visa:before { content: @fa-var-cc-visa; }
524+
.@{fa-css-prefix}-cc-mastercard:before { content: @fa-var-cc-mastercard; }
525+
.@{fa-css-prefix}-cc-discover:before { content: @fa-var-cc-discover; }
526+
.@{fa-css-prefix}-cc-amex:before { content: @fa-var-cc-amex; }
527+
.@{fa-css-prefix}-cc-paypal:before { content: @fa-var-cc-paypal; }
528+
.@{fa-css-prefix}-cc-stripe:before { content: @fa-var-cc-stripe; }
529+
.@{fa-css-prefix}-bell-slash:before { content: @fa-var-bell-slash; }
530+
.@{fa-css-prefix}-bell-slash-o:before { content: @fa-var-bell-slash-o; }
531+
.@{fa-css-prefix}-trash:before { content: @fa-var-trash; }
532+
.@{fa-css-prefix}-copyright:before { content: @fa-var-copyright; }
533+
.@{fa-css-prefix}-at:before { content: @fa-var-at; }
534+
.@{fa-css-prefix}-eyedropper:before { content: @fa-var-eyedropper; }
535+
.@{fa-css-prefix}-paint-brush:before { content: @fa-var-paint-brush; }
536+
.@{fa-css-prefix}-birthday-cake:before { content: @fa-var-birthday-cake; }
537+
.@{fa-css-prefix}-area-chart:before { content: @fa-var-area-chart; }
538+
.@{fa-css-prefix}-pie-chart:before { content: @fa-var-pie-chart; }
539+
.@{fa-css-prefix}-line-chart:before { content: @fa-var-line-chart; }
540+
.@{fa-css-prefix}-lastfm:before { content: @fa-var-lastfm; }
541+
.@{fa-css-prefix}-lastfm-square:before { content: @fa-var-lastfm-square; }
542+
.@{fa-css-prefix}-toggle-off:before { content: @fa-var-toggle-off; }
543+
.@{fa-css-prefix}-toggle-on:before { content: @fa-var-toggle-on; }
544+
.@{fa-css-prefix}-bicycle:before { content: @fa-var-bicycle; }
545+
.@{fa-css-prefix}-bus:before { content: @fa-var-bus; }
546+
.@{fa-css-prefix}-ioxhost:before { content: @fa-var-ioxhost; }
547+
.@{fa-css-prefix}-angellist:before { content: @fa-var-angellist; }
548+
.@{fa-css-prefix}-cc:before { content: @fa-var-cc; }
549+
.@{fa-css-prefix}-shekel:before,
550+
.@{fa-css-prefix}-sheqel:before,
551+
.@{fa-css-prefix}-ils:before { content: @fa-var-ils; }
552+
.@{fa-css-prefix}-meanpath:before { content: @fa-var-meanpath; }

0 commit comments

Comments
 (0)