--- src/app/stylesheets/custom.scss | 20 -------------------- src/app/stylesheets/layout.scss | 10 ++++++++-- 2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss index a81a508..9a57a62 100644 --- a/src/app/stylesheets/custom.scss +++ b/src/app/stylesheets/custom.scss @@ -24,26 +24,6 @@ border-radius: 0em 50em 50em 0em; }
-/*fixes scrollbar and footer issues*/ -#primary-container{ - margin-bottom: -40px; -} - -div#content{ - margin-bottom: 58px; -} - -.clearfooter{ - height: 40px; - clear: both; -} - -footer.standard{ - nav.footer{ - padding: 14px 14px 13px 14px; - } -} - .deployable_details .content li { list-style-type: none; } diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 506726d..6fbd3cb 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -248,6 +248,7 @@ strong, em, b, i{ font-family: $font-family-em; } position: relative; min-height: 100%; display: block; + margin-bottom: -40px; }
/* Content */ @@ -269,7 +270,7 @@ body.administer div#content{
div#content{ margin: 0 auto; - margin-bottom: 98px; + margin-bottom: 58px; min-height: 200px; -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px; background-color: #FAFAFA; @@ -2179,6 +2180,11 @@ form.generic{ Page Footer -- v.0.0.1 [footer] (footer.scss) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.clearfooter{ + height: 40px; + clear: both; +} + /* Footer */
footer.standard{ @@ -2209,7 +2215,7 @@ footer.standard{
nav.footer{ display: inline-block; - padding: 14px; + padding: 14px 14px 13px 14px; a{ color: #fff; padding-right: 6px;