merge conficts

This commit is contained in:
davegandy 2013-09-30 18:22:41 -04:00
commit 495649eaea
44 changed files with 436 additions and 401 deletions

2
.gitignore vendored
View file

@ -28,3 +28,5 @@ node_modules
src/website/settingslocal.py
stunnel.log
.ruby-version

View file

@ -1 +0,0 @@
1.9.3-p392

View file

@ -43,4 +43,4 @@ PLATFORMS
DEPENDENCIES
debugger
jekyll (= 1.0)
jekyll (~> 1.0)

View file

@ -46,6 +46,17 @@ For more information on SemVer, please visit http://semver.org.
- GitHub: https://github.com/davegandy
- Work: Lead Product Designer @ http://kyru.us
##Component
To include as a [component](http://github.com/component/component), just run
$ component install FortAwesome/Font-Awesome
Or add
"FortAwesome/Font-Awesome": "*"
to the `dependencies` in your `component.json`.
## Hacking on Font Awesome
From the root of the repository, install the tools used to develop.

20
component.json Normal file
View file

@ -0,0 +1,20 @@
{
"name": "Font-Awesome",
"repo": "FortAwesome/Font-Awesome",
"description": "Font Awesome",
"version": "4.0.0",
"keywords": [],
"dependencies": {},
"development": {},
"license": "SIL, MIT, CC BY 3.0",
"styles": [
"css/font-awesome.css"
],
"fonts": [
"font/fontawesome-webfont.eot",
"font/fontawesome-webfont.svg",
"font/fontawesome-webfont.ttf",
"font/fontawesome-webfont.woff",
"font/FontAwesome.otf"
]
}

View file

@ -13,7 +13,7 @@
],
"extra": {
"branch-alias": {
"dev-master": "3.2.x-dev"
"dev-master": "4.0.x-dev"
}
},
"license": [

View file

@ -24,20 +24,20 @@
* Work: Lead Product Designer @ Kyruus - http://kyruus.com
*/
.icon-large {
font-size: 1.3333333333333333em;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
font-size: 1.3333333333333333em;
vertical-align: middle;
}
.nav [class^="icon-"],
.nav [class*=" icon-"] {
vertical-align: inherit;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
vertical-align: inherit;
}
.nav [class^="icon-"].icon-large,
.nav [class*=" icon-"].icon-large {
@ -47,11 +47,11 @@
.nav-tabs [class^="icon-"].icon-large,
.nav-pills [class*=" icon-"].icon-large,
.nav-tabs [class*=" icon-"].icon-large {
line-height: .75em;
margin-top: -7px;
padding-top: 5px;
margin-bottom: -5px;
padding-bottom: 4px;
margin-top: -7px;
margin-bottom: -5px;
line-height: .75em;
}
.btn [class^="icon-"].pull-left,
.btn [class*=" icon-"].pull-left,
@ -475,7 +475,7 @@ a [class*=" icon-"] {
.icon-heart-empty {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-signout {
.icon-log-out {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-linkedin-sign {
@ -487,7 +487,7 @@ a [class*=" icon-"] {
.icon-external-link {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-signin {
.icon-log-in {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-trophy {
@ -502,12 +502,9 @@ a [class*=" icon-"] {
.icon-lemon {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-phone {
.icon-earphone {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-check-empty {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-unchecked {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
@ -542,7 +539,7 @@ a [class*=" icon-"] {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-bell {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-certificate {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
@ -607,13 +604,10 @@ a [class*=" icon-"] {
.icon-copy {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-paper-clip {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-paperclip {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-save {
.icon-floppy-disk {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-sign-blank {
@ -706,7 +700,7 @@ a [class*=" icon-"] {
.icon-comments-alt {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-bolt {
.icon-flash {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-sitemap {
@ -740,12 +734,12 @@ a [class*=" icon-"] {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-bell-alt {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-coffee {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-food {
.icon-cutlery {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-file-text-alt {
@ -808,7 +802,7 @@ a [class*=" icon-"] {
.icon-tablet {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-mobile-phone {
.icon-phone {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-circle-blank {
@ -1009,10 +1003,10 @@ a [class*=" icon-"] {
.icon-compass {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-collapse {
.icon-collapse-down {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-collapse-top {
.icon-collapse-up {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-expand {
@ -1042,14 +1036,14 @@ a [class*=" icon-"] {
.icon-jpy {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-yen {
.icon-cny {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-cny {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
.icon-rmb {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-renminbi {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
.icon-yen {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-krw {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
@ -1111,7 +1105,7 @@ a [class*=" icon-"] {
.icon-dropbox {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-stackexchange {
.icon-stackoverflow {
*zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');
}
.icon-instagram {

View file

@ -1,6 +1,6 @@
.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;}
.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;}
.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;}
.icon-large{padding-top:3px;padding-bottom:3px;margin-top:-4px;margin-bottom:-4px;font-size:1.3333333333333333em;vertical-align:middle;}
.nav [class^="icon-"],.nav [class*=" icon-"]{padding-top:3px;padding-bottom:3px;margin-top:-4px;margin-bottom:-4px;vertical-align:inherit;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;}
.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{padding-top:5px;padding-bottom:4px;margin-top:-7px;margin-bottom:-5px;line-height:.75em;}
.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;}
.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;}
a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
@ -140,17 +140,16 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-star-half{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-heart-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-signout{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-log-out{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-linkedin-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-pushpin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-external-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-signin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-log-in{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-trophy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-github-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-upload-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-lemon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-check-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-earphone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-unchecked{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-bookmark-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-phone-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -162,7 +161,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-rss{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-hdd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-bullhorn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-certificate{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-hand-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-hand-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -184,9 +183,8 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-beaker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-cut{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-copy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-paper-clip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-paperclip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-save{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-floppy-disk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-sign-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-reorder{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-list-ul{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -217,7 +215,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-dashboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-comment-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-comments-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-bolt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-flash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-sitemap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-umbrella{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-paste{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -228,9 +226,9 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-user-md{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-stethoscope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-suitcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-coffee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-food{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-cutlery{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-file-text-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-building{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-hospital{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -251,7 +249,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-desktop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-laptop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-tablet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-mobile-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-circle-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-quote-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-quote-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -318,8 +316,8 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-external-link-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-share-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-compass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-collapse{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-collapse-top{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-collapse-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-collapse-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-expand{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-eur{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-euro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -329,9 +327,9 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-inr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-rupee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-jpy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-rmb{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-yen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-renminbi{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-krw{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-won{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-btc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
@ -352,7 +350,7 @@ a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
.icon-xing-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-youtube-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-dropbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-stackexchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-stackoverflow{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-instagram{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-flickr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}
.icon-adn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '');}

77
css/font-awesome.css vendored
View file

@ -28,7 +28,7 @@
@font-face {
font-family: 'FontAwesome';
src: url('../font/fontawesome-webfont.eot?v=4.0.0');
src: url('../font/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=4.0.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=4.0.0') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=4.0.0') format('svg');
src: url('../font/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=4.0.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=4.0.0') format('truetype'), url('../font/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
@ -36,23 +36,25 @@
* -------------------------- */
[class^="icon-"],
[class*=" icon-"] {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em;
font-family: FontAwesome;
-webkit-font-smoothing: antialiased;
font-style: normal;
font-weight: normal;
text-decoration: inherit;
text-rendering: auto;
-moz-osx-font-smoothing: grayscale;
}
[class^="icon-"]:before,
[class*=" icon-"]:before {
text-decoration: inherit;
display: inline-block;
text-decoration: inherit;
speak: none;
}
/* makes the font 33% larger relative to the icon container */
.icon-large:before {
vertical-align: -10%;
font-size: 1.3333333333333333em;
vertical-align: -10%;
}
/* makes sure icons active on rollover in links */
a [class^="icon-"],
@ -64,14 +66,15 @@ a [class*=" icon-"] {
[class*=" icon-"].icon-fixed-width {
display: inline-block;
width: 1.1428571428571428em;
text-align: right;
padding-right: 0.2857142857142857em;
text-align: right;
}
[class^="icon-"].icon-fixed-width.icon-large,
[class*=" icon-"].icon-fixed-width.icon-large {
width: 1.4285714285714286em;
}
.icons-ul {
padding-left: 0;
margin-left: 2.142857142857143em;
list-style-type: none;
}
@ -82,8 +85,8 @@ a [class*=" icon-"] {
position: absolute;
left: -2.142857142857143em;
width: 2.142857142857143em;
text-align: center;
line-height: inherit;
text-align: center;
}
[class^="icon-"].hide,
[class*=" icon-"].hide {
@ -99,8 +102,8 @@ a [class*=" icon-"] {
color: #333333;
}
.icon-border {
border: solid 1px #eeeeee;
padding: .2em .25em .15em;
border: solid 1px #eeeeee;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@ -163,12 +166,12 @@ a [class*=" icon-"] {
display: inline;
width: auto;
height: auto;
margin-top: 0;
line-height: normal;
vertical-align: baseline;
background-image: none;
background-position: 0% 0%;
background-position: 0 0;
background-repeat: repeat;
margin-top: 0;
}
/* more sprites.less reset */
.icon-white,
@ -261,14 +264,14 @@ a [class*=" icon-"] {
}
.icon-stack [class^="icon-"],
.icon-stack [class*=" icon-"] {
display: block;
text-align: center;
position: absolute;
display: block;
width: 100%;
height: 100%;
font-size: 1em;
line-height: inherit;
*line-height: 2em;
text-align: center;
}
.icon-stack .icon-stack-base {
font-size: 2em;
@ -277,9 +280,9 @@ a [class*=" icon-"] {
/* Animated rotating icon */
.icon-spin {
display: inline-block;
-webkit-animation: spin 2s infinite linear;
-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 */
@ -330,28 +333,28 @@ a .icon-spin {
}
/* Icon rotations and mirroring */
.icon-rotate-90:before {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-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);
@ -775,7 +778,7 @@ a .icon-flip-vertical:before {
.icon-heart-empty:before {
content: "\f08a";
}
.icon-signout:before {
.icon-log-out:before {
content: "\f08b";
}
.icon-linkedin-sign:before {
@ -787,7 +790,7 @@ a .icon-flip-vertical:before {
.icon-external-link:before {
content: "\f08e";
}
.icon-signin:before {
.icon-log-in:before {
content: "\f090";
}
.icon-trophy:before {
@ -802,11 +805,10 @@ a .icon-flip-vertical:before {
.icon-lemon:before {
content: "\f094";
}
.icon-phone:before {
.icon-earphone:before {
content: "\f095";
}
.icon-unchecked:before,
.icon-check-empty:before {
.icon-unchecked:before {
content: "\f096";
}
.icon-bookmark-empty:before {
@ -840,7 +842,7 @@ a .icon-flip-vertical:before {
content: "\f0a1";
}
.icon-bell:before {
content: "\f0a2";
content: "\f0f3";
}
.icon-certificate:before {
content: "\f0a3";
@ -905,11 +907,10 @@ a .icon-flip-vertical:before {
.icon-copy:before {
content: "\f0c5";
}
.icon-paperclip:before,
.icon-paper-clip:before {
.icon-paperclip:before {
content: "\f0c6";
}
.icon-save:before {
.icon-floppy-disk:before {
content: "\f0c7";
}
.icon-sign-blank:before {
@ -1000,7 +1001,7 @@ a .icon-flip-vertical:before {
.icon-comments-alt:before {
content: "\f0e6";
}
.icon-bolt:before {
.icon-flash:before {
content: "\f0e7";
}
.icon-sitemap:before {
@ -1034,12 +1035,12 @@ a .icon-flip-vertical:before {
content: "\f0f2";
}
.icon-bell-alt:before {
content: "\f0f3";
content: "\f0a2";
}
.icon-coffee:before {
content: "\f0f4";
}
.icon-food:before {
.icon-cutlery:before {
content: "\f0f5";
}
.icon-file-text-alt:before {
@ -1102,7 +1103,7 @@ a .icon-flip-vertical:before {
.icon-tablet:before {
content: "\f10a";
}
.icon-mobile-phone:before {
.icon-phone:before {
content: "\f10b";
}
.icon-circle-blank:before {
@ -1299,10 +1300,10 @@ a .icon-flip-vertical:before {
.icon-compass:before {
content: "\f14e";
}
.icon-collapse:before {
.icon-collapse-down:before {
content: "\f150";
}
.icon-collapse-top:before {
.icon-collapse-up:before {
content: "\f151";
}
.icon-expand:before {
@ -1323,14 +1324,12 @@ a .icon-flip-vertical:before {
.icon-inr:before {
content: "\f156";
}
.icon-cny:before,
.icon-rmb:before,
.icon-yen:before,
.icon-jpy:before {
content: "\f157";
}
.icon-renminbi:before,
.icon-cny:before {
content: "\f158";
}
.icon-won:before,
.icon-krw:before {
content: "\f159";
@ -1387,7 +1386,7 @@ a .icon-flip-vertical:before {
.icon-dropbox:before {
content: "\f16b";
}
.icon-stackexchange:before {
.icon-stackoverflow:before {
content: "\f16c";
}
.icon-instagram:before {

View file

@ -1,15 +1,15 @@
@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=4.0.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=4.0.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=4.0.0') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=4.0.0') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;}
.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=4.0.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=4.0.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=4.0.0') format('truetype'),url('../font/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{*margin-right:.3em;font-family:FontAwesome;-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;text-decoration:inherit;text-rendering:auto;-moz-osx-font-smoothing:grayscale;}
[class^="icon-"]:before,[class*=" icon-"]:before{display:inline-block;text-decoration:inherit;speak:none;}
.icon-large:before{font-size:1.3333333333333333em;vertical-align:-10%;}
a [class^="icon-"],a [class*=" icon-"]{display:inline;}
[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;text-align:right;padding-right:0.2857142857142857em;}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em;}
.icons-ul{margin-left:2.142857142857143em;list-style-type:none;}.icons-ul>li{position:relative;}
.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;text-align:center;line-height:inherit;}
[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.4285714285714286em;}
.icons-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.icons-ul>li{position:relative;}
.icons-ul .icon-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;line-height:inherit;text-align:center;}
[class^="icon-"].hide,[class*=" icon-"].hide{display:none;}
.icon-muted{color:#eeeeee;}
.icon-light{color:#ffffff;}
.icon-dark{color:#333333;}
.icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
.icon-border{padding:.2em .25em .15em;border:solid 1px #eeeeee;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
.icon-2x{font-size:2em;}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.icon-3x{font-size:3em;}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
.icon-4x{font-size:4em;}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
@ -18,7 +18,7 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline;}
.pull-left{float:left;}
[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em;}
[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em;}
[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;}
[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;margin-top:0;line-height:normal;vertical-align:baseline;background-image:none;background-position:0 0;background-repeat:repeat;}
.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none;}
.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em;}
.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;}
@ -30,13 +30,13 @@ a [class^="icon-"],a [class*=" icon-"]{display:inline;}
.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;}
.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;}
.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{line-height:inherit;}
.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;}
.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%;}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{position:absolute;display:block;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em;text-align:center;}
.icon-stack .icon-stack-base{font-size:2em;*line-height:1em;}
.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;}
.icon-spin{display:inline-block;-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear;}
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-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);}
@-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-rotate-90:before{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);}
.icon-rotate-180:before{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);}
.icon-rotate-270:before{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);}
.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);}
a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .icon-flip-horizontal:before,a .icon-flip-vertical:before{display:inline-block;}
@ -171,17 +171,17 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-thumbs-down-alt:before{content:"\f088";}
.icon-star-half:before{content:"\f089";}
.icon-heart-empty:before{content:"\f08a";}
.icon-signout:before{content:"\f08b";}
.icon-log-out:before{content:"\f08b";}
.icon-linkedin-sign:before{content:"\f08c";}
.icon-pushpin:before{content:"\f08d";}
.icon-external-link:before{content:"\f08e";}
.icon-signin:before{content:"\f090";}
.icon-log-in:before{content:"\f090";}
.icon-trophy:before{content:"\f091";}
.icon-github-sign:before{content:"\f092";}
.icon-upload-alt:before{content:"\f093";}
.icon-lemon:before{content:"\f094";}
.icon-phone:before{content:"\f095";}
.icon-unchecked:before,.icon-check-empty:before{content:"\f096";}
.icon-earphone:before{content:"\f095";}
.icon-unchecked:before{content:"\f096";}
.icon-bookmark-empty:before{content:"\f097";}
.icon-phone-sign:before{content:"\f098";}
.icon-twitter:before{content:"\f099";}
@ -192,7 +192,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-rss:before{content:"\f09e";}
.icon-hdd:before{content:"\f0a0";}
.icon-bullhorn:before{content:"\f0a1";}
.icon-bell:before{content:"\f0a2";}
.icon-bell:before{content:"\f0f3";}
.icon-certificate:before{content:"\f0a3";}
.icon-hand-right:before{content:"\f0a4";}
.icon-hand-left:before{content:"\f0a5";}
@ -214,8 +214,8 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-beaker:before{content:"\f0c3";}
.icon-cut:before{content:"\f0c4";}
.icon-copy:before{content:"\f0c5";}
.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6";}
.icon-save:before{content:"\f0c7";}
.icon-paperclip:before{content:"\f0c6";}
.icon-floppy-disk:before{content:"\f0c7";}
.icon-sign-blank:before{content:"\f0c8";}
.icon-reorder:before{content:"\f0c9";}
.icon-list-ul:before{content:"\f0ca";}
@ -245,7 +245,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-dashboard:before{content:"\f0e4";}
.icon-comment-alt:before{content:"\f0e5";}
.icon-comments-alt:before{content:"\f0e6";}
.icon-bolt:before{content:"\f0e7";}
.icon-flash:before{content:"\f0e7";}
.icon-sitemap:before{content:"\f0e8";}
.icon-umbrella:before{content:"\f0e9";}
.icon-paste:before{content:"\f0ea";}
@ -256,9 +256,9 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-user-md:before{content:"\f0f0";}
.icon-stethoscope:before{content:"\f0f1";}
.icon-suitcase:before{content:"\f0f2";}
.icon-bell-alt:before{content:"\f0f3";}
.icon-bell-alt:before{content:"\f0a2";}
.icon-coffee:before{content:"\f0f4";}
.icon-food:before{content:"\f0f5";}
.icon-cutlery:before{content:"\f0f5";}
.icon-file-text-alt:before{content:"\f0f6";}
.icon-building:before{content:"\f0f7";}
.icon-hospital:before{content:"\f0f8";}
@ -279,7 +279,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-desktop:before{content:"\f108";}
.icon-laptop:before{content:"\f109";}
.icon-tablet:before{content:"\f10a";}
.icon-mobile-phone:before{content:"\f10b";}
.icon-phone:before{content:"\f10b";}
.icon-circle-blank:before{content:"\f10c";}
.icon-quote-left:before{content:"\f10d";}
.icon-quote-right:before{content:"\f10e";}
@ -344,15 +344,14 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-external-link-sign:before{content:"\f14c";}
.icon-share-sign:before{content:"\f14d";}
.icon-compass:before{content:"\f14e";}
.icon-collapse:before{content:"\f150";}
.icon-collapse-top:before{content:"\f151";}
.icon-collapse-down:before{content:"\f150";}
.icon-collapse-up:before{content:"\f151";}
.icon-expand:before{content:"\f152";}
.icon-euro:before,.icon-eur:before{content:"\f153";}
.icon-gbp:before{content:"\f154";}
.icon-dollar:before,.icon-usd:before{content:"\f155";}
.icon-rupee:before,.icon-inr:before{content:"\f156";}
.icon-yen:before,.icon-jpy:before{content:"\f157";}
.icon-renminbi:before,.icon-cny:before{content:"\f158";}
.icon-cny:before,.icon-rmb:before,.icon-yen:before,.icon-jpy:before{content:"\f157";}
.icon-won:before,.icon-krw:before{content:"\f159";}
.icon-bitcoin:before,.icon-btc:before{content:"\f15a";}
.icon-file:before{content:"\f15b";}
@ -371,7 +370,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a .
.icon-xing-sign:before{content:"\f169";}
.icon-youtube-play:before{content:"\f16a";}
.icon-dropbox:before{content:"\f16b";}
.icon-stackexchange:before{content:"\f16c";}
.icon-stackoverflow:before{content:"\f16c";}
.icon-instagram:before{content:"\f16d";}
.icon-flickr:before{content:"\f16e";}
.icon-adn:before{content:"\f170";}

4
less/bootstrap.less vendored
View file

@ -7,12 +7,12 @@
display: inline;
width: auto;
height: auto;
margin-top: 0;
line-height: normal;
vertical-align: baseline;
background-image: none;
background-position: 0% 0%;
background-position: 0 0;
background-repeat: repeat;
margin-top: 0;
}
/* more sprites.less reset */

View file

@ -8,15 +8,15 @@
[class^="icon-"]:before,
[class*=" icon-"]:before {
text-decoration: inherit;
display: inline-block;
text-decoration: inherit;
speak: none;
}
/* makes the font 33% larger relative to the icon container */
.icon-large:before {
font-size: (4em / 3);
vertical-align: -10%;
font-size: 4/3em;
}
/* makes sure icons active on rollover in links */
@ -32,16 +32,17 @@ a {
[class*=" icon-"] {
&.icon-fixed-width {
display: inline-block;
width: 16/14em;
width: (16em / 14);
padding-right: (4em / 14);
text-align: right;
padding-right: 4/14em;
&.icon-large {
width: 20/14em;
width: (20em / 14);
}
}
}
.icons-ul {
padding-left: 0;
margin-left: @icons-li-width;
list-style-type: none;
@ -51,8 +52,8 @@ a {
position: absolute;
left: -@icons-li-width;
width: @icons-li-width;
text-align: center;
line-height: inherit;
text-align: center;
}
}
@ -72,8 +73,8 @@ a {
// -------------------------
.icon-border {
border: solid 1px @borderColor;
padding: .2em .25em .15em;
border: solid 1px @borderColor;
.border-radius(3px);
}

View file

@ -7,9 +7,9 @@
/* Animated rotating icon */
.icon-spin {
display: inline-block;
-webkit-animation: spin 2s infinite linear;
-moz-animation: spin 2s infinite linear;
-o-animation: spin 2s infinite linear;
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
@ -43,30 +43,30 @@ a .icon-spin {
/* Icon rotations and mirroring */
.icon-rotate-90:before {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-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 {

View file

@ -25,22 +25,22 @@
*/
.icon-large {
font-size: 4/3em;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
font-size: (4em / 3);
vertical-align: middle;
}
.nav {
[class^="icon-"],
[class*=" icon-"] {
vertical-align: inherit;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
vertical-align: inherit;
&.icon-large {
vertical-align: -25%;
}
@ -51,11 +51,11 @@
[class^="icon-"],
[class*=" icon-"] {
&.icon-large {
line-height: .75em;
margin-top: -7px;
padding-top: 5px;
margin-bottom: -5px;
padding-bottom: 4px;
margin-top: -7px;
margin-bottom: -5px;
line-height: .75em;
}
}
}
@ -753,7 +753,7 @@ a [class*=" icon-"] {
}
.icon-signout {
.icon-log-out {
.ie7icon('');
}
@ -773,7 +773,7 @@ a [class*=" icon-"] {
}
.icon-signin {
.icon-log-in {
.ie7icon('');
}
@ -798,15 +798,11 @@ a [class*=" icon-"] {
}
.icon-phone {
.icon-earphone {
.ie7icon('');
}
.icon-check-empty {
.ie7icon('');
}
.icon-unchecked {
.ie7icon('');
}
@ -863,7 +859,7 @@ a [class*=" icon-"] {
.icon-bell {
.ie7icon('');
.ie7icon('');
}
@ -972,16 +968,12 @@ a [class*=" icon-"] {
}
.icon-paper-clip {
.ie7icon('');
}
.icon-paperclip {
.ie7icon('');
}
.icon-save {
.icon-floppy-disk {
.ie7icon('');
}
@ -1135,7 +1127,7 @@ a [class*=" icon-"] {
}
.icon-bolt {
.icon-flash {
.ie7icon('');
}
@ -1191,7 +1183,7 @@ a [class*=" icon-"] {
.icon-bell-alt {
.ie7icon('');
.ie7icon('');
}
@ -1200,7 +1192,7 @@ a [class*=" icon-"] {
}
.icon-food {
.icon-cutlery {
.ie7icon('');
}
@ -1305,7 +1297,7 @@ a [class*=" icon-"] {
}
.icon-mobile-phone {
.icon-phone {
.ie7icon('');
}
@ -1638,12 +1630,12 @@ a [class*=" icon-"] {
}
.icon-collapse {
.icon-collapse-down {
.ie7icon('');
}
.icon-collapse-top {
.icon-collapse-up {
.ie7icon('');
}
@ -1689,17 +1681,16 @@ a [class*=" icon-"] {
.ie7icon('');
}
.icon-yen {
.icon-cny {
.ie7icon('');
}
.icon-cny {
.ie7icon('');
.icon-rmb {
.ie7icon('');
}
.icon-renminbi {
.ie7icon('');
.icon-yen {
.ie7icon('');
}
@ -1801,7 +1792,7 @@ a [class*=" icon-"] {
}
.icon-stackexchange {
.icon-stackoverflow {
.ie7icon('');
}

View file

@ -137,18 +137,17 @@
.icon-thumbs-down-alt:before { content: @thumbs-down-alt; }
.icon-star-half:before { content: @star-half; }
.icon-heart-empty:before { content: @heart-empty; }
.icon-signout:before { content: @signout; }
.icon-log-out:before { content: @log-out; }
.icon-linkedin-sign:before { content: @linkedin-sign; }
.icon-pushpin:before { content: @pushpin; }
.icon-external-link:before { content: @external-link; }
.icon-signin:before { content: @signin; }
.icon-log-in:before { content: @log-in; }
.icon-trophy:before { content: @trophy; }
.icon-github-sign:before { content: @github-sign; }
.icon-upload-alt:before { content: @upload-alt; }
.icon-lemon:before { content: @lemon; }
.icon-phone:before { content: @phone; }
.icon-unchecked:before,
.icon-check-empty:before { content: @check-empty; }
.icon-earphone:before { content: @earphone; }
.icon-unchecked:before { content: @unchecked; }
.icon-bookmark-empty:before { content: @bookmark-empty; }
.icon-phone-sign:before { content: @phone-sign; }
.icon-twitter:before { content: @twitter; }
@ -181,9 +180,8 @@
.icon-beaker:before { content: @beaker; }
.icon-cut:before { content: @cut; }
.icon-copy:before { content: @copy; }
.icon-paperclip:before,
.icon-paper-clip:before { content: @paper-clip; }
.icon-save:before { content: @save; }
.icon-paperclip:before { content: @paperclip; }
.icon-floppy-disk:before { content: @floppy-disk; }
.icon-sign-blank:before { content: @sign-blank; }
.icon-reorder:before { content: @reorder; }
.icon-list-ul:before { content: @list-ul; }
@ -214,7 +212,7 @@
.icon-dashboard:before { content: @dashboard; }
.icon-comment-alt:before { content: @comment-alt; }
.icon-comments-alt:before { content: @comments-alt; }
.icon-bolt:before { content: @bolt; }
.icon-flash:before { content: @flash; }
.icon-sitemap:before { content: @sitemap; }
.icon-umbrella:before { content: @umbrella; }
.icon-paste:before { content: @paste; }
@ -227,7 +225,7 @@
.icon-suitcase:before { content: @suitcase; }
.icon-bell-alt:before { content: @bell-alt; }
.icon-coffee:before { content: @coffee; }
.icon-food:before { content: @food; }
.icon-cutlery:before { content: @cutlery; }
.icon-file-text-alt:before { content: @file-text-alt; }
.icon-building:before { content: @building; }
.icon-hospital:before { content: @hospital; }
@ -248,7 +246,7 @@
.icon-desktop:before { content: @desktop; }
.icon-laptop:before { content: @laptop; }
.icon-tablet:before { content: @tablet; }
.icon-mobile-phone:before { content: @mobile-phone; }
.icon-phone:before { content: @phone; }
.icon-circle-blank:before { content: @circle-blank; }
.icon-quote-left:before { content: @quote-left; }
.icon-quote-right:before { content: @quote-right; }
@ -315,8 +313,8 @@
.icon-external-link-sign:before { content: @external-link-sign; }
.icon-share-sign:before { content: @share-sign; }
.icon-compass:before { content: @compass; }
.icon-collapse:before { content: @collapse; }
.icon-collapse-top:before { content: @collapse-top; }
.icon-collapse-down:before { content: @collapse-down; }
.icon-collapse-up:before { content: @collapse-up; }
.icon-expand:before { content: @expand; }
.icon-euro:before,
.icon-eur:before { content: @eur; }
@ -325,10 +323,10 @@
.icon-usd:before { content: @usd; }
.icon-rupee:before,
.icon-inr:before { content: @inr; }
.icon-cny:before,
.icon-rmb:before,
.icon-yen:before,
.icon-jpy:before { content: @jpy; }
.icon-renminbi:before,
.icon-cny:before { content: @cny; }
.icon-won:before,
.icon-krw:before { content: @krw; }
.icon-bitcoin:before,
@ -349,7 +347,7 @@
.icon-xing-sign:before { content: @xing-sign; }
.icon-youtube-play:before { content: @youtube-play; }
.icon-dropbox:before { content: @dropbox; }
.icon-stackexchange:before { content: @stackexchange; }
.icon-stackoverflow:before { content: @stackoverflow; }
.icon-instagram:before { content: @instagram; }
.icon-flickr:before { content: @flickr; }
.icon-adn:before { content: @adn; }

View file

@ -7,12 +7,14 @@
}
.icon-FontAwesome() {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em; // fixes ie7 issues
font-family: FontAwesome;
-webkit-font-smoothing: antialiased;
font-style: normal;
font-weight: normal;
text-decoration: inherit;
text-rendering: auto;
-moz-osx-font-smoothing: grayscale;
}
.border-radius(@radius) {
@ -31,18 +33,18 @@
vertical-align: -35%;
[class^="icon-"],
[class*=" icon-"] {
display: block;
text-align: center;
position: absolute;
display: block;
width: 100%;
height: 100%;
font-size: @top-font-size;
line-height: inherit;
*line-height: @height;
text-align: center;
}
.icon-stack-base {
font-size: @base-font-size;
*line-height: @height / @base-font-size;
*line-height: (@height / @base-font-size);
}
}
}

View file

@ -7,7 +7,7 @@
src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg');
// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal;
font-style: normal;

View file

@ -8,7 +8,7 @@
@iconMuted: #eee;
@iconLight: #fff;
@iconDark: #333;
@icons-li-width: 30/14em;
@icons-li-width: (30em / 14);
@glass: "\f000";
@ -273,7 +273,7 @@
@heart-empty: "\f08a";
@signout: "\f08b";
@log-out: "\f08b";
@linkedin-sign: "\f08c";
@ -281,7 +281,7 @@
@external-link: "\f08e";
@signin: "\f090";
@log-in: "\f090";
@trophy: "\f091";
@ -291,9 +291,9 @@
@lemon: "\f094";
@phone: "\f095";
@earphone: "\f095";
@check-empty: "\f096";
@unchecked: "\f096";
@bookmark-empty: "\f097";
@ -315,7 +315,7 @@
@bullhorn: "\f0a1";
@bell: "\f0a2";
@bell: "\f0f3";
@certificate: "\f0a3";
@ -359,9 +359,9 @@
@copy: "\f0c5";
@paper-clip: "\f0c6";
@paperclip: "\f0c6";
@save: "\f0c7";
@floppy-disk: "\f0c7";
@sign-blank: "\f0c8";
@ -421,7 +421,7 @@
@comments-alt: "\f0e6";
@bolt: "\f0e7";
@flash: "\f0e7";
@sitemap: "\f0e8";
@ -443,11 +443,11 @@
@suitcase: "\f0f2";
@bell-alt: "\f0f3";
@bell-alt: "\f0a2";
@coffee: "\f0f4";
@food: "\f0f5";
@cutlery: "\f0f5";
@file-text-alt: "\f0f6";
@ -489,7 +489,7 @@
@tablet: "\f10a";
@mobile-phone: "\f10b";
@phone: "\f10b";
@circle-blank: "\f10c";
@ -619,9 +619,9 @@
@compass: "\f14e";
@collapse: "\f150";
@collapse-down: "\f150";
@collapse-top: "\f151";
@collapse-up: "\f151";
@expand: "\f152";
@ -635,8 +635,6 @@
@jpy: "\f157";
@cny: "\f158";
@krw: "\f159";
@btc: "\f15a";
@ -673,7 +671,7 @@
@dropbox: "\f16b";
@stackexchange: "\f16c";
@stackoverflow: "\f16c";
@instagram: "\f16d";

View file

@ -38,7 +38,6 @@
}
],
"dependencies": {
"jekyll": "1.0.2",
"lessc": "1.3.3"
"less": "1.4.1"
}
}

View file

@ -7,12 +7,12 @@
display: inline;
width: auto;
height: auto;
margin-top: 0;
line-height: normal;
vertical-align: baseline;
background-image: none;
background-position: 0% 0%;
background-position: 0 0;
background-repeat: repeat;
margin-top: 0;
}
/* more sprites.less reset */

View file

@ -8,15 +8,15 @@
[class^="icon-"]:before,
[class*=" icon-"]:before {
text-decoration: inherit;
display: inline-block;
text-decoration: inherit;
speak: none;
}
/* makes the font 33% larger relative to the icon container */
.icon-large:before {
vertical-align: -10%;
font-size: (4em/3);
vertical-align: -10%;
}
/* makes sure icons active on rollover in links */
@ -33,8 +33,8 @@ a {
&.icon-fixed-width {
display: inline-block;
width: (16em/14);
text-align: right;
padding-right: (4em/14);
text-align: right;
&.icon-large {
width: (20em/14);
}
@ -42,6 +42,7 @@ a {
}
.icons-ul {
padding-left: 0;
margin-left: $icons-li-width;
list-style-type: none;
@ -51,8 +52,8 @@ a {
position: absolute;
left: -$icons-li-width;
width: $icons-li-width;
text-align: center;
line-height: inherit;
text-align: center;
}
}
@ -72,8 +73,8 @@ a {
// -------------------------
.icon-border {
border: solid 1px $borderColor;
padding: .2em .25em .15em;
border: solid 1px $borderColor;
@include border-radius(3px);
}

View file

@ -7,9 +7,9 @@
/* Animated rotating icon */
.icon-spin {
display: inline-block;
-webkit-animation: spin 2s infinite linear;
-moz-animation: spin 2s infinite linear;
-o-animation: spin 2s infinite linear;
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
@ -43,30 +43,30 @@ a .icon-spin {
/* Icon rotations and mirroring */
.icon-rotate-90:before {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-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 {

View file

@ -137,18 +137,17 @@
.icon-thumbs-down-alt:before { content: $thumbs-down-alt; }
.icon-star-half:before { content: $star-half; }
.icon-heart-empty:before { content: $heart-empty; }
.icon-signout:before { content: $signout; }
.icon-log-out:before { content: $log-out; }
.icon-linkedin-sign:before { content: $linkedin-sign; }
.icon-pushpin:before { content: $pushpin; }
.icon-external-link:before { content: $external-link; }
.icon-signin:before { content: $signin; }
.icon-log-in:before { content: $log-in; }
.icon-trophy:before { content: $trophy; }
.icon-github-sign:before { content: $github-sign; }
.icon-upload-alt:before { content: $upload-alt; }
.icon-lemon:before { content: $lemon; }
.icon-phone:before { content: $phone; }
.icon-unchecked:before,
.icon-check-empty:before { content: $check-empty; }
.icon-earphone:before { content: $earphone; }
.icon-unchecked:before { content: $unchecked; }
.icon-bookmark-empty:before { content: $bookmark-empty; }
.icon-phone-sign:before { content: $phone-sign; }
.icon-twitter:before { content: $twitter; }
@ -181,9 +180,8 @@
.icon-beaker:before { content: $beaker; }
.icon-cut:before { content: $cut; }
.icon-copy:before { content: $copy; }
.icon-paperclip:before,
.icon-paper-clip:before { content: $paper-clip; }
.icon-save:before { content: $save; }
.icon-paperclip:before { content: $paperclip; }
.icon-floppy-disk:before { content: $floppy-disk; }
.icon-sign-blank:before { content: $sign-blank; }
.icon-reorder:before { content: $reorder; }
.icon-list-ul:before { content: $list-ul; }
@ -214,7 +212,7 @@
.icon-dashboard:before { content: $dashboard; }
.icon-comment-alt:before { content: $comment-alt; }
.icon-comments-alt:before { content: $comments-alt; }
.icon-bolt:before { content: $bolt; }
.icon-flash:before { content: $flash; }
.icon-sitemap:before { content: $sitemap; }
.icon-umbrella:before { content: $umbrella; }
.icon-paste:before { content: $paste; }
@ -227,7 +225,7 @@
.icon-suitcase:before { content: $suitcase; }
.icon-bell-alt:before { content: $bell-alt; }
.icon-coffee:before { content: $coffee; }
.icon-food:before { content: $food; }
.icon-cutlery:before { content: $cutlery; }
.icon-file-text-alt:before { content: $file-text-alt; }
.icon-building:before { content: $building; }
.icon-hospital:before { content: $hospital; }
@ -248,7 +246,7 @@
.icon-desktop:before { content: $desktop; }
.icon-laptop:before { content: $laptop; }
.icon-tablet:before { content: $tablet; }
.icon-mobile-phone:before { content: $mobile-phone; }
.icon-phone:before { content: $phone; }
.icon-circle-blank:before { content: $circle-blank; }
.icon-quote-left:before { content: $quote-left; }
.icon-quote-right:before { content: $quote-right; }
@ -315,8 +313,8 @@
.icon-external-link-sign:before { content: $external-link-sign; }
.icon-share-sign:before { content: $share-sign; }
.icon-compass:before { content: $compass; }
.icon-collapse:before { content: $collapse; }
.icon-collapse-top:before { content: $collapse-top; }
.icon-collapse-down:before { content: $collapse-down; }
.icon-collapse-up:before { content: $collapse-up; }
.icon-expand:before { content: $expand; }
.icon-euro:before,
.icon-eur:before { content: $eur; }
@ -325,10 +323,10 @@
.icon-usd:before { content: $usd; }
.icon-rupee:before,
.icon-inr:before { content: $inr; }
.icon-cny:before,
.icon-rmb:before,
.icon-yen:before,
.icon-jpy:before { content: $jpy; }
.icon-renminbi:before,
.icon-cny:before { content: $cny; }
.icon-won:before,
.icon-krw:before { content: $krw; }
.icon-bitcoin:before,
@ -349,7 +347,7 @@
.icon-xing-sign:before { content: $xing-sign; }
.icon-youtube-play:before { content: $youtube-play; }
.icon-dropbox:before { content: $dropbox; }
.icon-stackexchange:before { content: $stackexchange; }
.icon-stackoverflow:before { content: $stackoverflow; }
.icon-instagram:before { content: $instagram; }
.icon-flickr:before { content: $flickr; }
.icon-adn:before { content: $adn; }

View file

@ -7,12 +7,14 @@
}
@mixin icon-FontAwesome() {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em; // fixes ie7 issues
font-family: FontAwesome;
-webkit-font-smoothing: antialiased;
font-style: normal;
font-weight: normal;
text-decoration: inherit;
text-rendering: auto;
-moz-osx-font-smoothing: grayscale;
}
@mixin border-radius($radius) {
@ -31,14 +33,14 @@
vertical-align: -35%;
[class^="icon-"],
[class*=" icon-"] {
display: block;
text-align: center;
position: absolute;
display: block;
width: 100%;
height: 100%;
font-size: $top-font-size;
line-height: inherit;
*line-height: $height;
text-align: center;
}
.icon-stack-base {
font-size: $base-font-size;

View file

@ -7,7 +7,7 @@
src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}') format('embedded-opentype'),
url('#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}') format('woff'),
url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'),
url('#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}') format('svg');
url('#{$FontAwesomePath}/fontawesome-webfont.svg?v=#{$FontAwesomeVersion}#fontawesomeregular') format('svg');
// src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal;
font-style: normal;

View file

@ -272,7 +272,7 @@ $star-half: "\f089";
$heart-empty: "\f08a";
$signout: "\f08b";
$log-out: "\f08b";
$linkedin-sign: "\f08c";
@ -280,7 +280,7 @@ $pushpin: "\f08d";
$external-link: "\f08e";
$signin: "\f090";
$log-in: "\f090";
$trophy: "\f091";
@ -290,9 +290,9 @@ $upload-alt: "\f093";
$lemon: "\f094";
$phone: "\f095";
$earphone: "\f095";
$check-empty: "\f096";
$unchecked: "\f096";
$bookmark-empty: "\f097";
@ -314,7 +314,7 @@ $hdd: "\f0a0";
$bullhorn: "\f0a1";
$bell: "\f0a2";
$bell: "\f0f3";
$certificate: "\f0a3";
@ -358,9 +358,9 @@ $cut: "\f0c4";
$copy: "\f0c5";
$paper-clip: "\f0c6";
$paperclip: "\f0c6";
$save: "\f0c7";
$floppy-disk: "\f0c7";
$sign-blank: "\f0c8";
@ -420,7 +420,7 @@ $comment-alt: "\f0e5";
$comments-alt: "\f0e6";
$bolt: "\f0e7";
$flash: "\f0e7";
$sitemap: "\f0e8";
@ -442,11 +442,11 @@ $stethoscope: "\f0f1";
$suitcase: "\f0f2";
$bell-alt: "\f0f3";
$bell-alt: "\f0a2";
$coffee: "\f0f4";
$food: "\f0f5";
$cutlery: "\f0f5";
$file-text-alt: "\f0f6";
@ -488,7 +488,7 @@ $laptop: "\f109";
$tablet: "\f10a";
$mobile-phone: "\f10b";
$phone: "\f10b";
$circle-blank: "\f10c";
@ -618,9 +618,9 @@ $share-sign: "\f14d";
$compass: "\f14e";
$collapse: "\f150";
$collapse-down: "\f150";
$collapse-top: "\f151";
$collapse-up: "\f151";
$expand: "\f152";
@ -634,8 +634,6 @@ $inr: "\f156";
$jpy: "\f157";
$cny: "\f158";
$krw: "\f159";
$btc: "\f15a";
@ -672,7 +670,7 @@ $youtube-play: "\f16a";
$dropbox: "\f16b";
$stackexchange: "\f16c";
$stackoverflow: "\f16c";
$instagram: "\f16d";

View file

@ -25,22 +25,22 @@
*/
.icon-large {
font-size: (4em/3);
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
font-size: (4em/3);
vertical-align: middle;
}
.nav {
[class^="icon-"],
[class*=" icon-"] {
vertical-align: inherit;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
vertical-align: inherit;
&.icon-large {
vertical-align: -25%;
}
@ -51,11 +51,11 @@
[class^="icon-"],
[class*=" icon-"] {
&.icon-large {
line-height: .75em;
margin-top: -7px;
padding-top: 5px;
margin-bottom: -5px;
padding-bottom: 4px;
margin-top: -7px;
margin-bottom: -5px;
line-height: .75em;
}
}
}
@ -753,7 +753,7 @@ a [class*=" icon-"] {
}
.icon-signout {
.icon-log-out {
@include ie7icon('');
}
@ -773,7 +773,7 @@ a [class*=" icon-"] {
}
.icon-signin {
.icon-log-in {
@include ie7icon('');
}
@ -798,15 +798,11 @@ a [class*=" icon-"] {
}
.icon-phone {
.icon-earphone {
@include ie7icon('');
}
.icon-check-empty {
@include ie7icon('');
}
.icon-unchecked {
@include ie7icon('');
}
@ -863,7 +859,7 @@ a [class*=" icon-"] {
.icon-bell {
@include ie7icon('');
@include ie7icon('');
}
@ -972,16 +968,12 @@ a [class*=" icon-"] {
}
.icon-paper-clip {
@include ie7icon('');
}
.icon-paperclip {
@include ie7icon('');
}
.icon-save {
.icon-floppy-disk {
@include ie7icon('');
}
@ -1135,7 +1127,7 @@ a [class*=" icon-"] {
}
.icon-bolt {
.icon-flash {
@include ie7icon('');
}
@ -1191,7 +1183,7 @@ a [class*=" icon-"] {
.icon-bell-alt {
@include ie7icon('');
@include ie7icon('');
}
@ -1200,7 +1192,7 @@ a [class*=" icon-"] {
}
.icon-food {
.icon-cutlery {
@include ie7icon('');
}
@ -1305,7 +1297,7 @@ a [class*=" icon-"] {
}
.icon-mobile-phone {
.icon-phone {
@include ie7icon('');
}
@ -1638,12 +1630,12 @@ a [class*=" icon-"] {
}
.icon-collapse {
.icon-collapse-down {
@include ie7icon('');
}
.icon-collapse-top {
.icon-collapse-up {
@include ie7icon('');
}
@ -1689,17 +1681,16 @@ a [class*=" icon-"] {
@include ie7icon('');
}
.icon-yen {
.icon-cny {
@include ie7icon('');
}
.icon-cny {
@include ie7icon('');
.icon-rmb {
@include ie7icon('');
}
.icon-renminbi {
@include ie7icon('');
.icon-yen {
@include ie7icon('');
}
@ -1801,7 +1792,7 @@ a [class*=" icon-"] {
}
.icon-stackexchange {
.icon-stackoverflow {
@include ie7icon('');
}

View file

@ -100,6 +100,6 @@
<![endif]-->
{% endhighlight %}
</li>
<li>Go complain to whoever decided your project needs IE7 support.</li>
<li>Go complain to whomever decided your project needs IE7 support.</li>
</ol>
</section>

View file

@ -42,7 +42,7 @@ relative_path: ../../
<section>
<div class="row-fluid">
<div class="span9">
<p>After you get <a href="{{ page.relative_path }}integration/">up and running</a>, you can place Font Awesome icons just about anywhere with the <code>&lt;i&gt;</code> tag:</p>
<p>After you get <a href="{{ page.relative_path }}get-started/">up and running</a>, you can place Font Awesome icons just about anywhere with the <code>&lt;i&gt;</code> tag:</p>
<div class="well well-transparent">
<div style="font-size: 24px; line-height: 1.5em;">
<i class="icon-{{ page.icon.id }}"></i> icon-{{ page.icon.id }}

View file

@ -7,12 +7,12 @@
display: inline;
width: auto;
height: auto;
margin-top: 0;
line-height: normal;
vertical-align: baseline;
background-image: none;
background-position: 0% 0%;
background-position: 0 0;
background-repeat: repeat;
margin-top: 0;
}
/* more sprites.less reset */

View file

@ -8,15 +8,15 @@
[class^="icon-"]:before,
[class*=" icon-"]:before {
text-decoration: inherit;
display: inline-block;
text-decoration: inherit;
speak: none;
}
/* makes the font 33% larger relative to the icon container */
.icon-large:before {
font-size: (4em / 3);
vertical-align: -10%;
font-size: 4/3em;
}
/* makes sure icons active on rollover in links */
@ -32,16 +32,17 @@ a {
[class*=" icon-"] {
&.icon-fixed-width {
display: inline-block;
width: 16/14em;
width: (16em / 14);
padding-right: (4em / 14);
text-align: right;
padding-right: 4/14em;
&.icon-large {
width: 20/14em;
width: (20em / 14);
}
}
}
.icons-ul {
padding-left: 0;
margin-left: @icons-li-width;
list-style-type: none;
@ -51,8 +52,8 @@ a {
position: absolute;
left: -@icons-li-width;
width: @icons-li-width;
text-align: center;
line-height: inherit;
text-align: center;
}
}
@ -72,8 +73,8 @@ a {
// -------------------------
.icon-border {
border: solid 1px @borderColor;
padding: .2em .25em .15em;
border: solid 1px @borderColor;
.border-radius(3px);
}

View file

@ -7,9 +7,9 @@
/* Animated rotating icon */
.icon-spin {
display: inline-block;
-webkit-animation: spin 2s infinite linear;
-moz-animation: spin 2s infinite linear;
-o-animation: spin 2s infinite linear;
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
@ -43,30 +43,30 @@ a .icon-spin {
/* Icon rotations and mirroring */
.icon-rotate-90:before {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-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 {

View file

@ -3,22 +3,22 @@
{% include license-code.less %}
.icon-large {
font-size: 4/3em;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
font-size: (4em / 3);
vertical-align: middle;
}
.nav {
[class^="icon-"],
[class*=" icon-"] {
vertical-align: inherit;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
vertical-align: inherit;
&.icon-large {
vertical-align: -25%;
}
@ -29,11 +29,11 @@
[class^="icon-"],
[class*=" icon-"] {
&.icon-large {
line-height: .75em;
margin-top: -7px;
padding-top: 5px;
margin-bottom: -5px;
padding-bottom: 4px;
margin-top: -7px;
margin-bottom: -5px;
line-height: .75em;
}
}
}

View file

@ -7,12 +7,14 @@
}
.icon-FontAwesome() {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em; // fixes ie7 issues
font-family: FontAwesome;
-webkit-font-smoothing: antialiased;
font-style: normal;
font-weight: normal;
text-decoration: inherit;
text-rendering: auto;
-moz-osx-font-smoothing: grayscale;
}
.border-radius(@radius) {
@ -31,18 +33,18 @@
vertical-align: -35%;
[class^="icon-"],
[class*=" icon-"] {
display: block;
text-align: center;
position: absolute;
display: block;
width: 100%;
height: 100%;
font-size: @top-font-size;
line-height: inherit;
*line-height: @height;
text-align: center;
}
.icon-stack-base {
font-size: @base-font-size;
*line-height: @height / @base-font-size;
*line-height: (@height / @base-font-size);
}
}
}

View file

@ -7,7 +7,7 @@
src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg');
// src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal;
font-style: normal;

View file

@ -10,7 +10,7 @@
@iconMuted: #eee;
@iconLight: #fff;
@iconDark: #333;
@icons-li-width: 30/14em;
@icons-li-width: (30em / 14);
{% for icon in icons %}
@{{ icon.id }}: "\{{ icon.unicode }}";

View file

@ -7,12 +7,12 @@
display: inline;
width: auto;
height: auto;
margin-top: 0;
line-height: normal;
vertical-align: baseline;
background-image: none;
background-position: 0% 0%;
background-position: 0 0;
background-repeat: repeat;
margin-top: 0;
}
/* more sprites.less reset */

View file

@ -8,15 +8,15 @@
[class^="icon-"]:before,
[class*=" icon-"]:before {
text-decoration: inherit;
display: inline-block;
text-decoration: inherit;
speak: none;
}
/* makes the font 33% larger relative to the icon container */
.icon-large:before {
vertical-align: -10%;
font-size: (4em/3);
vertical-align: -10%;
}
/* makes sure icons active on rollover in links */
@ -33,8 +33,8 @@ a {
&.icon-fixed-width {
display: inline-block;
width: (16em/14);
text-align: right;
padding-right: (4em/14);
text-align: right;
&.icon-large {
width: (20em/14);
}
@ -42,6 +42,7 @@ a {
}
.icons-ul {
padding-left: 0;
margin-left: $icons-li-width;
list-style-type: none;
@ -51,8 +52,8 @@ a {
position: absolute;
left: -$icons-li-width;
width: $icons-li-width;
text-align: center;
line-height: inherit;
text-align: center;
}
}
@ -72,8 +73,8 @@ a {
// -------------------------
.icon-border {
border: solid 1px $borderColor;
padding: .2em .25em .15em;
border: solid 1px $borderColor;
@include border-radius(3px);
}

View file

@ -7,9 +7,9 @@
/* Animated rotating icon */
.icon-spin {
display: inline-block;
-webkit-animation: spin 2s infinite linear;
-moz-animation: spin 2s infinite linear;
-o-animation: spin 2s infinite linear;
-webkit-animation: spin 2s infinite linear;
animation: spin 2s infinite linear;
}
@ -43,30 +43,30 @@ a .icon-spin {
/* Icon rotations and mirroring */
.icon-rotate-90:before {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
-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 {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
-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 {

View file

@ -7,12 +7,14 @@
}
@mixin icon-FontAwesome() {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em; // fixes ie7 issues
font-family: FontAwesome;
-webkit-font-smoothing: antialiased;
font-style: normal;
font-weight: normal;
text-decoration: inherit;
text-rendering: auto;
-moz-osx-font-smoothing: grayscale;
}
@mixin border-radius($radius) {
@ -31,14 +33,14 @@
vertical-align: -35%;
[class^="icon-"],
[class*=" icon-"] {
display: block;
text-align: center;
position: absolute;
display: block;
width: 100%;
height: 100%;
font-size: $top-font-size;
line-height: inherit;
*line-height: $height;
text-align: center;
}
.icon-stack-base {
font-size: $base-font-size;

View file

@ -7,7 +7,7 @@
src: url('#{$FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=#{$FontAwesomeVersion}') format('embedded-opentype'),
url('#{$FontAwesomePath}/fontawesome-webfont.woff?v=#{$FontAwesomeVersion}') format('woff'),
url('#{$FontAwesomePath}/fontawesome-webfont.ttf?v=#{$FontAwesomeVersion}') format('truetype'),
url('#{$FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=#{$FontAwesomeVersion}') format('svg');
url('#{$FontAwesomePath}/fontawesome-webfont.svg?v=#{$FontAwesomeVersion}#fontawesomeregular') format('svg');
// src: url('#{$FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal;
font-style: normal;

View file

@ -3,22 +3,22 @@
{% include license-code.less %}
.icon-large {
font-size: (4em/3);
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
font-size: (4em/3);
vertical-align: middle;
}
.nav {
[class^="icon-"],
[class*=" icon-"] {
vertical-align: inherit;
margin-top: -4px;
padding-top: 3px;
margin-bottom: -4px;
padding-bottom: 3px;
margin-top: -4px;
margin-bottom: -4px;
vertical-align: inherit;
&.icon-large {
vertical-align: -25%;
}
@ -29,11 +29,11 @@
[class^="icon-"],
[class*=" icon-"] {
&.icon-large {
line-height: .75em;
margin-top: -7px;
padding-top: 5px;
margin-bottom: -5px;
padding-bottom: 4px;
margin-top: -7px;
margin-bottom: -5px;
line-height: .75em;
}
}
}

View file

@ -934,8 +934,8 @@ icons:
categories:
- Web Application Icons
- name: signout
id: signout
- name: Log out
id: log-out
unicode: f08b
created: 1.0
categories:
@ -963,8 +963,8 @@ icons:
- Web Application Icons
- name: signin
id: signin
- name: Log in
id: log-in
unicode: f090
created: 1.0
categories:
@ -998,19 +998,17 @@ icons:
categories:
- Web Application Icons
- name: phone
id: phone
- name: earphone
id: earphone
unicode: f095
created: 2.0
categories:
- Web Application Icons
- name: check-empty
id: check-empty
- name: unchecked
id: unchecked
unicode: f096
created: 2.0
aliases:
- unchecked
categories:
- Web Application Icons
@ -1087,7 +1085,7 @@ icons:
- name: bell
id: bell
unicode: f0a2
unicode: f0f3
created: 2.0
categories:
- Web Application Icons
@ -1241,17 +1239,15 @@ icons:
categories:
- Text Editor Icons
- name: paper-clip
id: paper-clip
- name: paperclip
id: paperclip
unicode: f0c6
created: 2.0
aliases:
- paperclip
categories:
- Text Editor Icons
- name: save
id: save
- name: Floppy Disk
id: floppy-disk
unicode: f0c7
created: 2.0
categories:
@ -1465,8 +1461,8 @@ icons:
categories:
- Web Application Icons
- name: bolt
id: bolt
- name: flash
id: flash
unicode: f0e7
created: 2.0
categories:
@ -1545,7 +1541,7 @@ icons:
- name: bell-alt
id: bell-alt
unicode: f0f3
unicode: f0a2
created: 3.0
categories:
- Web Application Icons
@ -1557,8 +1553,8 @@ icons:
categories:
- Web Application Icons
- name: food
id: food
- name: cutlery
id: cutlery
unicode: f0f5
created: 3.0
categories:
@ -1706,8 +1702,8 @@ icons:
categories:
- Web Application Icons
- name: mobile-phone
id: mobile-phone
- name: phone
id: phone
unicode: f10b
created: 3.0
categories:
@ -2171,15 +2167,15 @@ icons:
- Web Application Icons
- name: Collapse
id: collapse
- name: Collapse Down
id: collapse-down
unicode: f150
created: 3.2
categories:
- Web Application Icons
- name: Collapse Top
id: collapse-top
- name: Collapse Up
id: collapse-up
unicode: f151
created: 3.2
categories:
@ -2231,19 +2227,12 @@ icons:
unicode: f157
created: 3.2
aliases:
- cny
- rmb
- yen
categories:
- Currency Icons
- name: Renminbi (CNY)
id: cny
unicode: f158
created: 3.2
aliases:
- renminbi
categories:
- Currency Icons
- name: Korean Won (KRW)
id: krw
unicode: f159
@ -2378,8 +2367,8 @@ icons:
categories:
- Brand Icons
- name: Stack Exchange
id: stackexchange
- name: Stack Overflow
id: stackoverflow
unicode: f16c
created: 3.2
categories:

View file

@ -352,6 +352,45 @@ relative_path: ../
</div>
</div>
<h3>Button groups <small>should be same height</small></h3>
<div class="row">
<div class="span4">
<div style="border: solid 1px #d3d3d3;">
<div class="btn-group">
<button class="btn btn-large">
<i class="icon-adjust"></i>
</button>
<button class="btn btn-large">
Text
</button>
</div>
</div>
</div>
<div class="span4">
<div style="border: solid 1px #d3d3d3;">
<div class="btn-group">
<button class="btn">
<i class="icon-adjust"></i>
</button>
<button class="btn">
Text
</button>
</div>
</div>
</div>
<div class="span4">
<div style="border: solid 1px #d3d3d3;">
<div class="btn-group">
<button class="btn btn-small">
<i class="icon-adjust"></i>
</button>
<button class="btn btn-small">
Text
</button>
</div>
</div>
</div>
</div>
<h3>Buttons with pulled 2x, 3x, 4x <small>should be same height, have correct line height</small></h3>
<div class="row">