Skip to content

Commit

Permalink
Updating to the latest Font Awesome (4.2.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
borkweb committed Aug 30, 2014
1 parent 4b068f2 commit fcbe65a
Show file tree
Hide file tree
Showing 44 changed files with 3,592 additions and 9,551 deletions.
1,203 changes: 0 additions & 1,203 deletions font-awesome/css/font-awesome-ie7.css

This file was deleted.

384 changes: 0 additions & 384 deletions font-awesome/css/font-awesome-ie7.min.css

This file was deleted.

1,577 changes: 885 additions & 692 deletions font-awesome/css/font-awesome.css

Large diffs are not rendered by default.

407 changes: 4 additions & 403 deletions font-awesome/css/font-awesome.min.css

Large diffs are not rendered by default.

Binary file removed font-awesome/font/FontAwesome.otf
Binary file not shown.
Binary file removed font-awesome/font/fontawesome-webfont.eot
Binary file not shown.
Binary file removed font-awesome/font/fontawesome-webfont.woff
Binary file not shown.
Binary file added font-awesome/fonts/FontAwesome.otf
Binary file not shown.
Binary file added font-awesome/fonts/fontawesome-webfont.eot
Binary file not shown.
189 changes: 155 additions & 34 deletions font-awesome/font/fontawesome-webfont.svg → font-awesome/fonts/fontawesome-webfont.svg 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added font-awesome/fonts/fontawesome-webfont.woff
Binary file not shown.
84 changes: 0 additions & 84 deletions font-awesome/less/bootstrap.less

This file was deleted.

16 changes: 16 additions & 0 deletions font-awesome/less/bordered-pulled.less
@@ -0,0 +1,16 @@
// Bordered & Pulled
// -------------------------

.@{fa-css-prefix}-border {
padding: .2em .25em .15em;
border: solid .08em @fa-border-color;
border-radius: .1em;
}

.pull-right { float: right; }
.pull-left { float: left; }

.@{fa-css-prefix} {
&.pull-left { margin-right: .3em; }
&.pull-right { margin-left: .3em; }
}
134 changes: 8 additions & 126 deletions font-awesome/less/core.less
@@ -1,129 +1,11 @@
/* FONT AWESOME CORE
* -------------------------- */

[class^="icon-"],
[class*=" icon-"] {
.icon-FontAwesome();
}

[class^="icon-"]:before,
[class*=" icon-"]:before {
text-decoration: inherit;
display: inline-block;
speak: none;
}

/* makes the font 33% larger relative to the icon container */
.icon-large:before {
vertical-align: -10%;
font-size: 4/3em;
}

/* makes sure icons active on rollover in links */
a {
[class^="icon-"],
[class*=" icon-"] {
display: inline;
}
}

/* increased font size for icon-large */
[class^="icon-"],
[class*=" icon-"] {
&.icon-fixed-width {
display: inline-block;
width: 16/14em;
text-align: right;
padding-right: 4/14em;
&.icon-large {
width: 20/14em;
}
}
}

.icons-ul {
margin-left: @icons-li-width;
list-style-type: none;

> li { position: relative; }

.icon-li {
position: absolute;
left: -@icons-li-width;
width: @icons-li-width;
text-align: center;
line-height: inherit;
}
}

// allows usage of the hide class directly on font awesome icons
[class^="icon-"],
[class*=" icon-"] {
&.hide {
display: none;
}
}

.icon-muted { color: @iconMuted; }
.icon-light { color: @iconLight; }
.icon-dark { color: @iconDark; }

// Icon Borders
// Base Class Definition
// -------------------------

.icon-border {
border: solid 1px @borderColor;
padding: .2em .25em .15em;
.border-radius(3px);
}

// Icon Sizes
// -------------------------

.icon-2x {
font-size: 2em;
&.icon-border {
border-width: 2px;
.border-radius(4px);
}
}
.icon-3x {
font-size: 3em;
&.icon-border {
border-width: 3px;
.border-radius(5px);
}
}
.icon-4x {
font-size: 4em;
&.icon-border {
border-width: 4px;
.border-radius(6px);
}
}

.icon-5x {
font-size: 5em;
&.icon-border {
border-width: 5px;
.border-radius(7px);
}
}


// Floats & Margins
// -------------------------

// Quick floats
.pull-right { float: right; }
.pull-left { float: left; }

[class^="icon-"],
[class*=" icon-"] {
&.pull-left {
margin-right: .3em;
}
&.pull-right {
margin-left: .3em;
}
.@{fa-css-prefix} {
display: inline-block;
font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
95 changes: 2 additions & 93 deletions font-awesome/less/extras.less
@@ -1,93 +1,2 @@
/* EXTRAS
* -------------------------- */

/* Stacked and layered icon */
.icon-stack();

/* Animated rotating icon */
.icon-spin {
display: inline-block;
-moz-animation: spin 2s infinite linear;
-o-animation: spin 2s infinite linear;
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}

/* Prevent stack and spinners from being taken inline when inside a link */
a .icon-stack,
a .icon-spin {
display: inline-block;
text-decoration: none;
}

@-moz-keyframes spin {
0% { -moz-transform: rotate(0deg); }
100% { -moz-transform: rotate(359deg); }
}
@-webkit-keyframes spin {
0% { -webkit-transform: rotate(0deg); }
100% { -webkit-transform: rotate(359deg); }
}
@-o-keyframes spin {
0% { -o-transform: rotate(0deg); }
100% { -o-transform: rotate(359deg); }
}
@-ms-keyframes spin {
0% { -ms-transform: rotate(0deg); }
100% { -ms-transform: rotate(359deg); }
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(359deg); }
}

/* Icon rotations and mirroring */
.icon-rotate-90:before {
-webkit-transform: rotate(90deg);
-moz-transform: rotate(90deg);
-ms-transform: rotate(90deg);
-o-transform: rotate(90deg);
transform: rotate(90deg);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
}

.icon-rotate-180:before {
-webkit-transform: rotate(180deg);
-moz-transform: rotate(180deg);
-ms-transform: rotate(180deg);
-o-transform: rotate(180deg);
transform: rotate(180deg);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
}

.icon-rotate-270:before {
-webkit-transform: rotate(270deg);
-moz-transform: rotate(270deg);
-ms-transform: rotate(270deg);
-o-transform: rotate(270deg);
transform: rotate(270deg);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
}

.icon-flip-horizontal:before {
-webkit-transform: scale(-1, 1);
-moz-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
-o-transform: scale(-1, 1);
transform: scale(-1, 1);
}

.icon-flip-vertical:before {
-webkit-transform: scale(1, -1);
-moz-transform: scale(1, -1);
-ms-transform: scale(1, -1);
-o-transform: scale(1, -1);
transform: scale(1, -1);
}

/* ensure rotation occurs inside anchor tags */
a {
.icon-rotate-90, .icon-rotate-180, .icon-rotate-270, .icon-flip-horizontal, .icon-flip-vertical {
&:before { display: inline-block; }
}
}
// Extras
// --------------------------
6 changes: 6 additions & 0 deletions font-awesome/less/fixed-width.less
@@ -0,0 +1,6 @@
// Fixed Width Icons
// -------------------------
.@{fa-css-prefix}-fw {
width: (18em / 14);
text-align: center;
}

0 comments on commit fcbe65a

Please sign in to comment.