Skip to content

Commit 37ad100

Browse files
committed
Re work font awesome
1 parent 6b1d334 commit 37ad100

15 files changed

+620
-6862
lines changed

bootstrap/static/bootstrap/css/font-awesome/bootstrap.css

Lines changed: 0 additions & 5243 deletions
This file was deleted.

bootstrap/static/bootstrap/css/font-awesome/bootstrap.min.css

Lines changed: 0 additions & 675 deletions
This file was deleted.

bootstrap/static/bootstrap/css/font-awesome/css/font-awesome-ie7.css

Lines changed: 0 additions & 645 deletions
This file was deleted.
Binary file not shown.

bootstrap/static/bootstrap/css/font-awesome/font/fontawesome-webfont.svg

Lines changed: 0 additions & 255 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.

bootstrap/static/font_awesome/css/font-awesome-ie7.min.css

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bootstrap/static/bootstrap/css/font-awesome/css/font-awesome.css renamed to bootstrap/static/font_awesome/css/font-awesome.css

Lines changed: 281 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,273 @@
1-
/* Font Awesome
2-
the iconic font designed for use with Twitter Bootstrap
3-
-------------------------------------------------------
4-
The full suite of pictographic icons, examples, and documentation
5-
can be found at: http://fortawesome.github.com/Font-Awesome/
1+
/*!
2+
* Font Awesome 3.0.2
3+
* the iconic font designed for use with Twitter Bootstrap
4+
* -------------------------------------------------------
5+
* The full suite of pictographic icons, examples, and documentation
6+
* can be found at: http://fortawesome.github.com/Font-Awesome/
7+
*
8+
* License
9+
* -------------------------------------------------------
10+
* - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
11+
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
12+
* http://opensource.org/licenses/mit-license.html
13+
* - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
14+
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
15+
* "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
616
7-
License
8-
-------------------------------------------------------
9-
The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
10-
http://creativecommons.org/licenses/by/3.0/ A mention of
11-
'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
12-
source code is considered acceptable attribution (most common on the web).
13-
If human readable source code is not available to the end user, a mention in
14-
an 'About' or 'Credits' screen is considered acceptable (most common in desktop
15-
or mobile software).
16-
17-
Contact
18-
-------------------------------------------------------
19-
Email: dave@davegandy.com
20-
Twitter: http://twitter.com/fortaweso_me
21-
Work: http://lemonwi.se co-founder
22-
23-
*/
17+
* Contact
18+
* -------------------------------------------------------
19+
* Email: dave@davegandy.com
20+
* Twitter: http://twitter.com/fortaweso_me
21+
* Work: Lead Product Designer @ http://kyruus.com
22+
*/
2423
@font-face {
25-
font-family: "FontAwesome";
26-
src: url('../font/fontawesome-webfont.eot');
27-
src: url('../font/fontawesome-webfont.eot?#iefix') format('eot'), url('../font/fontawesome-webfont.woff') format('woff'), url('../font/fontawesome-webfont.ttf') format('truetype'), url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
24+
font-family: 'FontAwesome';
25+
src: url('../font/fontawesome-webfont.eot?v=3.0.1');
26+
src: url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
27+
url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'),
28+
url('../font/fontawesome-webfont.ttf?v=3.0.1') format('truetype');
2829
font-weight: normal;
2930
font-style: normal;
3031
}
31-
3232
/* Font Awesome styles
3333
------------------------------------------------------- */
34-
[class^="icon-"]:before, [class*=" icon-"]:before {
34+
[class^="icon-"],
35+
[class*=" icon-"] {
3536
font-family: FontAwesome;
3637
font-weight: normal;
3738
font-style: normal;
38-
display: inline-block;
3939
text-decoration: inherit;
40+
-webkit-font-smoothing: antialiased;
41+
42+
/* sprites.less reset */
43+
display: inline;
44+
width: auto;
45+
height: auto;
46+
line-height: normal;
47+
vertical-align: baseline;
48+
background-image: none;
49+
background-position: 0% 0%;
50+
background-repeat: repeat;
51+
margin-top: 0;
4052
}
41-
a [class^="icon-"], a [class*=" icon-"] {
42-
display: inline-block;
53+
/* more sprites.less reset */
54+
.icon-white,
55+
.nav-pills > .active > a > [class^="icon-"],
56+
.nav-pills > .active > a > [class*=" icon-"],
57+
.nav-list > .active > a > [class^="icon-"],
58+
.nav-list > .active > a > [class*=" icon-"],
59+
.navbar-inverse .nav > .active > a > [class^="icon-"],
60+
.navbar-inverse .nav > .active > a > [class*=" icon-"],
61+
.dropdown-menu > li > a:hover > [class^="icon-"],
62+
.dropdown-menu > li > a:hover > [class*=" icon-"],
63+
.dropdown-menu > .active > a > [class^="icon-"],
64+
.dropdown-menu > .active > a > [class*=" icon-"],
65+
.dropdown-submenu:hover > a > [class^="icon-"],
66+
.dropdown-submenu:hover > a > [class*=" icon-"] {
67+
background-image: none;
68+
}
69+
[class^="icon-"]:before,
70+
[class*=" icon-"]:before {
4371
text-decoration: inherit;
72+
display: inline-block;
73+
speak: none;
74+
}
75+
/* makes sure icons active on rollover in links */
76+
a [class^="icon-"],
77+
a [class*=" icon-"] {
78+
display: inline-block;
4479
}
4580
/* makes the font 33% larger relative to the icon container */
4681
.icon-large:before {
47-
vertical-align: top;
82+
vertical-align: -10%;
4883
font-size: 1.3333333333333333em;
4984
}
50-
.btn [class^="icon-"], .btn [class*=" icon-"] {
85+
.btn [class^="icon-"],
86+
.nav [class^="icon-"],
87+
.btn [class*=" icon-"],
88+
.nav [class*=" icon-"] {
89+
display: inline;
90+
/* keeps button heights with and without icons the same */
91+
92+
}
93+
.btn [class^="icon-"].icon-large,
94+
.nav [class^="icon-"].icon-large,
95+
.btn [class*=" icon-"].icon-large,
96+
.nav [class*=" icon-"].icon-large {
97+
line-height: .9em;
98+
}
99+
.btn [class^="icon-"].icon-spin,
100+
.nav [class^="icon-"].icon-spin,
101+
.btn [class*=" icon-"].icon-spin,
102+
.nav [class*=" icon-"].icon-spin {
103+
display: inline-block;
104+
}
105+
.nav-tabs [class^="icon-"],
106+
.nav-pills [class^="icon-"],
107+
.nav-tabs [class*=" icon-"],
108+
.nav-pills [class*=" icon-"] {
51109
/* keeps button heights with and without icons the same */
52110

111+
}
112+
.nav-tabs [class^="icon-"],
113+
.nav-pills [class^="icon-"],
114+
.nav-tabs [class*=" icon-"],
115+
.nav-pills [class*=" icon-"],
116+
.nav-tabs [class^="icon-"].icon-large,
117+
.nav-pills [class^="icon-"].icon-large,
118+
.nav-tabs [class*=" icon-"].icon-large,
119+
.nav-pills [class*=" icon-"].icon-large {
53120
line-height: .9em;
54121
}
55-
li [class^="icon-"], li [class*=" icon-"] {
122+
li [class^="icon-"],
123+
.nav li [class^="icon-"],
124+
li [class*=" icon-"],
125+
.nav li [class*=" icon-"] {
56126
display: inline-block;
57127
width: 1.25em;
58128
text-align: center;
59129
}
60-
li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] {
61-
/* 1.5 increased font size for icon-large * 1.25 width */
130+
li [class^="icon-"].icon-large,
131+
.nav li [class^="icon-"].icon-large,
132+
li [class*=" icon-"].icon-large,
133+
.nav li [class*=" icon-"].icon-large {
134+
/* increased font size for icon-large */
62135

63-
width: 1.875em;
136+
width: 1.5625em;
64137
}
65-
li[class^="icon-"], li[class*=" icon-"] {
66-
margin-left: 0;
138+
ul.icons {
67139
list-style-type: none;
140+
text-indent: -0.75em;
68141
}
69-
li[class^="icon-"]:before, li[class*=" icon-"]:before {
70-
text-indent: -2em;
71-
text-align: center;
142+
ul.icons li [class^="icon-"],
143+
ul.icons li [class*=" icon-"] {
144+
width: .75em;
145+
}
146+
.icon-muted {
147+
color: #eeeeee;
148+
}
149+
.icon-border {
150+
border: solid 1px #eeeeee;
151+
padding: .2em .25em .15em;
152+
-webkit-border-radius: 3px;
153+
-moz-border-radius: 3px;
154+
border-radius: 3px;
155+
}
156+
.icon-2x {
157+
font-size: 2em;
158+
}
159+
.icon-2x.icon-border {
160+
border-width: 2px;
161+
-webkit-border-radius: 4px;
162+
-moz-border-radius: 4px;
163+
border-radius: 4px;
164+
}
165+
.icon-3x {
166+
font-size: 3em;
72167
}
73-
li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
74-
text-indent: -1.3333333333333333em;
168+
.icon-3x.icon-border {
169+
border-width: 3px;
170+
-webkit-border-radius: 5px;
171+
-moz-border-radius: 5px;
172+
border-radius: 5px;
173+
}
174+
.icon-4x {
175+
font-size: 4em;
176+
}
177+
.icon-4x.icon-border {
178+
border-width: 4px;
179+
-webkit-border-radius: 6px;
180+
-moz-border-radius: 6px;
181+
border-radius: 6px;
182+
}
183+
.pull-right {
184+
float: right;
185+
}
186+
.pull-left {
187+
float: left;
188+
}
189+
[class^="icon-"].pull-left,
190+
[class*=" icon-"].pull-left {
191+
margin-right: .3em;
192+
}
193+
[class^="icon-"].pull-right,
194+
[class*=" icon-"].pull-right {
195+
margin-left: .3em;
196+
}
197+
.btn [class^="icon-"].pull-left.icon-2x,
198+
.btn [class*=" icon-"].pull-left.icon-2x,
199+
.btn [class^="icon-"].pull-right.icon-2x,
200+
.btn [class*=" icon-"].pull-right.icon-2x {
201+
margin-top: .18em;
202+
}
203+
.btn [class^="icon-"].icon-spin.icon-large,
204+
.btn [class*=" icon-"].icon-spin.icon-large {
205+
line-height: .8em;
206+
}
207+
.btn.btn-small [class^="icon-"].pull-left.icon-2x,
208+
.btn.btn-small [class*=" icon-"].pull-left.icon-2x,
209+
.btn.btn-small [class^="icon-"].pull-right.icon-2x,
210+
.btn.btn-small [class*=" icon-"].pull-right.icon-2x {
211+
margin-top: .25em;
212+
}
213+
.btn.btn-large [class^="icon-"],
214+
.btn.btn-large [class*=" icon-"] {
215+
margin-top: 0;
216+
}
217+
.btn.btn-large [class^="icon-"].pull-left.icon-2x,
218+
.btn.btn-large [class*=" icon-"].pull-left.icon-2x,
219+
.btn.btn-large [class^="icon-"].pull-right.icon-2x,
220+
.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
221+
margin-top: .05em;
222+
}
223+
.btn.btn-large [class^="icon-"].pull-left.icon-2x,
224+
.btn.btn-large [class*=" icon-"].pull-left.icon-2x {
225+
margin-right: .2em;
226+
}
227+
.btn.btn-large [class^="icon-"].pull-right.icon-2x,
228+
.btn.btn-large [class*=" icon-"].pull-right.icon-2x {
229+
margin-left: .2em;
230+
}
231+
.icon-spin {
232+
display: inline-block;
233+
-moz-animation: spin 2s infinite linear;
234+
-o-animation: spin 2s infinite linear;
235+
-webkit-animation: spin 2s infinite linear;
236+
animation: spin 2s infinite linear;
237+
}
238+
@-moz-keyframes spin {
239+
0% { -moz-transform: rotate(0deg); }
240+
100% { -moz-transform: rotate(359deg); }
241+
}
242+
@-webkit-keyframes spin {
243+
0% { -webkit-transform: rotate(0deg); }
244+
100% { -webkit-transform: rotate(359deg); }
245+
}
246+
@-o-keyframes spin {
247+
0% { -o-transform: rotate(0deg); }
248+
100% { -o-transform: rotate(359deg); }
249+
}
250+
@-ms-keyframes spin {
251+
0% { -ms-transform: rotate(0deg); }
252+
100% { -ms-transform: rotate(359deg); }
253+
}
254+
@keyframes spin {
255+
0% { transform: rotate(0deg); }
256+
100% { transform: rotate(359deg); }
257+
}
258+
@-moz-document url-prefix() {
259+
.icon-spin {
260+
height: .9em;
261+
}
262+
.btn .icon-spin {
263+
height: auto;
264+
}
265+
.icon-spin.icon-large {
266+
height: 1.25em;
267+
}
268+
.btn .icon-spin.icon-large {
269+
height: .75em;
270+
}
75271
}
76272
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
77273
readers do not read off random characters that represent icons */
@@ -299,5 +495,46 @@ li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
299495
.icon-sitemap:before { content: "\f0e8"; }
300496
.icon-umbrella:before { content: "\f0e9"; }
301497
.icon-paste:before { content: "\f0ea"; }
498+
.icon-lightbulb:before { content: "\f0eb"; }
499+
.icon-exchange:before { content: "\f0ec"; }
500+
.icon-cloud-download:before { content: "\f0ed"; }
501+
.icon-cloud-upload:before { content: "\f0ee"; }
502+
503+
.icon-user-md:before { content: "\f0f0"; }
504+
.icon-stethoscope:before { content: "\f0f1"; }
505+
.icon-suitcase:before { content: "\f0f2"; }
506+
.icon-bell-alt:before { content: "\f0f3"; }
507+
.icon-coffee:before { content: "\f0f4"; }
508+
.icon-food:before { content: "\f0f5"; }
509+
.icon-file-alt:before { content: "\f0f6"; }
510+
.icon-building:before { content: "\f0f7"; }
511+
.icon-hospital:before { content: "\f0f8"; }
512+
.icon-ambulance:before { content: "\f0f9"; }
513+
.icon-medkit:before { content: "\f0fa"; }
514+
.icon-fighter-jet:before { content: "\f0fb"; }
515+
.icon-beer:before { content: "\f0fc"; }
516+
.icon-h-sign:before { content: "\f0fd"; }
517+
.icon-plus-sign-alt:before { content: "\f0fe"; }
518+
519+
.icon-double-angle-left:before { content: "\f100"; }
520+
.icon-double-angle-right:before { content: "\f101"; }
521+
.icon-double-angle-up:before { content: "\f102"; }
522+
.icon-double-angle-down:before { content: "\f103"; }
523+
.icon-angle-left:before { content: "\f104"; }
524+
.icon-angle-right:before { content: "\f105"; }
525+
.icon-angle-up:before { content: "\f106"; }
526+
.icon-angle-down:before { content: "\f107"; }
527+
.icon-desktop:before { content: "\f108"; }
528+
.icon-laptop:before { content: "\f109"; }
529+
.icon-tablet:before { content: "\f10a"; }
530+
.icon-mobile-phone:before { content: "\f10b"; }
531+
.icon-circle-blank:before { content: "\f10c"; }
532+
.icon-quote-left:before { content: "\f10d"; }
533+
.icon-quote-right:before { content: "\f10e"; }
302534

303-
.icon-user-md:before { content: "\f200"; }
535+
.icon-spinner:before { content: "\f110"; }
536+
.icon-circle:before { content: "\f111"; }
537+
.icon-reply:before { content: "\f112"; }
538+
.icon-github-alt:before { content: "\f113"; }
539+
.icon-folder-close-alt:before { content: "\f114"; }
540+
.icon-folder-open-alt:before { content: "\f115"; }

0 commit comments

Comments
 (0)