From b30dc6fed69ff42fa0e40944166fb2af1d5e87a2 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 13 Feb 2012 15:09:57 -0500 Subject: [PATCH] Hide footer links for activation pages --- activation_active.html | 2 ++ activation_complete.html | 1 + activation_invalid.html | 2 ++ index.html | 2 ++ main.html | 2 +- sass/_activation.scss | 15 ++++++++ sass/_layout.scss | 78 ++++++++++++++++++++++------------------ 7 files changed, 66 insertions(+), 36 deletions(-) diff --git a/activation_active.html b/activation_active.html index 2861784cff..e28d0f1205 100644 --- a/activation_active.html +++ b/activation_active.html @@ -1,6 +1,8 @@ <%inherit file="main.html" /> +<%block name="bodyclass">activation +

Account already active!

diff --git a/activation_complete.html b/activation_complete.html index ff988da1c6..04878c118e 100644 --- a/activation_complete.html +++ b/activation_complete.html @@ -1,6 +1,7 @@ <%inherit file="main.html" /> +<%block name="bodyclass">activation

Activation Complete!

diff --git a/activation_invalid.html b/activation_invalid.html index f8afc8233b..f327fbaa67 100644 --- a/activation_invalid.html +++ b/activation_invalid.html @@ -1,4 +1,6 @@ <%inherit file="main.html" /> +<%block name="body-class">activation +

Activation Invalid

diff --git a/index.html b/index.html index ff32f6a336..a8e716d3f9 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,7 @@ <%inherit file="marketing.html" /> +<%block name="body-class">activation + <%block name="header_text">
diff --git a/main.html b/main.html index 05d00112f5..96f2a32cd4 100644 --- a/main.html +++ b/main.html @@ -38,7 +38,7 @@ - +"> ${self.body()} <%block name="bodyextra"/> diff --git a/sass/_activation.scss b/sass/_activation.scss index 0ec5ea837a..8ae293200e 100644 --- a/sass/_activation.scss +++ b/sass/_activation.scss @@ -1,3 +1,18 @@ +body.activation { + footer { + max-width: 600px; + text-align: center; + + p { + float: none; + } + + ul { + display: none; + } + } +} + section.activation { @extend .wrapper; @include box-shadow(0 1px 0 #fff); diff --git a/sass/_layout.scss b/sass/_layout.scss index 6984531ff9..e124f0f62f 100644 --- a/sass/_layout.scss +++ b/sass/_layout.scss @@ -133,49 +133,57 @@ html { max-width: 100%; height: auto; } - } - footer { - @extend .clearfix; - @extend .wrapper; - @include box-sizing(border-box); - color: #777; - margin-top: $body-line-height; - padding: 0 $body-line-height; + footer { + @extend .clearfix; + @extend .wrapper; + @include box-sizing(border-box); + color: #777; + margin-top: $body-line-height; + padding: 0 $body-line-height; - p { - float: left; - - a { - color: #444; - - &:link, &:visited { - color: #444; - } - - &:hover, &:focus { - color: #000; - } - } - } - - ul { - float: right; - - li { - display: inline-block; - margin-right: 20px; + p { + float: left; a { color: #444; - &:link, &:visited { - color: #444; - } + &:link, &:visited { + color: #444; + } - &:hover, &:focus { - color: #000; + &:hover, &:focus { + color: #000; + } } + } + + ul { + float: right; + + li { + display: inline-block; + margin-right: 20px; + + a { + color: #444; + + &:link, &:visited { + color: #444; + } + + &:hover, &:focus { + color: #000; + } + } + } + } + } + + &.activation { + footer { + ul { + display: none; } } }