Skip to content
This repository was archived by the owner on Aug 26, 2022. It is now read-only.

Commit b12265a

Browse files
committed
Merge pull request #1171 from darkwing/upgrade-font-awesome
Upgrade Font Awesome to 3.2.0
2 parents 1cb3800 + 1247386 commit b12265a

26 files changed

Lines changed: 7837 additions & 843 deletions

media/font-awesome/css/font-awesome-ie7.css

Lines changed: 242 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
/*!
2-
* Font Awesome 3.1.0
2+
* Font Awesome 3.2.0
33
* the iconic font designed for Bootstrap
4-
* -------------------------------------------------------
5-
* The full suite of pictographic icons, examples, and documentation
6-
* can be found at: http://fontawesome.io
4+
* ------------------------------------------------------------------------------
5+
* The full suite of pictographic icons, examples, and documentation can be
6+
* found at http://fontawesome.io. Stay up to date on Twitter at
7+
* http://twitter.com/fontawesome.
78
*
89
* License
9-
* -------------------------------------------------------
10-
* - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
10+
* ------------------------------------------------------------------------------
11+
* - The Font Awesome font is licensed under SIL OFL 1.1 -
1112
* http://scripts.sil.org/OFL
12-
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
13+
* - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
1314
* http://opensource.org/licenses/mit-license.html
14-
* - Font Awesome documentation licensed under CC BY 3.0 License -
15+
* - Font Awesome documentation licensed under CC BY 3.0 -
1516
* http://creativecommons.org/licenses/by/3.0/
1617
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
1718
* "Font Awesome by Dave Gandy - http://fontawesome.io"
18-
19-
* Contact
20-
* -------------------------------------------------------
19+
*
20+
* Author - Dave Gandy
21+
* ------------------------------------------------------------------------------
2122
* Email: dave@fontawesome.io
22-
* Twitter: http://twitter.com/fortaweso_me
23-
* Work: Lead Product Designer @ http://kyruus.com
23+
* Twitter: http://twitter.com/byscuits
24+
* Work: Lead Product Designer @ Kyruus - http://kyruus.com
2425
*/
2526
.icon-large {
2627
font-size: 1.3333333333333333em;
@@ -52,14 +53,6 @@
5253
margin-bottom: -5px;
5354
padding-bottom: 4px;
5455
}
55-
ul.icons-ul {
56-
text-indent: -1em;
57-
margin-left: 2.142857142857143em;
58-
}
59-
ul.icons-ul > li .icon-li {
60-
width: 1em;
61-
margin-right: 0;
62-
}
6356
.btn [class^="icon-"].pull-left,
6457
.btn [class*=" icon-"].pull-left,
6558
.btn [class^="icon-"].pull-right,
@@ -83,7 +76,7 @@ a [class*=" icon-"] {
8376
.icon-search {
8477
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
8578
}
86-
.icon-envelope {
79+
.icon-envelope-alt {
8780
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
8881
}
8982
.icon-heart {
@@ -125,6 +118,9 @@ a [class*=" icon-"] {
125118
.icon-off {
126119
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
127120
}
121+
.icon-power-off {
122+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
123+
}
128124
.icon-signal {
129125
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
130126
}
@@ -137,7 +133,7 @@ a [class*=" icon-"] {
137133
.icon-home {
138134
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
139135
}
140-
.icon-file {
136+
.icon-file-alt {
141137
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
142138
}
143139
.icon-time {
@@ -164,6 +160,9 @@ a [class*=" icon-"] {
164160
.icon-repeat {
165161
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
166162
}
163+
.icon-rotate-right {
164+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
165+
}
167166
.icon-refresh {
168167
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
169168
}
@@ -359,6 +358,9 @@ a [class*=" icon-"] {
359358
.icon-share-alt {
360359
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
361360
}
361+
.icon-mail-forward {
362+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
363+
}
362364
.icon-resize-full {
363365
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
364366
}
@@ -455,10 +457,10 @@ a [class*=" icon-"] {
455457
.icon-comments {
456458
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
457459
}
458-
.icon-thumbs-up {
460+
.icon-thumbs-up-alt {
459461
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
460462
}
461-
.icon-thumbs-down {
463+
.icon-thumbs-down-alt {
462464
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
463465
}
464466
.icon-star-half {
@@ -500,6 +502,9 @@ a [class*=" icon-"] {
500502
.icon-check-empty {
501503
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
502504
}
505+
.icon-unchecked {
506+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
507+
}
503508
.icon-bookmark-empty {
504509
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
505510
}
@@ -599,6 +604,9 @@ a [class*=" icon-"] {
599604
.icon-paper-clip {
600605
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
601606
}
607+
.icon-paperclip {
608+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
609+
}
602610
.icon-save {
603611
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
604612
}
@@ -668,7 +676,7 @@ a [class*=" icon-"] {
668676
.icon-sort-up {
669677
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
670678
}
671-
.icon-envelope-alt {
679+
.icon-envelope {
672680
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
673681
}
674682
.icon-linkedin {
@@ -677,6 +685,9 @@ a [class*=" icon-"] {
677685
.icon-undo {
678686
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
679687
}
688+
.icon-rotate-left {
689+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
690+
}
680691
.icon-legal {
681692
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
682693
}
@@ -731,7 +742,7 @@ a [class*=" icon-"] {
731742
.icon-food {
732743
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
733744
}
734-
.icon-file-alt {
745+
.icon-file-text-alt {
735746
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
736747
}
737748
.icon-building {
@@ -812,6 +823,12 @@ a [class*=" icon-"] {
812823
.icon-reply {
813824
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
814825
}
826+
.icon-mail-reply {
827+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
828+
}
829+
.icon-github-alt {
830+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
831+
}
815832
.icon-folder-close-alt {
816833
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
817834
}
@@ -857,10 +874,12 @@ a [class*=" icon-"] {
857874
.icon-mail-reply-all {
858875
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
859876
}
860-
.icon-star-half-full,
861877
.icon-star-half-empty {
862878
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
863879
}
880+
.icon-star-half-full {
881+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
882+
}
864883
.icon-location-arrow {
865884
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
866885
}
@@ -981,3 +1000,198 @@ a [class*=" icon-"] {
9811000
.icon-share-sign {
9821001
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
9831002
}
1003+
.icon-compass {
1004+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1005+
}
1006+
.icon-collapse {
1007+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1008+
}
1009+
.icon-collapse-top {
1010+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1011+
}
1012+
.icon-expand {
1013+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1014+
}
1015+
.icon-eur {
1016+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1017+
}
1018+
.icon-euro {
1019+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1020+
}
1021+
.icon-gbp {
1022+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1023+
}
1024+
.icon-usd {
1025+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1026+
}
1027+
.icon-dollar {
1028+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1029+
}
1030+
.icon-inr {
1031+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1032+
}
1033+
.icon-rupee {
1034+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1035+
}
1036+
.icon-jpy {
1037+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1038+
}
1039+
.icon-yen {
1040+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1041+
}
1042+
.icon-cny {
1043+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1044+
}
1045+
.icon-renminbi {
1046+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1047+
}
1048+
.icon-krw {
1049+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1050+
}
1051+
.icon-won {
1052+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1053+
}
1054+
.icon-btc {
1055+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1056+
}
1057+
.icon-bitcoin {
1058+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1059+
}
1060+
.icon-file {
1061+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1062+
}
1063+
.icon-file-text {
1064+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1065+
}
1066+
.icon-sort-by-alphabet {
1067+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1068+
}
1069+
.icon-sort-by-alphabet-alt {
1070+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1071+
}
1072+
.icon-sort-by-attributes {
1073+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1074+
}
1075+
.icon-sort-by-attributes-alt {
1076+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1077+
}
1078+
.icon-sort-by-order {
1079+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1080+
}
1081+
.icon-sort-by-order-alt {
1082+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1083+
}
1084+
.icon-thumbs-up {
1085+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1086+
}
1087+
.icon-thumbs-down {
1088+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1089+
}
1090+
.icon-youtube-sign {
1091+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1092+
}
1093+
.icon-youtube {
1094+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1095+
}
1096+
.icon-xing {
1097+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1098+
}
1099+
.icon-xing-sign {
1100+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1101+
}
1102+
.icon-youtube-play {
1103+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1104+
}
1105+
.icon-dropbox {
1106+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1107+
}
1108+
.icon-stackexchange {
1109+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1110+
}
1111+
.icon-instagram {
1112+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1113+
}
1114+
.icon-flickr {
1115+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1116+
}
1117+
.icon-adn {
1118+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1119+
}
1120+
.icon-bitbucket {
1121+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1122+
}
1123+
.icon-bitbucket-sign {
1124+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1125+
}
1126+
.icon-tumblr {
1127+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1128+
}
1129+
.icon-tumblr-sign {
1130+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1131+
}
1132+
.icon-long-arrow-down {
1133+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1134+
}
1135+
.icon-long-arrow-up {
1136+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1137+
}
1138+
.icon-long-arrow-left {
1139+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1140+
}
1141+
.icon-long-arrow-right {
1142+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1143+
}
1144+
.icon-apple {
1145+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1146+
}
1147+
.icon-windows {
1148+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1149+
}
1150+
.icon-android {
1151+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1152+
}
1153+
.icon-linux {
1154+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1155+
}
1156+
.icon-dribble {
1157+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1158+
}
1159+
.icon-skype {
1160+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1161+
}
1162+
.icon-foursquare {
1163+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1164+
}
1165+
.icon-trello {
1166+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1167+
}
1168+
.icon-female {
1169+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1170+
}
1171+
.icon-male {
1172+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1173+
}
1174+
.icon-gittip {
1175+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1176+
}
1177+
.icon-sun {
1178+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1179+
}
1180+
.icon-moon {
1181+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1182+
}
1183+
.icon-archive {
1184+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1185+
}
1186+
.icon-bug {
1187+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1188+
}
1189+
.icon-vk {
1190+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1191+
}
1192+
.icon-weibo {
1193+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1194+
}
1195+
.icon-renren {
1196+
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
1197+
}

0 commit comments

Comments
 (0)