Commit 71b6237f authored by Dave Gandy's avatar Dave Gandy

adding vectors & desktop ttf, massive update of icons and doc

parent 6215d27e
This diff is collapsed.
File added
#Font Awesome 2.0.3
#Font Awesome 2.0
##the iconic font designed for use with Twitter Bootstrap
The full suite of pictographic icons, examples, and documentation can be found at:
......@@ -10,7 +10,7 @@ http://fortawesome.github.com/Font-Awesome/
- Work: Lead Product Designer @ http://kyru.us
##License
Version 2.0.3 of the Font Awesome font, CSS, and LESS files are licensed under CC BY 3.0:
Version 2.0 of the Font Awesome font, CSS, and LESS files are licensed under CC BY 3.0:
http://creativecommons.org/licenses/by/3.0/
A mention of 'Font Awesome - http://fortawesome.github.com/Font-Awesome'
in human-readable source code is considered acceptable attribution (most common on the
......
......@@ -236,5 +236,6 @@
.icon-bolt { *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 = ' '); }
.icon-user-md { *zoom: expression( this.runtimeStyle['zoom'] = "1", this.innerHTML = ' '); }
......@@ -311,5 +311,6 @@ li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
.icon-bolt:before { content: "\f0e7"; }
.icon-sitemap:before { content: "\f0e8"; }
.icon-umbrella:before { content: "\f0e9"; }
.icon-paste:before { content: "\f0ea"; }
.icon-user-md:before { content: "\f200"; }
......@@ -236,5 +236,6 @@
.icon-bolt { *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 = ' '); }
.icon-user-md { *zoom: expression( this.runtimeStyle['zoom'] = "1", this.innerHTML = ' '); }
......@@ -311,5 +311,6 @@ li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before {
.icon-bolt:before { content: "\f0e7"; }
.icon-sitemap:before { content: "\f0e8"; }
.icon-umbrella:before { content: "\f0e9"; }
.icon-paste:before { content: "\f0ea"; }
.icon-user-md:before { content: "\f200"; }
......@@ -4468,6 +4468,9 @@ ul.icons li .icon-large:before {
.icon-umbrella:before {
content: "\f0e9";
}
.icon-paste:before {
content: "\f0ea";
}
.icon-user-md:before {
content: "\f200";
}
......@@ -4504,7 +4507,7 @@ h6 {
}
#iconCarousel {
float: right;
width: 255.5px;
width: 267.5px;
height: 206.25px;
margin-right: 10px;
margin-top: -20px;
......@@ -4702,6 +4705,10 @@ a[href^='http://']:after:hover {
font-size: 24px;
vertical-align: middle;
}
#all-icons h3,
#new-icons h3 {
margin-top: 10px;
}
#why .row {
margin-bottom: 20px;
}
......@@ -4719,7 +4726,7 @@ a[href^='http://']:after:hover {
}
#examples form,
#code form {
margin-bottom: 10px;
margin-bottom: 25px;
}
#examples form input,
#code form input {
......@@ -4757,7 +4764,7 @@ a[href^='http://']:after:hover {
}
.modal {
width: 560px;
max-height: 520px;
max-height: 600px;
}
.modal .modal-body {
*overflow: hidden;
......@@ -4778,7 +4785,7 @@ a[href^='http://']:after:hover {
}
.modal .modal-body .icon6 > div.thumbnail > div {
line-height: 340px;
height: 272px;
height: 323px;
text-align: center;
}
.modal .modal-body .icon6 > div.thumbnail > div i {
......@@ -4789,7 +4796,7 @@ a[href^='http://']:after:hover {
}
.modal .modal-body .icon5 > div.thumbnail > div {
line-height: 180px;
height: 144px;
height: 171px;
text-align: center;
}
.modal .modal-body .icon5 > div.thumbnail > div i {
......@@ -4800,7 +4807,7 @@ a[href^='http://']:after:hover {
}
.modal .modal-body .icon4 > div.thumbnail > div {
line-height: 100px;
height: 80px;
height: 95px;
text-align: center;
}
.modal .modal-body .icon4 > div.thumbnail > div i {
......@@ -4811,7 +4818,7 @@ a[href^='http://']:after:hover {
}
.modal .modal-body .icon3 > div.thumbnail > div {
line-height: 50px;
height: 40px;
height: 47.5px;
text-align: center;
}
.modal .modal-body .icon3 > div.thumbnail > div i {
......@@ -4822,7 +4829,7 @@ a[href^='http://']:after:hover {
}
.modal .modal-body .icon2 > div.thumbnail > div {
line-height: 20px;
height: 16px;
height: 19px;
text-align: center;
}
.modal .modal-body .icon2 > div.thumbnail > div i {
......@@ -4833,7 +4840,7 @@ a[href^='http://']:after:hover {
}
.modal .modal-body .icon1 > div.thumbnail > div {
line-height: 12px;
height: 9.600000000000001px;
height: 11.399999999999999px;
text-align: center;
}
.modal .modal-body .icon1 > div.thumbnail > div i {
......
This diff is collapsed.
$(function() {
var MainView = Backbone.View.extend({
el: $("div.container"),
var firstInHistory = true;
modalTemplate: _.template($("#modal-template").html()),
var MainView = Backbone.View.extend({
el: $("div.container"),
events:{
"click ul.the-icons > li": "iconClicked"
},
modalTemplate: _.template($("#modal-template").html()),
iconClicked: function(event) {
event.preventDefault();
events:{
"click ul.the-icons > li": "iconClicked"
},
var $item = $(event.currentTarget);
var $modal = $(this.modalTemplate({"iconName": $item.find("i").attr("class")}));
iconClicked: function(event) {
event.preventDefault();
$modal.modal("show");
$modal.on('hidden', function () {
$modal.remove();
})
var $item = $(event.currentTarget);
var $iconName = $item.find("i").attr("class");
mainRouter.navigate("icon/" + $iconName, {trigger: true});
firstInHistory = false;
}
});
var MainRouter = Backbone.Router.extend({
routes: {
"icon/:iconName": "showIcon"
},
showIcon: function(iconName) {
var $modal = $(mainView.modalTemplate({"iconName": iconName}));
$modal.modal("show");
$modal.on('hidden', function () {
$modal.remove();
if (firstInHistory) {
mainRouter.navigate("/", {trigger: false});
firstInHistory = false;
} else {
window.history.back();
}
});
})
}
});
var mainView = new MainView();
var mainView = new MainView();
var mainRouter = new MainRouter();
Backbone.history.start({pushState : false});
});
......@@ -322,5 +322,6 @@ ul.icons {
.icon-bolt:before { content: "\f0e7"; }
.icon-sitemap:before { content: "\f0e8"; }
.icon-umbrella:before { content: "\f0e9"; }
.icon-paste:before { content: "\f0ea"; }
.icon-user-md:before { content: "\f200"; }
......@@ -35,7 +35,7 @@
}
}
.icon-size (@size: 12px, @width-multiplier: .9, @height-multiplier: .8) {
.icon-size (@size: 12px, @width-multiplier: .9, @height-multiplier: .95) {
i { font-size: @size; }
line-height: @size;
height: @size * @height-multiplier;
......
......@@ -25,7 +25,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
a { color: @white; }
@size: 275px;
float: right;
width: @size * .9 + 8;
width: @size * .9 + 20;
height: @size * .75;
margin-right: 10px;
margin-top: -20px;
......@@ -155,6 +155,12 @@ a[href^='http://'] {
}
}
#all-icons, #new-icons {
h3 {
margin-top: 10px;
}
}
#why {
.row {
margin-bottom: 20px;
......@@ -179,7 +185,7 @@ a[href^='http://'] {
#examples, #code {
form {
margin-bottom: 10px;
margin-bottom: 25px;
input {
line-height: 1; // fixes a safari placeholder alignment issue
}
......@@ -215,7 +221,7 @@ a[href^='http://'] {
.modal {
width: 560px;
max-height: 520px;
max-height: 600px;
.modal-body {
*overflow: hidden; // ie7 fix
max-height: none;
......
This diff is collapsed.
This diff is collapsed.
......@@ -322,5 +322,6 @@ ul.icons {
.icon-bolt:before { content: "\f0e7"; }
.icon-sitemap:before { content: "\f0e8"; }
.icon-umbrella:before { content: "\f0e9"; }
.icon-paste:before { content: "\f0ea"; }
.icon-user-md:before { content: "\f200"; }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment