Merged with default

--HG-- branch : templates-ernie-global-intro-video

Merged with default
--HG-- branch : templates-ernie-global-intro-video
9a17d234 · Kyle Fiedler · b4737eb1 · b30dc6fe · 9a17d234 · 9a17d234
Commit 9a17d234 authored Feb 13, 2012 by Kyle Fiedler
Show whitespace changes
Inline Side-by-side

Showing with 32 additions and 2 deletions

activation_active.html
+2 -0

activation_complete.html
+1 -0

activation_invalid.html
+2 -0

index.html
+2 -0

main.html
+1 -1

sass/_activation.scss
+15 -0

sass/_layout.scss
+9 -1

No files found.
--- a/activation_active.html
+++ b/activation_active.html
 <%inherit file="main.html" />
+<%block name="bodyclass">activation</%block>
 <section class="activation">
  <h1>Account already active!</h1>
  <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->

--- a/activation_complete.html
+++ b/activation_complete.html
 <%inherit file="main.html" />
+<%block name="bodyclass">activation</%block>
 <section class="activation">
  <h1>Activation Complete!</h1>
  <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->

--- a/activation_invalid.html
+++ b/activation_invalid.html
 <%inherit file="main.html" />
+<%block name="body-class">activation</%block>
 <section class="activation">
 <h1>Activation Invalid</h1>

--- a/index.html
+++ b/index.html
 <%inherit file="marketing.html" />
+<%block name="body-class">activation</%block>
 <%block name="header_text">
    <section class="course">
      <section>

--- a/main.html
+++ b/main.html
@@ -38,7 +38,7 @@
 </head>
-<body>
+<body class="<%block name="bodyclass"/>">
  ${self.body()}
  <%block name="bodyextra"/>

--- a/sass/_activation.scss
+++ b/sass/_activation.scss
+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);

--- a/sass/_layout.scss
+++ b/sass/_layout.scss
@@ -133,7 +133,6 @@ html {
      max-width: 100%;
      height: auto;
    }
-  }
    footer {
      @extend .clearfix;
@@ -180,4 +179,13 @@ html {
        }
      }
    }
+    &.activation {
+      footer {
+        ul {
+          display: none;
+        }
+      }
+    }
+  }
 }