Skip to content

E
edx-platform
Commit 9a17d234 by Kyle Fiedler
Options

Merged with default 

--HG--
branch : templates-ernie-global-intro-video
parents b4737eb1 b30dc6fe
Showing with 61 additions and 31 deletions
activation_active.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<%block name="bodyclass">activation</%block>
<section class="activation"> <section class="activation">
<h1>Account already active!</h1> <h1>Account already active!</h1>
<!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> --> <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
......
activation_complete.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<%block name="bodyclass">activation</%block>
<section class="activation"> <section class="activation">
<h1>Activation Complete!</h1> <h1>Activation Complete!</h1>
<!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> --> <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
......
activation_invalid.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<%block name="body-class">activation</%block>
<section class="activation"> <section class="activation">
<h1>Activation Invalid</h1> <h1>Activation Invalid</h1>
......
index.html
<%inherit file="marketing.html" /> <%inherit file="marketing.html" />
<%block name="body-class">activation</%block>
<%block name="header_text"> <%block name="header_text">
<section class="course"> <section class="course">
<section> <section>
......
main.html
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</head> </head>
<body> <body class="<%block name="bodyclass"/>">
${self.body()} ${self.body()}
<%block name="bodyextra"/> <%block name="bodyextra"/>
......
sass/_activation.scss
body.activation {
footer {
max-width: 600px;
text-align: center;
p {
float: none;
}
ul {
display: none;
}
}
}
section.activation { section.activation {
@extend .wrapper; @extend .wrapper;
@include box-shadow(0 1px 0 #fff); @include box-shadow(0 1px 0 #fff);
......
sass/_layout.scss
...@@ -133,49 +133,57 @@ html { ...@@ -133,49 +133,57 @@ html {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
} }
}
footer {
@extend .clearfix;
@extend .wrapper;
@include box-sizing(border-box);
color: #777;
margin-top: $body-line-height;
padding: 0 $body-line-height;
p { footer {
float: left; @extend .clearfix;
@extend .wrapper;
@include box-sizing(border-box);
color: #777;
margin-top: $body-line-height;
padding: 0 $body-line-height;
a { p {
color: #444; float: left;
&:link, &:visited { a {
color: #444; color: #444;
}
&:hover, &:focus { &:link, &:visited {
color: #000; color: #444;
}
&:hover, &:focus {
color: #000;
}
} }
} }
}
ul { ul {
float: right; float: right;
li { li {
display: inline-block; display: inline-block;
margin-right: 20px; margin-right: 20px;
a { a {
color: #444; color: #444;
&:link, &:visited { &:link, &:visited {
color: #444; color: #444;
} }
&:hover, &:focus { &:hover, &:focus {
color: #000; color: #000;
}
}
} }
}
}
&.activation {
footer {
ul {
display: none;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment