diff --git a/source/fonts/fontawesome-webfont.afm b/source/fonts/fontawesome-webfont.afm new file mode 100644 index 0000000..99b84f0 --- /dev/null +++ b/source/fonts/fontawesome-webfont.afm @@ -0,0 +1,44 @@ +StartFontMetrics 2.0 +Comment Generated by FontForge 20110222 +Comment Creation Date: Sat Jan 5 16:32:52 2013 +FontName fontawesome +FullName fontawesome +FamilyName fontawesome +Weight Book +Notice (Copyright 2013 Adobe Systems Incorporated. All rights reserved.) +ItalicAngle 0 +IsFixedPitch false +UnderlinePosition -89 +UnderlineThickness 90 +Version 1.00 2012 +EncodingScheme ISO10646-1 +FontBBox 0 -144 1072 858 +Descender -2147483648 +StartCharMetrics 25 +C -1 ; WX 1000 ; N envelope ; B 0 -72 1000 715 ; +C -1 ; WX 928 ; N star ; B 0 -47 929 840 ; +C -1 ; WX 785 ; N user ; B 0 -72 786 786 ; +C -1 ; WX 785 ; N trash ; B 0 -72 786 786 ; +C -1 ; WX 928 ; N download_alt ; B 0 -72 929 715 ; +C -1 ; WX 857 ; N inbox ; B 0 0 858 715 ; +C -1 ; WX 642 ; N lock ; B 0 0 643 786 ; +C -1 ; WX 785 ; N qrcode ; B 0 0 786 786 ; +C -1 ; WX 1000 ; N edit ; B 0 0 996 786 ; +C -1 ; WX 1000 ; N comment ; B 0 -144 1000 715 ; +C -1 ; WX 1000 ; N key ; B 0 -103 940 786 ; +C -1 ; WX 1000 ; N comments ; B 0 -72 1000 715 ; +C -1 ; WX 857 ; N github_sign ; B 0 -72 858 786 ; +C -1 ; WX 928 ; N upload_alt ; B 0 -72 929 750 ; +C -1 ; WX 1071 ; N twitter ; B 0 -72 1047 786 ; +C -1 ; WX 857 ; N github ; B 0 -72 858 786 ; +C -1 ; WX 785 ; N rss ; B 0 0 786 786 ; +C -1 ; WX 857 ; N circle_arrow_left ; B 0 -72 858 786 ; +C -1 ; WX 857 ; N globe ; B 0 -72 858 786 ; +C -1 ; WX 1071 ; N group ; B 0 -143 1072 858 ; +C -1 ; WX 1071 ; N cloud ; B 0 0 1072 786 ; +C -1 ; WX 928 ; N google_plus ; B 0 -143 929 786 ; +C -1 ; WX 1000 ; N envelope_alt ; B 0 -72 1000 715 ; +C -1 ; WX 1000 ; N comment_alt ; B 0 -143 1000 715 ; +C -1 ; WX 928 ; N github_alt ; B 0 -72 929 715 ; +EndCharMetrics +EndFontMetrics diff --git a/source/stylesheets/fontawesome-ie7.css b/source/stylesheets/fontawesome-ie7.css index 23eef26..d8c34a1 100644 --- a/source/stylesheets/fontawesome-ie7.css +++ b/source/stylesheets/fontawesome-ie7.css @@ -1,26 +1,25 @@ -/* Font Awesome 3.0 - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ +/*! + * Font Awesome 3.0.2 + * the iconic font designed for use with Twitter Bootstrap + * ------------------------------------------------------- + * The full suite of pictographic icons, examples, and documentation + * can be found at: http://fortawesome.github.com/Font-Awesome/ + * + * License + * ------------------------------------------------------- + * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL + * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + * http://opensource.org/licenses/mit-license.html + * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: + * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - License - ------------------------------------------------------- - • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - - http://opensource.org/licenses/mit-license.html - • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ - • Attribution is no longer required in Font Awesome 3.0, but much appreciated: - "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ -[class^="icon-"],[class*=" icon-"]{padding-right:.3em}.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:-20%}.btn [class^="icon-"],.nav [class^="icon-"],.btn [class*=" icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;line-height:.9em}a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}ul.icons{text-indent:-1.5em;margin-left:3em}.icon-envelope { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } + * Contact + * ------------------------------------------------------- + * Email: dave@davegandy.com + * Twitter: http://twitter.com/fortaweso_me + * Work: Lead Product Designer @ http://kyruus.com + */.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}.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}ul.icons{text-indent:-1.5em;margin-left:3em}.icon-envelope { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-star { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-trash { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } @@ -30,6 +29,7 @@ .icon-qrcode { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-edit { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-comment { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } +.icon-retweet { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-key { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-comments { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-github-sign { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } @@ -37,7 +37,6 @@ .icon-twitter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-github { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-rss { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } -.icon-circle-arrow-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-globe { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } .icon-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); } diff --git a/source/stylesheets/fontawesome.css.scss b/source/stylesheets/fontawesome.css.scss index 39edc12..24b9a97 100644 --- a/source/stylesheets/fontawesome.css.scss +++ b/source/stylesheets/fontawesome.css.scss @@ -1,27 +1,27 @@ -/* Font Awesome 3.0 - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ +/*! + * Font Awesome 3.0.2 + * the iconic font designed for use with Twitter Bootstrap + * ------------------------------------------------------- + * The full suite of pictographic icons, examples, and documentation + * can be found at: http://fortawesome.github.com/Font-Awesome/ + * + * License + * ------------------------------------------------------- + * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL + * - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - + * http://opensource.org/licenses/mit-license.html + * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ + * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: + * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" + * + * Contact + * ------------------------------------------------------- + * Email: dave@davegandy.com + * Twitter: http://twitter.com/fortaweso_me + * Work: Lead Product Designer @ http://kyruus.com + */ - License - ------------------------------------------------------- - • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - - http://opensource.org/licenses/mit-license.html - • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ - • Attribution is no longer required in Font Awesome 3.0, but much appreciated: - "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ - -$fontAwesomePath: "../fonts" !default; +$fontAwesomePath: "" !default; $borderColor: #eee; $iconMuted: #eee; @mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; } @@ -29,31 +29,51 @@ $iconMuted: #eee; @font-face { font-family: 'FontAwesome'; - src: url('#{$fontAwesomePath}/fontawesome-webfont.eot'); - src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix') format("embedded-opentype"), - url('#{$fontAwesomePath}/fontawesome-webfont.woff') format("woff"), - url('#{$fontAwesomePath}/fontawesome-webfont.ttf') format("truetype"); + src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?v=3.0.1'); + src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format("embedded-opentype"), + url('#{$fontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format("woff"), + url('#{$fontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format("truetype"); font-weight: normal; font-style: normal; } /* Font Awesome styles ------------------------------------------------------- */ -/* includes sprites.less reset */ [class^="icon-"], [class*=" icon-"] { font-family: FontAwesome; font-weight: normal; font-style: normal; text-decoration: inherit; + -webkit-font-smoothing: antialiased; + + /* sprites.less reset */ display: inline; width: auto; height: auto; line-height: normal; vertical-align: baseline; - background-image: none !important; + background-image: none; background-position: 0% 0%; background-repeat: repeat; + margin-top: 0; +} + +/* more sprites.less reset */ +.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; } [class^="icon-"]:before, @@ -82,14 +102,20 @@ a { [class*=" icon-"] { display: inline; /* keeps button heights with and without icons the same */ - line-height: .6em; - &.icon-spin { - display: inline-block; - } + &.icon-large { line-height: .9em; } + &.icon-spin { display: inline-block; } } } -li { +.nav-tabs, .nav-pills { + [class^="icon-"], + [class*=" icon-"] { + /* keeps button heights with and without icons the same */ + &, &.icon-large { line-height: .9em; } + } +} + +li, .nav li { [class^="icon-"], [class*=" icon-"] { display: inline-block; @@ -97,7 +123,7 @@ li { text-align: center; &.icon-large { /* increased font size for icon-large */ - width: 1.25*1.25em; + width: 1.5625em; } } } @@ -162,10 +188,10 @@ ul.icons { [class^="icon-"], [class*=" icon-"] { &.pull-left { - margin-right: .35em; + margin-right: .3em; } &.pull-right { - margin-left: .35em; + margin-left: .3em; } } @@ -173,9 +199,9 @@ ul.icons { [class^="icon-"], [class*=" icon-"] { &.pull-left, &.pull-right { - &.icon-2x { margin-top: .35em; } + &.icon-2x { margin-top: .18em; } } - &.icon-spin.icon-large { height: .75em; } + &.icon-spin.icon-large { line-height: .8em; } } } @@ -183,7 +209,7 @@ ul.icons { [class^="icon-"], [class*=" icon-"] { &.pull-left, &.pull-right { - &.icon-2x { margin-top: .45em; } + &.icon-2x { margin-top: .25em; } } } } @@ -191,9 +217,12 @@ ul.icons { .btn.btn-large { [class^="icon-"], [class*=" icon-"] { + margin-top: 0; // overrides bootstrap default &.pull-left, &.pull-right { - &.icon-2x { margin-top: .2em; } + &.icon-2x { margin-top: .05em; } } + &.pull-left.icon-2x { margin-right: .2em; } + &.pull-right.icon-2x { margin-left: .2em; } } } @@ -226,235 +255,13 @@ ul.icons { 0% { transform: rotate(0deg); } 100% { transform: rotate(359deg); } } -/* Font Awesome 3.0 - the iconic font designed for use with Twitter Bootstrap - ------------------------------------------------------- - The full suite of pictographic icons, examples, and documentation - can be found at: http://fortawesome.github.com/Font-Awesome/ - License - ------------------------------------------------------- - • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL - • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License - - http://opensource.org/licenses/mit-license.html - • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/ - • Attribution is no longer required in Font Awesome 3.0, but much appreciated: - "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome" - - Contact - ------------------------------------------------------- - Email: dave@davegandy.com - Twitter: http://twitter.com/fortaweso_me - Work: Lead Product Designer @ http://kyruus.com - - */ - -$fontAwesomePath: "../font" !default; -$borderColor: #eee; -$iconMuted: #eee; -@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; } - - -@font-face { - font-family: 'FontAwesome'; - src: url('#{$fontAwesomePath}/fontawesome-webfont.eot'); - src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix') format("embedded-opentype"), - url('#{$fontAwesomePath}/fontawesome-webfont.woff') format("woff"), - url('#{$fontAwesomePath}/fontawesome-webfont.ttf') format("truetype"); - font-weight: normal; - font-style: normal; -} - -/* Font Awesome styles - ------------------------------------------------------- */ -/* includes sprites.less reset */ -[class^="icon-"], -[class*=" icon-"] { - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - display: inline; - width: auto; - height: auto; - line-height: normal; - vertical-align: baseline; - background-image: none !important; - background-position: 0% 0%; - background-repeat: repeat; -} - -[class^="icon-"]:before, -[class*=" icon-"]:before { - text-decoration: inherit; - display: inline-block; - speak: none; -} - -/* makes sure icons active on rollover in links */ -a { - [class^="icon-"], - [class*=" icon-"] { - display: inline-block; - } -} - -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: -10%; - font-size: 1.3333333333333333em; -} - -.btn, .nav { - [class^="icon-"], - [class*=" icon-"] { - display: inline; - /* keeps button heights with and without icons the same */ - line-height: .6em; - &.icon-spin { - display: inline-block; - } - } -} - -li { - [class^="icon-"], - [class*=" icon-"] { - display: inline-block; - width: 1.25em; - text-align: center; - &.icon-large { - /* increased font size for icon-large */ - width: 1.25*1.25em; - } - } -} - -ul.icons { - list-style-type: none; - text-indent: -.75em; - - li { - [class^="icon-"], - [class*=" icon-"] { - width: .75em; - } - } -} - -.icon-muted { - color: $iconMuted; -} - -// Icon Borders -// ------------------------- - -.icon-border { - border: solid 1px $borderColor; - padding: .2em .25em .15em; - @include border-radius(3px); -} - -// Icon Sizes -// ------------------------- - -.icon-2x { - font-size: 2em; - &.icon-border { - border-width: 2px; - @include border-radius(4px); - } -} -.icon-3x { - font-size: 3em; - &.icon-border { - border-width: 3px; - @include border-radius(5px); - } -} -.icon-4x { - font-size: 4em; - &.icon-border { - border-width: 4px; - @include border-radius(6px); - } -} - -// Floats -// ------------------------- - -// Quick floats -.pull-right { float: right; } -.pull-left { float: left; } - -[class^="icon-"], -[class*=" icon-"] { - &.pull-left { - margin-right: .35em; - } - &.pull-right { - margin-left: .35em; - } -} - -.btn { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .35em; } - } - &.icon-spin.icon-large { height: .75em; } - } -} - -.btn.btn-small { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .45em; } - } - } -} - -.btn.btn-large { - [class^="icon-"], - [class*=" icon-"] { - &.pull-left, &.pull-right { - &.icon-2x { margin-top: .2em; } - } - } -} - - -.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; -} - -@-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-envelope:before { content: "\f003"; } +@-moz-document url-prefix() { + .icon-spin { height: .9em; } + .btn .icon-spin { height: auto; } + .icon-spin.icon-large { height: 1.25em; } + .btn .icon-spin.icon-large { height: .75em; } +}.icon-envelope:before { content: "\f003"; } .icon-star:before { content: "\f005"; } .icon-user:before { content: "\f007"; } .icon-trash:before { content: "\f014"; } @@ -464,6 +271,7 @@ ul.icons { .icon-qrcode:before { content: "\f029"; } .icon-edit:before { content: "\f044"; } .icon-comment:before { content: "\f075"; } +.icon-retweet:before { content: "\f079"; } .icon-key:before { content: "\f084"; } .icon-comments:before { content: "\f086"; } .icon-github-sign:before { content: "\f092"; } @@ -471,7 +279,6 @@ ul.icons { .icon-twitter:before { content: "\f099"; } .icon-github:before { content: "\f09b"; } .icon-rss:before { content: "\f09e"; } -.icon-circle-arrow-left:before { content: "\f0a8"; } .icon-globe:before { content: "\f0ac"; } .icon-group:before { content: "\f0c0"; } .icon-cloud:before { content: "\f0c2"; } diff --git a/source/stylesheets/site.css.scss b/source/stylesheets/site.css.scss index 8b8b839..1556c71 100644 --- a/source/stylesheets/site.css.scss +++ b/source/stylesheets/site.css.scss @@ -1,6 +1,7 @@ @import "compass"; @import "solarized"; @import "normalize"; +$fontAwesomePath: "../fonts"; @import "fontawesome"; //@import "compass-holmes"; // css-based debugging @import "susy";