From daa478d34623a797539afb6ed6267968ed6a10c4 Mon Sep 17 00:00:00 2001 From: davegandy Date: Sat, 5 Oct 2013 20:57:23 -0400 Subject: [PATCH] updating sticky footer, finishing off doc update sans responsive layout --- src/_includes/examples/new.html | 34 +++++++++++++++-------------- src/_layouts/base.html | 3 +-- src/assets/less/site/footer.less | 14 ++++++------ src/assets/less/site/navbar.less | 8 +++---- src/assets/less/site/variables.less | 4 ++++ 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/_includes/examples/new.html b/src/_includes/examples/new.html index 8b66d382b..a7d615405 100644 --- a/src/_includes/examples/new.html +++ b/src/_includes/examples/new.html @@ -14,22 +14,24 @@

Stacked Icons

-
- - - - - fa-twitter on fa-check-empty
- - - - - fa-flag on fa-circle
- - - - - fa-terminal on fa-sign-blank +
+
+ + + + + fa-twitter on fa-check-empty
+ + + + + fa-flag on fa-circle
+ + + + + fa-terminal on fa-sign-blank +
diff --git a/src/_layouts/base.html b/src/_layouts/base.html index 806cee735..e4353bd2e 100644 --- a/src/_layouts/base.html +++ b/src/_layouts/base.html @@ -45,12 +45,11 @@ })(); - +
{% include navbar.html %} {{ content }} -
{% include footer.html %} diff --git a/src/assets/less/site/footer.less b/src/assets/less/site/footer.less index 8dbf30d44..ba8b832b2 100755 --- a/src/assets/less/site/footer.less +++ b/src/assets/less/site/footer.less @@ -11,9 +11,12 @@ } + .container { + padding-top: 40px; + } + color: mix(@red, #fff, 35%); text-shadow: 0 -1px 0 rgba(0,0,0,.25); - margin-top: 60px; .project { margin-top: 10px; } } @@ -21,10 +24,8 @@ // Sticky Footer Styles // -------------------- -@footer-height: 160px; -@footer-padding-top: 40px; -@footer-padding-bottom: 40px; -@wrap-padding-bottom: 60px; // also known as the margin above the footer +@footer-height: 165px; +@footer-margin: 60px; html, body { height: 100%; } @@ -33,10 +34,9 @@ html, body { height: 100%; } height: auto !important; height: 100%; margin: 0 auto -(@footer-height); - padding: 0 0 (@footer-height + @wrap-padding-bottom); + padding: 0 0 (@footer-height + @footer-margin); } #footer { height: @footer-height; - padding: @footer-padding-top 0 @footer-padding-bottom; } diff --git a/src/assets/less/site/navbar.less b/src/assets/less/site/navbar.less index 0bbef571a..8d71d31ee 100644 --- a/src/assets/less/site/navbar.less +++ b/src/assets/less/site/navbar.less @@ -10,10 +10,10 @@ //.navbar .nav > li > a { padding: 12px 10px 9px; } -.navbar-nav > li > a { - padding-top: 16px; - padding-bottom: 14px; -} +//.navbar-nav > li > a { +// padding-top: 16px; +// padding-bottom: 14px; +//} // makes dropdowns closer for split dropdown .navbar-nav > li { diff --git a/src/assets/less/site/variables.less b/src/assets/less/site/variables.less index 36246b0a5..85690a5fe 100644 --- a/src/assets/less/site/variables.less +++ b/src/assets/less/site/variables.less @@ -30,6 +30,10 @@ @state-info-bg: @blue-lighter; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +// Navbar +@navbar-height: 40px; +@navbar-inverse-brand-color: #fff; + // SITE VARIABLES