From 3c10a7964ab9f98b8ad9be30f56432850fc88c78 Mon Sep 17 00:00:00 2001
From: davegandy
Date: Sat, 4 May 2013 21:41:26 -0400
Subject: [PATCH] fixing #721
---
build/_includes/icons/new.html | 2 +
build/_layouts/base.html | 2 +-
build/assets/css/font-awesome.css | 15 ++--
build/assets/css/site.css | 10 +--
build/assets/js/index/index.js | 34 ++++----
build/assets/less/font-awesome.less | 18 ++--
build/assets/less/site.less | 6 +-
build/test.html | 124 ++++++++++++++--------------
8 files changed, 108 insertions(+), 103 deletions(-)
diff --git a/build/_includes/icons/new.html b/build/_includes/icons/new.html
index 158c90d97..addf23a74 100644
--- a/build/_includes/icons/new.html
+++ b/build/_includes/icons/new.html
@@ -20,6 +20,8 @@
diff --git a/build/assets/css/font-awesome.css b/build/assets/css/font-awesome.css
index cccfae44a..7889412f9 100644
--- a/build/assets/css/font-awesome.css
+++ b/build/assets/css/font-awesome.css
@@ -122,7 +122,7 @@ li [class^="icon-"],
li [class*=" icon-"],
.nav li [class*=" icon-"] {
display: inline-block;
- width: 1.25em;
+ width: 1.2857142857142858em;
text-align: center;
}
li [class^="icon-"].icon-large,
@@ -131,15 +131,16 @@ li [class*=" icon-"].icon-large,
.nav li [class*=" icon-"].icon-large {
/* increased font size for icon-large */
- width: 1.5625em;
+ width: 1.5714285714285714em;
}
-ul.icons {
+ul.icons-ul {
list-style-type: none;
- text-indent: -0.75em;
+ text-indent: -0.7142857142857143em;
+ margin-left: 2em;
}
-ul.icons li [class^="icon-"],
-ul.icons li [class*=" icon-"] {
- width: .75em;
+ul.icons-ul > li [class^="icon-"],
+ul.icons-ul > li .icon-li {
+ width: 0.7142857142857143em;
}
.icon-muted {
color: #eeeeee;
diff --git a/build/assets/css/site.css b/build/assets/css/site.css
index 479b973af..99b96d89f 100644
--- a/build/assets/css/site.css
+++ b/build/assets/css/site.css
@@ -5478,27 +5478,27 @@ h6 {
font-family: museo-slab, "Helvetica Neue", Helvetica, Arial, sans-serif;
}
#iconCarousel {
- font-size: 215px;
+ font-size: 220px;
text-align: center;
- line-height: 220px;
+ line-height: 225px;
text-shadow: 2px 2px 3px #222222;
}
#iconCarousel a {
color: #ffffff;
}
#iconCarousel .carousel-control {
- top: 248px;
+ top: 253px;
width: 30px;
height: 30px;
background: none;
border-width: 0;
font-size: 30px;
line-height: 25px;
- left: 115px;
+ left: 117px;
}
#iconCarousel .carousel-control.right {
left: auto;
- right: 115px;
+ right: 117px;
}
.jumbotron {
background: #9d261d;
diff --git a/build/assets/js/index/index.js b/build/assets/js/index/index.js
index 458021d80..9be7c5616 100644
--- a/build/assets/js/index/index.js
+++ b/build/assets/js/index/index.js
@@ -8,21 +8,21 @@ $(function() {
$('pre').addClass('prettyprint');
window.prettyPrint && prettyPrint();
- // inject twitter & github counts
- $.ajax({
- url: 'http://api.twitter.com/1/users/show.json',
- data: {screen_name: 'fortaweso_me'},
- dataType: 'jsonp',
- success: function(data) {
- $('#followers').html(data.followers_count);
- }
- });
- $.ajax({
- url: 'https://api.github.com/repos/fortawesome/Font-Awesome',
- dataType: 'jsonp',
- success: function(data) {
- $('#watchers').html(data.data.watchers);
- $('#forks').html(data.data.forks);
- }
- });
+// // inject twitter & github counts
+// $.ajax({
+// url: 'http://api.twitter.com/1/users/show.json',
+// data: {screen_name: 'fortaweso_me'},
+// dataType: 'jsonp',
+// success: function(data) {
+// $('#followers').html(data.followers_count);
+// }
+// });
+// $.ajax({
+// url: 'https://api.github.com/repos/fortawesome/Font-Awesome',
+// dataType: 'jsonp',
+// success: function(data) {
+// $('#watchers').html(data.data.watchers);
+// $('#forks').html(data.data.forks);
+// }
+// });
});
diff --git a/build/assets/less/font-awesome.less b/build/assets/less/font-awesome.less
index 3acb53ed7..dff7200ad 100644
--- a/build/assets/less/font-awesome.less
+++ b/build/assets/less/font-awesome.less
@@ -122,23 +122,25 @@ li, .nav li {
[class^="icon-"],
[class*=" icon-"] {
display: inline-block;
- width: 1.25em;
+ width: 18/14em;
text-align: center;
&.icon-large {
/* increased font size for icon-large */
- width: 1.25*1.25em;
+ width: 22/14em;
}
}
}
-ul.icons {
- list-style-type: none;
- text-indent: -.75em;
- li {
+ul.icons-ul {
+ list-style-type: none;
+ text-indent: -10/14em;
+ margin-left: 28/14em;
+
+ > li {
[class^="icon-"],
- [class*=" icon-"] {
- width: .75em;
+ .icon-li {
+ width: 10/14em;
}
}
}
diff --git a/build/assets/less/site.less b/build/assets/less/site.less
index 7844a2882..64c805ec1 100644
--- a/build/assets/less/site.less
+++ b/build/assets/less/site.less
@@ -18,7 +18,7 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
#iconCarousel {
a { color: @white; }
- @size: 215px;
+ @size: 220px;
font-size: @size;
text-align: center;
line-height: @size + 5;
@@ -30,10 +30,10 @@ h1, h2, h3, h4, h5, h6 { font-family: @serifFontFamily; }
border-width: 0;
font-size: 30px;
line-height: 25px;
- left: @size - 100px;
+ left: 300/2 - 33px;
&.right {
left: auto;
- right: @size - 100px;
+ right: 300/2 - 33px;
}
}
}
diff --git a/build/test.html b/build/test.html
index f4acdb82e..43a512fe5 100644
--- a/build/test.html
+++ b/build/test.html
@@ -1,49 +1,10 @@
-
-
-
-
-
-