Commit 016d9a2a authored by Thomas Park's avatar Thomas Park

update to fontawesome 4

parent 61dab066
body{padding-top:50px}#banner{border-bottom:0}.page-header h1{font-size:4em}.bs-docs-section{margin-top:8em}.affix{top:70px}footer{margin:5em 0}footer li{float:left;margin-right:1.5em;margin-bottom:1.5em}footer p{margin-bottom:0;clear:left}.splash{padding:6em 0 2em;color:#fff;text-align:center;background:-webkit-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-o-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-ms-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-moz-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:linear-gradient(20deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background-attachment:fixed;background-color:#1c2533}.splash .alert{margin:4em 0 2em}.splash h1{font-size:4em}.splash #social{margin-top:6em}.section-tout{padding:4em 0 3em;background-color:#eaf1f1;border-top:1px solid rgba(255,255,255,0.1);border-bottom:1px solid rgba(0,0,0,0.1)}.section-tout [class^="icon-"]{margin-right:.5em}.section-tout p{margin-bottom:3em}.section-preview{padding:4em 0 4em}.section-preview .preview{margin-bottom:4em;background-color:#eaf1f1;border:1px solid rgba(0,0,0,0.1);border-radius:6px}.section-preview .preview .image{padding:5px}.section-preview .preview .image img{border:1px solid rgba(0,0,0,0.1)}.section-preview .preview .options{padding:0 2em 2em;text-align:center}.section-preview .preview .options p{margin-bottom:2em}.section-preview .dropdown-menu{text-align:left}.section-preview .lead{margin-bottom:2em}@media(max-width:767px){.section-preview .image img{width:100%}}.bsa .one .bsa_it_ad{background-color:transparent!important;border:none!important}.bsa .one .bsa_it_ad .bsa_it_t,.bsa .one .bsa_it_ad .bsa_it_d{color:inherit!important}.bsa .one .bsa_it_p{display:none}
body{padding-top:50px}#banner{border-bottom:0}.page-header h1{font-size:4em}.bs-docs-section{margin-top:8em}.affix{top:70px}footer{margin:5em 0}footer li{float:left;margin-right:1.5em;margin-bottom:1.5em}footer p{margin-bottom:0;clear:left}.splash{padding:6em 0 2em;color:#fff;text-align:center;background:-webkit-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-o-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-ms-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:-moz-linear-gradient(70deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background:linear-gradient(20deg,#080f1f 30%,#2b4b5a 87%,#435e67 100%);background-attachment:fixed;background-color:#1c2533}.splash .alert{margin:4em 0 2em}.splash h1{font-size:4em}.splash #social{margin-top:6em}.section-tout{padding:4em 0 3em;background-color:#eaf1f1;border-top:1px solid rgba(255,255,255,0.1);border-bottom:1px solid rgba(0,0,0,0.1)}.section-tout .fa{margin-right:.5em}.section-tout p{margin-bottom:3em}.section-preview{padding:4em 0 4em}.section-preview .preview{margin-bottom:4em;background-color:#eaf1f1;border:1px solid rgba(0,0,0,0.1);border-radius:6px}.section-preview .preview .image{padding:5px}.section-preview .preview .image img{border:1px solid rgba(0,0,0,0.1)}.section-preview .preview .options{padding:0 2em 2em;text-align:center}.section-preview .preview .options p{margin-bottom:2em}.section-preview .dropdown-menu{text-align:left}.section-preview .lead{margin-bottom:2em}@media(max-width:767px){.section-preview .image img{width:100%}}.bsa .one .bsa_it_ad{background-color:transparent!important;border:none!important}.bsa .one .bsa_it_ad .bsa_it_t,.bsa .one .bsa_it_ad .bsa_it_d{color:inherit!important}.bsa .one .bsa_it_p{display:none}
......@@ -67,7 +67,7 @@ footer {
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
background-color: #eaf1f1;
[class^="icon-"] {
.fa {
margin-right: 0.5em;
}
......
......@@ -10,7 +10,7 @@
},
"dependencies": {
"bootstrap": "~3.0.2",
"font-awesome": "~3.2.0"
"font-awesome": "~4.0.0"
},
"licenses": [
{
......
......@@ -20,6 +20,6 @@
"commit": "3887f540b978d593f433bfef15888bc2d103de72"
},
"_source": "git://github.com/twbs/bootstrap.git",
"_target": "~3.0.1",
"_target": "~3.0.2",
"_originalSource": "bootstrap"
}
\ No newline at end of file
{
"name": "font-awesome",
"homepage": "https://github.com/FortAwesome/Font-Awesome",
"version": "3.2.1",
"_release": "3.2.1",
"version": "4.0.3",
"_release": "4.0.3",
"_resolution": {
"type": "version",
"tag": "v3.2.1",
"commit": "8d6f493a347c6408f47b8526bf815fecdb0d827a"
"tag": "v4.0.3",
"commit": "dc23a94e16a8daa3cbb3c7fa34d63e2812637b8f"
},
"_source": "git://github.com/FortAwesome/Font-Awesome.git",
"_target": "~3.2.0",
"_target": "~4.0.0",
"_originalSource": "font-awesome"
}
\ No newline at end of file
......@@ -28,3 +28,5 @@ node_modules
src/website/settingslocal.py
stunnel.log
.ruby-version
......@@ -43,4 +43,4 @@ PLATFORMS
DEPENDENCIES
debugger
jekyll (= 1.0)
jekyll (~> 1.0)
#[Font Awesome v3.2.1](http://fontawesome.io)
#[Font Awesome v4.0.3](http://fontawesome.io)
###the iconic font designed for Bootstrap
Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
maintained by [Dave Gandy](http://twitter.com/byscuits). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
Font Awesome is a full suite of 369 pictographic icons for easy scalable vector graphics on websites, created and
maintained by [Dave Gandy](http://twitter.com/davegandy). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
Get started at http://fontawesome.io!
......@@ -25,6 +25,10 @@ Get started at http://fontawesome.io!
- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed)
- [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed)
- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed)
- [v4.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=2&page=1&state=closed)
- [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed)
- [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed)
- [v4.0.3 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=9&page=1&state=closed)
##Versioning
......@@ -42,10 +46,21 @@ For more information on SemVer, please visit http://semver.org.
##Author
- Email: dave@fontawesome.io
- Twitter: http://twitter.com/byscuits
- Twitter: http://twitter.com/davegandy
- 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.
......
......@@ -11,7 +11,7 @@ pygments: true
permalink: pretty
# ensures SCSS files are compiled
include: [_bootstrap.scss, _core.scss, _extras.scss, _icons.scss, _mixins.scss, _path.scss, _variables.scss]
include: [_bordered-pulled.scss, _core.scss, _fixed-width.scss, _icons.scss, _larger.scss, _list.scss, _mixins.scss, _path.scss, _rotated-flipped.scss, _spinning.scss, _stacked.scss, _variables.scss]
# used in building icon pages
icon_meta: src/icons.yml
......@@ -19,17 +19,18 @@ icon_layout: icon.html # Relative to _layouts directory
icon_destination: icon # Relative to destination
fontawesome:
version: 3.2.1
minor_version: 3.2
version: 4.0.3
minor_version: 4.0
url: http://fontawesome.io
legacy_url: http://fortawesome.github.com/Font-Awesome/
blog_url: http://blog.fontawesome.io
twitter: fontawesome
tagline: The iconic font designed for Bootstrap
css_prefix: fa
author:
name: Dave Gandy
email: dave@fontawesome.io
twitter: byscuits
twitter: davegandy
work:
name: Kyruus
url: http://kyruus.com
......@@ -50,5 +51,8 @@ fontawesome:
url: http://creativecommons.org/licenses/by/3.0/
bootstrap:
version: 2.3.2
version: 3.0.0
url: http://getbootstrap.com
jquery:
version: 1.10.2
{
"name": "Font-Awesome",
"repo": "FortAwesome/Font-Awesome",
"description": "Font Awesome",
"version": "4.0.3",
"keywords": [],
"dependencies": {},
"development": {},
"license": "SIL, MIT, CC BY 3.0",
"styles": [
"css/font-awesome.css"
],
"fonts": [
"fonts/fontawesome-webfont.eot",
"fonts/fontawesome-webfont.svg",
"fonts/fontawesome-webfont.ttf",
"fonts/fontawesome-webfont.woff",
"fonts/FontAwesome.otf"
]
}
......@@ -8,12 +8,12 @@
"name": "Dave Gandy",
"email": "dave@fontawesome.io",
"role": "Developer",
"homepage": "http://twitter.com/byscuits"
"homepage": "http://twitter.com/davegandy"
}
],
"extra": {
"branch-alias": {
"dev-master": "3.2.x-dev"
"dev-master": "4.0.x-dev"
}
},
"license": [
......@@ -22,6 +22,6 @@
],
"require-dev": {
"jekyll": "1.0.2",
"lessc": "1.3.3"
"lessc": "1.4.2"
}
}
// Bordered & Pulled
// -------------------------
.@{fa-css-prefix}-border {
padding: .2em .25em .15em;
border: solid .08em @fa-border-color;
border-radius: .1em;
}
.pull-right { float: right; }
.pull-left { float: left; }
.@{fa-css-prefix} {
&.pull-left { margin-right: .3em; }
&.pull-right { margin-left: .3em; }
}
/* FONT AWESOME CORE
* -------------------------- */
[class^="icon-"],
[class*=" icon-"] {
.icon-FontAwesome();
}
[class^="icon-"]:before,
[class*=" icon-"]:before {
text-decoration: inherit;
display: inline-block;
speak: none;
}
/* makes the font 33% larger relative to the icon container */
.icon-large:before {
vertical-align: -10%;
font-size: 4/3em;
}
/* makes sure icons active on rollover in links */
a {
[class^="icon-"],
[class*=" icon-"] {
display: inline;
}
}
/* increased font size for icon-large */
[class^="icon-"],
[class*=" icon-"] {
&.icon-fixed-width {
display: inline-block;
width: 16/14em;
text-align: right;
padding-right: 4/14em;
&.icon-large {
width: 20/14em;
}
}