summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Gandy <dave@davegandy.com>2014-08-20 10:24:25 -0400
committerDave Gandy <dave@davegandy.com>2014-08-20 10:24:25 -0400
commitbe925ab85d91be1e640ecfb68ed388145cf29053 (patch)
tree0a1d888e01c27c018bc4b9764e22a8c4ec2c010a
parentccac58c1497dea269756d36fd4fd9f470c7f5807 (diff)
downloadFont-Awesome-origin/tmp-branch.zip
Font-Awesome-origin/tmp-branch.tar.gz
Font-Awesome-origin/tmp-branch.tar.bz2
bunch of changes for bsa ad changeorigin/tmp-branch
Diffstat
-rw-r--r--src/_includes/footer.html1
-rw-r--r--src/_includes/icons/spinner.html2
-rw-r--r--src/_includes/navbar.html14
-rw-r--r--src/_layouts/base.html9
-rw-r--r--src/assets/js/site.js10
-rw-r--r--src/assets/less/site.less1
-rw-r--r--src/assets/less/site/bsap-ad.less14
-rwxr-xr-xsrc/assets/less/site/footer.less2
-rw-r--r--src/assets/less/site/responsive/screen-sm.less2
-rw-r--r--src/assets/less/site/responsive/screen-xs.less2
-rw-r--r--src/get-started.html4
11 files changed, 31 insertions, 30 deletions
diff --git a/src/_includes/footer.html b/src/_includes/footer.html
index 7cdc852..137970a 100644
--- a/src/_includes/footer.html
+++ b/src/_includes/footer.html
@@ -1,5 +1,6 @@
<footer id="footer" class="footer hidden-print">
<div class="container text-center">
+ <div id="bsap_1298241" class="bsarocks bsap_b1146e3f9fa32a794fc6d2c7be47ece8"></div>
<div>
<i class="fa fa-flag"></i> Font Awesome {{ site.fontawesome.version }}
<span class="hide-xs">&middot;</span><br class="hide-sm hide-md hide-lg">
diff --git a/src/_includes/icons/spinner.html b/src/_includes/icons/spinner.html
index 9f31ecb..d798b2c 100644
--- a/src/_includes/icons/spinner.html
+++ b/src/_includes/icons/spinner.html
@@ -6,7 +6,7 @@
<li>
<i class="fa fa-info-circle fa-lg fa-li"></i>
These icons work great with the <code>fa-spin</code> class. Check out the
- <a href="" class="alert-link">spinning icons example</a>.
+ <a href="{{ page.relative_path }}examples/#spinning" class="alert-link">spinning icons example</a>.
</li>
</ul>
</div>
diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html
index 2f752ba..ea04698 100644
--- a/src/_includes/navbar.html
+++ b/src/_includes/navbar.html
@@ -68,17 +68,3 @@
</div>
</div>
</div>
-<div class="black-tie">
- <div class="container">
- <div class="row">
- <div class="col-sm-6 col-md-8 col-lg-9">
- <div class="tagline">
- Please support <strong>Black Tie</strong>, the new icon font from Font Awesome!
- </div>
- </div>
- <div class="col-sm-6 col-md-4 col-lg-3">
- <a class="btn btn-default btn-lg btn-block">Check out the Kickstarter <i class="fa fa-external-link-square"></i></a>
- </div>
- </div>
- </div>
-</div> \ No newline at end of file
diff --git a/src/_layouts/base.html b/src/_layouts/base.html
index 3da1965..c903ee1 100644
--- a/src/_layouts/base.html
+++ b/src/_layouts/base.html
@@ -38,6 +38,15 @@
</script>
</head>
<body>
+<script type="text/javascript">
+ (function(){
+ var bsa = document.createElement('script');
+ bsa.type = 'text/javascript';
+ bsa.async = true;
+ bsa.src = 'http://s3.buysellads.com/ac/bsa.js';
+ (document.getElementsByTagName('head')[0]||document.getElementsByTagName('body')[0]).appendChild(bsa);
+ })();
+</script>
<div id="wrap"> <!-- necessary for sticky footer. wrap all content except footer -->
{% include navbar.html %}
diff --git a/src/assets/js/site.js b/src/assets/js/site.js
index 94f821e..7317980 100644
--- a/src/assets/js/site.js
+++ b/src/assets/js/site.js
@@ -3,14 +3,4 @@ $(function() {
$('#icon-carousel').carousel({
interval: 5000
});
-
- var quotes = new Array(
- "Please support <strong>Black Tie</strong>, the new icon font from Font Awesome!",
- "Please help me make Font Awesome <strong>Black Tie</strong>!",
- "Get your company logo added to Font Awesome!",
- "Need a specific icon added to Font Awesome?",
- "If you like Font Awesome, you're going to love <strong>Black Tie</strong>!"
- ),
- random_quote = quotes[Math.floor( Math.random() * quotes.length )];
- $('.tagline').html(random_quote);
});
diff --git a/src/assets/less/site.less b/src/assets/less/site.less
index 3b8e927..392ee0c 100644
--- a/src/assets/less/site.less
+++ b/src/assets/less/site.less
@@ -21,6 +21,7 @@
@import "site/textured-bg";
@import "site/black-tie";
@import "site/fusion-ad";
+@import "site/bsap-ad";
@import "site/responsive/screen-lg";
@import "site/responsive/screen-md";
diff --git a/src/assets/less/site/bsap-ad.less b/src/assets/less/site/bsap-ad.less
new file mode 100644
index 0000000..36fbef3
--- /dev/null
+++ b/src/assets/less/site/bsap-ad.less
@@ -0,0 +1,14 @@
+div.bsap {
+ margin-bottom: 20px;
+ a {
+ display: inline-block !important;
+ border-bottom: inherit !important;
+ }
+ a.adhere {
+ background: inherit !important;
+ border: 1px solid #ccc !important;
+ &:hover {
+ background: mix(#000,@jumbotron-bg,15%) !important;
+ }
+ }
+} \ No newline at end of file
diff --git a/src/assets/less/site/footer.less b/src/assets/less/site/footer.less
index 3fb6d00..936737b 100755
--- a/src/assets/less/site/footer.less
+++ b/src/assets/less/site/footer.less
@@ -31,7 +31,7 @@ html, body { height: 100%; }
.sticky-footer();
-.sticky-footer(@footer-height: 165px, @footer-margin: 60px) {
+.sticky-footer(@footer-height: 251px, @footer-margin: 60px) {
#wrap {
margin: 0 auto -(@footer-height);
padding: 0 0 (@footer-height + @footer-margin);
diff --git a/src/assets/less/site/responsive/screen-sm.less b/src/assets/less/site/responsive/screen-sm.less
index 77d83f4..941fe10 100644
--- a/src/assets/less/site/responsive/screen-sm.less
+++ b/src/assets/less/site/responsive/screen-sm.less
@@ -44,7 +44,7 @@
line-height: 22px;
}
- .sticky-footer(185px, 60px);
+ .sticky-footer(271px, 60px);
.hide-sm { display: none; }
}
diff --git a/src/assets/less/site/responsive/screen-xs.less b/src/assets/less/site/responsive/screen-xs.less
index 7666c18..156720e 100644
--- a/src/assets/less/site/responsive/screen-xs.less
+++ b/src/assets/less/site/responsive/screen-xs.less
@@ -73,7 +73,7 @@
}
- .sticky-footer(245px, 60px);
+ .sticky-footer(331px, 60px);
.hide-xs { display: none; }
} \ No newline at end of file
diff --git a/src/get-started.html b/src/get-started.html
index 9099fea..8174a6b 100644
--- a/src/get-started.html
+++ b/src/get-started.html
@@ -21,8 +21,8 @@ relative_path: ../
{% include stripe-ad.html %}
<div id="bootstrapcdn">
- <h2 class="page-header">EASIEST: <a href="http://www.bootstrapcdn.com/#fontawesome_tab">BootstrapCDN</a></h2>
- <p>Add Font Awesome into your website with a single line of code. You don't even have to download or install anything!</p>
+ <h2 class="page-header">EASIEST: <a href="http://www.bootstrapcdn.com/#fontawesome_tab">BootstrapCDN</a> by <a href="http://maxcdn.com">MaxCDN</a></h2>
+ <p>Thanks to the generous folks at <a href="http://maxcdn.com">MaxCDN</a>, you can use Bootstrap CDN to add Font Awesome into your website with a single line of code. You don't even have to download or install anything!</p>
<ol>
<li>
Paste the following code into the <code>&lt;head&gt;</code> section of your site's HTML.
generated by cgit v1.1 at 2025-05-10 21:10:59 +0000