add awesome font 3

This commit is contained in:
Jörg Thalheim 2013-01-03 18:05:46 +01:00
parent 13611f7ba3
commit 4e74951dea
12 changed files with 303 additions and 104 deletions

View File

@ -1,7 +1,7 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
activesupport (3.2.8) activesupport (3.2.10)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
chunky_png (1.2.6) chunky_png (1.2.6)
@ -17,34 +17,34 @@ GEM
compass (>= 0.11) compass (>= 0.11)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
ffi (1.1.5) ffi (1.2.0)
fssm (0.2.9) fssm (0.2.9)
haml (3.1.7) haml (3.1.7)
hike (1.2.1) hike (1.2.1)
http_router (0.10.2) http_router (0.10.2)
rack (>= 1.0.0) rack (>= 1.0.0)
url_mount (~> 0.2.1) url_mount (~> 0.2.1)
httpclient (2.2.7) httpclient (2.3.1)
i18n (0.6.1) i18n (0.6.1)
json (1.7.5) json (1.7.6)
listen (0.5.0) listen (0.5.3)
maruku (0.6.0) maruku (0.6.1)
syntax (>= 1.0.0) syntax (>= 1.0.0)
middleman (3.0.2) middleman (3.0.8.pre.2)
middleman-core (= 3.0.2) middleman-core (= 3.0.8.pre.2)
middleman-more (= 3.0.2) middleman-more (= 3.0.8.pre.2)
middleman-sprockets (~> 3.0.1) middleman-sprockets (~> 3.0.2)
middleman-core (3.0.2) middleman-core (3.0.8.pre.2)
activesupport (~> 3.2.6) activesupport (~> 3.2.6)
bundler (~> 1.1) bundler (~> 1.1)
listen (~> 0.5.0) listen (~> 0.5.2)
rack (~> 1.4.1) rack (~> 1.4.1)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
rb-fsevent (~> 0.9.1) rb-fsevent (~> 0.9.1)
rb-inotify (~> 0.8.8) rb-inotify (~> 0.8.8)
thor (~> 0.15.4) thor (~> 0.15.4)
tilt (~> 1.3.1) tilt (~> 1.3.1)
middleman-more (3.0.2) middleman-more (3.0.8.pre.2)
coffee-script (~> 2.2.0) coffee-script (~> 2.2.0)
coffee-script-source (~> 1.3.3) coffee-script-source (~> 1.3.3)
compass (>= 0.12.2) compass (>= 0.12.2)
@ -52,18 +52,18 @@ GEM
haml (>= 3.1.6) haml (>= 3.1.6)
i18n (~> 0.6.0) i18n (~> 0.6.0)
maruku (~> 0.6.0) maruku (~> 0.6.0)
middleman-core (= 3.0.2) middleman-core (= 3.0.8.pre.2)
padrino-helpers (= 0.10.7) padrino-helpers (= 0.10.7)
sass (>= 3.1.20) sass (>= 3.1.20)
uglifier (~> 1.2.6) uglifier (~> 1.2.6)
middleman-smusher (3.0.0) middleman-smusher (3.0.0)
middleman (>= 3.0.0) middleman (>= 3.0.0)
smusher (~> 0.4.9) smusher (~> 0.4.9)
middleman-sprockets (3.0.1) middleman-sprockets (3.0.6)
middleman-more (~> 3.0.1) middleman-more (>= 3.0.1)
sprockets (~> 2.1) sprockets (~> 2.1, < 2.5)
sprockets-sass (~> 0.8.0) sprockets-sass (~> 0.9.0)
multi_json (1.3.6) multi_json (1.5.0)
oily_png (1.0.2) oily_png (1.0.2)
chunky_png (~> 1.2.1) chunky_png (~> 1.2.1)
padrino-core (0.10.7) padrino-core (0.10.7)
@ -76,39 +76,39 @@ GEM
i18n (~> 0.6) i18n (~> 0.6)
padrino-core (= 0.10.7) padrino-core (= 0.10.7)
rack (1.4.1) rack (1.4.1)
rack-protection (1.2.0) rack-protection (1.3.2)
rack rack
rack-test (0.6.1) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rake (0.9.2.2) rake (10.0.3)
rb-fsevent (0.9.1) rb-fsevent (0.9.3)
rb-inotify (0.8.8) rb-inotify (0.8.8)
ffi (>= 0.5.0) ffi (>= 0.5.0)
sass (3.2.1) sass (3.2.4)
sinatra (1.3.3) sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6) rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2) rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
slim (1.3.0) slim (1.3.5)
temple (~> 0.4.1) temple (~> 0.5.5)
tilt (~> 1.3.3) tilt (~> 1.3.3)
smusher (0.4.9) smusher (0.4.9)
httpclient (>= 2.2) httpclient (>= 2.2)
json json
rake rake
sprockets (2.5.0) sprockets (2.4.5)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-sass (0.8.0) sprockets-sass (0.9.1)
sprockets (~> 2.0) sprockets (~> 2.0)
tilt (~> 1.1) tilt (~> 1.1)
susy (1.0) susy (1.0.5)
compass (>= 0.12.2) compass (>= 0.12.2)
sass (>= 3.2.0) sass (>= 3.2.0)
syntax (1.0.0) syntax (1.0.0)
temple (0.4.1) temple (0.5.5)
thor (0.15.4) thor (0.15.4)
tilt (1.3.3) tilt (1.3.3)
uglifier (1.2.7) uglifier (1.2.7)

View File

@ -21,8 +21,6 @@ task :deploy do
ok_failed system("rsync -avze 'ssh -p #{ssh_port}' #{exclude} #{"--delete" unless rsync_delete == false} #{public_dir}/ #{ssh_user}:#{document_root}") ok_failed system("rsync -avze 'ssh -p #{ssh_port}' #{exclude} #{"--delete" unless rsync_delete == false} #{public_dir}/ #{ssh_user}:#{document_root}")
end end
desc "Generate website and deploy" desc "Generate website and deploy"
task :gen_deploy => [:generate, :deploy] do task :gen_deploy => [:generate, :deploy] do
end end

View File

@ -1,5 +1,7 @@
nav nav
==link_to "Higgs-Boson", "/", :id => "sitelink", :title => "Startpage" a href="/" id="sitelink" title="Homepage"
' H
span B
ul ul
li li
==link_to "Impressum", "/impressum.html", :class => "navlink", :title => "Impressum" ==link_to "Impressum", "/impressum.html", :class => "navlink", :title => "Impressum"

BIN
source/fonts/fontawesome-webfont.eot Executable file → Normal file

Binary file not shown.

BIN
source/fonts/fontawesome-webfont.ttf Executable file → Normal file

Binary file not shown.

BIN
source/fonts/fontawesome-webfont.woff Executable file → Normal file

Binary file not shown.

View File

@ -1,2 +0,0 @@
!.gitignore

View File

@ -4,28 +4,36 @@ h2#pagesubtitle Where dreams become true
section section
ul#overview.icons ul#overview.icons
li li
i.icon-github i.icon-github.icon-3x
span
a href="http://git.higgsboson.tk/pub" title="Webinterface to our public git repos" Git Web a href="http://git.higgsboson.tk/pub" title="Webinterface to our public git repos" Git Web
li li
i.icon-upload i.icon-upload.icon-3x
span
a href="http://inbox.higgsboson.tk" title="An Uploader" Inbox a href="http://inbox.higgsboson.tk" title="An Uploader" Inbox
li li
i.icon-rss i.icon-rss.icon-3x
span
a href="http://blog.higgsboson.tk" title="My little Techblog" Blog a href="http://blog.higgsboson.tk" title="My little Techblog" Blog
li li
i.icon-edit i.icon-edit.icon-3x
span
a href="http://pad.higgsboson.tk" title="collaborative editing" Etherpad Lite a href="http://pad.higgsboson.tk" title="collaborative editing" Etherpad Lite
li li
i.icon-download i.icon-download.icon-3x
span
a href="http://ftp.higgsboson.tk" title="Some static files" Files a href="http://ftp.higgsboson.tk" title="Some static files" Files
li li
i.icon-trash i.icon-trash.icon-3x
span
a href="http://paste.higgsboson.tk" title="encrypted pastebin" Zerobin a href="http://paste.higgsboson.tk" title="encrypted pastebin" Zerobin
' or ' or
a href="http://phork.higgsboson.tk" title="gist clone" Phorkie a href="http://phork.higgsboson.tk" title="gist clone" Phorkie
li li
i.icon-qrcode i.icon-qrcode.icon-3x
span
a href="http://higgsboson.tk/qr" title="html5 qr-code generator" QR-Generator a href="http://higgsboson.tk/qr" title="html5 qr-code generator" QR-Generator
li li
i.icon-lock i.icon-lock.icon-3x
span
a href="/privat.html" title="Internal pages" Privat a href="/privat.html" title="Internal pages" Privat

View File

@ -8,12 +8,15 @@ div.span3
dt Email: dt Email:
dd.icon-envelope dd.icon-envelope
a rel="me" href="mailto:fake@example.com?cc=joerg@higgsboson.tk" joerg higgsboson.tk a rel="me" href="mailto:fake@example.com?cc=joerg@higgsboson.tk" joerg higgsboson.tk
br
dd.icon-key dd.icon-key
a rel="me" href="https://higgsboson.tk/joerg/joerg.asc" D7CC79FA a rel="me" href="https://higgsboson.tk/joerg/joerg.asc" D7CC79FA
' (PGP) ' (PGP)
br
dt Jabber: dt Jabber:
dd.icon-comment dd.icon-comment
a rel="me" href="xmpp:jthalheim@jabber.ccc.de" jthalheim@jabber.ccc.de a rel="me" href="xmpp:jthalheim@jabber.ccc.de" jthalheim@jabber.ccc.de
br
dt IRC: dt IRC:
dd.icon-comment-alt dd.icon-comment-alt
a rel="me" href="irc://irc.freenode.net/" Mic92 a rel="me" href="irc://irc.freenode.net/" Mic92
@ -24,11 +27,14 @@ div.span3
dt Microblogging: dt Microblogging:
dd.icon-twitter dd.icon-twitter
a rel="me" href="https://twitter.com/Mic_92" twitter.com/Mic_92 a rel="me" href="https://twitter.com/Mic_92" twitter.com/Mic_92
br
dd.icon-comments dd.icon-comments
a rel="me" href="https://identi.ca/mic92" identi.ca/mic92 a rel="me" href="https://identi.ca/mic92" identi.ca/mic92
br
dt Code: dt Code:
dd.icon-github dd.icon-github
a rel="me" href="https://github.com/Mic92" github.com/Mic92 a rel="me" href="https://github.com/Mic92" github.com/Mic92
br
dt Social: dt Social:
dd.icon-group dd.icon-group
a rel="me" href="https://pod.geraspora.de/u/jthalheim" jthalheim@pod.geraspora.de a rel="me" href="https://pod.geraspora.de/u/jthalheim" jthalheim@pod.geraspora.de
@ -41,6 +47,7 @@ div.span3_omega
dt Github Achievements: dt Github Achievements:
dd.icon-star dd.icon-star
a rel="me" href="http://coderwall.com/mic92" coderwall.com/mic92 a rel="me" href="http://coderwall.com/mic92" coderwall.com/mic92
br
dt Stackoverflow: dt Stackoverflow:
dd.icon-user dd.icon-user
a rel="me" href="http://stackoverflow.com/users/1061240/mic92" stackoverflow.com/users/1061240 a rel="me" href="http://stackoverflow.com/users/1061240/mic92" stackoverflow.com/users/1061240

View File

@ -1,4 +1,4 @@
/* Font Awesome /* Font Awesome 3.0
the iconic font designed for use with Twitter Bootstrap the iconic font designed for use with Twitter Bootstrap
------------------------------------------------------- -------------------------------------------------------
The full suite of pictographic icons, examples, and documentation The full suite of pictographic icons, examples, and documentation
@ -6,13 +6,12 @@
License License
------------------------------------------------------- -------------------------------------------------------
The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
http://creativecommons.org/licenses/by/3.0/ A mention of Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable http://opensource.org/licenses/mit-license.html
source code is considered acceptable attribution (most common on the web). The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
If human readable source code is not available to the end user, a mention in Attribution is no longer required in Font Awesome 3.0, but much appreciated:
an 'About' or 'Credits' screen is considered acceptable (most common in desktop "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
or mobile software).
Contact Contact
------------------------------------------------------- -------------------------------------------------------
@ -22,47 +21,71 @@
*/ */
@import "compass/css3/font-face"; $fontAwesomePath: "../fonts" !default;
$fontAwesomePath: "fontawesome-webfont" !default; $borderColor: #eee;
$iconMuted: #eee;
@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; }
@include font-face(
'FontAwesome', @font-face {
font-files( font-family: 'FontAwesome';
"#{$fontAwesomePath}.woff", woff, src: url('#{$fontAwesomePath}/fontawesome-webfont.eot');
"#{$fontAwesomePath}.ttf", truetype, src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix') format("embedded-opentype"),
"#{$fontAwesomePath}.svg#FontAwesome", svg), url('#{$fontAwesomePath}/fontawesome-webfont.woff') format("woff"),
'#{$fontAwesomePath}.eot', url('#{$fontAwesomePath}/fontawesome-webfont.ttf') format("truetype");
normal, font-weight: normal;
normal); font-style: normal;
}
/* Font Awesome styles /* Font Awesome styles
------------------------------------------------------- */ ------------------------------------------------------- */
[class^="icon-"]:before, /* includes sprites.less reset */
[class*=" icon-"]:before { [class^="icon-"],
[class*=" icon-"] {
font-family: FontAwesome; font-family: FontAwesome;
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
display: inline-block;
text-decoration: inherit; 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;
} }
a [class^="icon-"], [class^="icon-"]:before,
a [class*=" icon-"] { [class*=" icon-"]:before {
display: inline-block;
text-decoration: inherit; 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 */ /* makes the font 33% larger relative to the icon container */
.icon-large:before { .icon-large:before {
vertical-align: middle; vertical-align: -10%;
font-size: 4/3em; font-size: 1.3333333333333333em;
} }
.btn, .nav-tabs { .btn, .nav {
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
display: inline;
/* keeps button heights with and without icons the same */ /* keeps button heights with and without icons the same */
line-height: .9em; line-height: .6em;
&.icon-spin {
display: inline-block;
}
} }
} }
@ -72,33 +95,139 @@ li {
display: inline-block; display: inline-block;
width: 1.25em; width: 1.25em;
text-align: center; text-align: center;
&.icon-large {
/* increased font size for icon-large */
width: 1.25*1.25em;
} }
.icon-large:before,
.icon-large:before {
/* 1.5 increased font size for icon-large * 1.25 width */
width: 1.5*1.25em;
} }
} }
ul.icons { ul.icons {
list-style-type: none; list-style-type: none;
margin-left: 2em; text-indent: -.75em;
text-indent: -.8em;
li { li {
[class^="icon-"], [class^="icon-"],
[class*=" icon-"] { [class*=" icon-"] {
width: .8em; width: .75em;
}
.icon-large:before,
.icon-large:before {
/* 1.5 increased font size for icon-large * 1.25 width */
vertical-align: initial;
// width: 1.5*1.25em;
} }
} }
} }
.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); }
}
/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
readers do not read off random characters that represent icons */ readers do not read off random characters that represent icons */
.icon-glass:before { content: "\f000"; } .icon-glass:before { content: "\f000"; }
@ -325,5 +454,46 @@ ul.icons {
.icon-sitemap:before { content: "\f0e8"; } .icon-sitemap:before { content: "\f0e8"; }
.icon-umbrella:before { content: "\f0e9"; } .icon-umbrella:before { content: "\f0e9"; }
.icon-paste:before { content: "\f0ea"; } .icon-paste:before { content: "\f0ea"; }
.icon-lightbulb:before { content: "\f0eb"; }
.icon-exchange:before { content: "\f0ec"; }
.icon-cloud-download:before { content: "\f0ed"; }
.icon-cloud-upload:before { content: "\f0ee"; }
.icon-user-md:before { content: "\f200"; } .icon-user-md:before { content: "\f0f0"; }
.icon-stethoscope:before { content: "\f0f1"; }
.icon-suitcase:before { content: "\f0f2"; }
.icon-bell-alt:before { content: "\f0f3"; }
.icon-coffee:before { content: "\f0f4"; }
.icon-food:before { content: "\f0f5"; }
.icon-file-alt:before { content: "\f0f6"; }
.icon-building:before { content: "\f0f7"; }
.icon-hospital:before { content: "\f0f8"; }
.icon-ambulance:before { content: "\f0f9"; }
.icon-medkit:before { content: "\f0fa"; }
.icon-fighter-jet:before { content: "\f0fb"; }
.icon-beer:before { content: "\f0fc"; }
.icon-h-sign:before { content: "\f0fd"; }
.icon-plus-sign-alt:before { content: "\f0fe"; }
.icon-double-angle-left:before { content: "\f100"; }
.icon-double-angle-right:before { content: "\f101"; }
.icon-double-angle-up:before { content: "\f102"; }
.icon-double-angle-down:before { content: "\f103"; }
.icon-angle-left:before { content: "\f104"; }
.icon-angle-right:before { content: "\f105"; }
.icon-angle-up:before { content: "\f106"; }
.icon-angle-down:before { content: "\f107"; }
.icon-desktop:before { content: "\f108"; }
.icon-laptop:before { content: "\f109"; }
.icon-tablet:before { content: "\f10a"; }
.icon-mobile-phone:before { content: "\f10b"; }
.icon-circle-blank:before { content: "\f10c"; }
.icon-quote-left:before { content: "\f10d"; }
.icon-quote-right:before { content: "\f10e"; }
.icon-spinner:before { content: "\f110"; }
.icon-circle:before { content: "\f111"; }
.icon-reply:before { content: "\f112"; }
.icon-github-alt:before { content: "\f113"; }
.icon-folder-close-alt:before { content: "\f114"; }
.icon-folder-open-alt:before { content: "\f115"; }

View File

@ -109,9 +109,18 @@ footer {
font-size: 1.1em; font-size: 1.1em;
padding-right: 0.1em; padding-right: 0.1em;
padding-left: 0.1em; padding-left: 0.1em;
font-family: 'Lobster', Georgia, Times, serif;
letter-spacing: -0.07em;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
} }
vertical-align: 0.2em;
padding-top: 0.2em;
line-height: 1em;
span {
vertical-align: -0.2em;
line-height: 1em;
}
} }
#pagetitle { #pagetitle {
@ -119,8 +128,6 @@ footer {
} }
#overview { #overview {
font-size: 2em; span { font-size: 2em; };
li { li { line-height: 0.8em; };
line-height: 0.8em;
}
} }

View File

@ -39,10 +39,19 @@ $green: #859900;
} }
#sitelink { #sitelink {
color: $rebase02; background-color: $rebase1; color:$rebase03;
&:hover{ span {
color: $rebase03; color: $rebase03;
} }
&:hover {
color: $rebase1;
}
span {
color: $rebase03
}
}
#sitelink span:hover {
color: inherit;
} }
} }
footer { footer {