diff --git a/create_account.html b/create_account.html index 3a57707693..40cfaacd1c 100644 --- a/create_account.html +++ b/create_account.html @@ -2,8 +2,9 @@

Enroll in 6.002x Circuits & Electronics

- +
<% if 'error' in locals(): e = error %> diff --git a/login.html b/login.html index abf59aae74..0372532284 100644 --- a/login.html +++ b/login.html @@ -4,6 +4,9 @@

Log in to MITx

+
    diff --git a/main.html b/main.html index dea829f05f..888fb82903 100644 --- a/main.html +++ b/main.html @@ -20,13 +20,16 @@ displayMath: [["\\[","\\]"]]} }); - + <%block name="headextra"/> "> + ${self.body()} <%block name="bodyextra"/> diff --git a/sass/base/_extends.scss b/sass/base/_extends.scss index 2ac93d731e..d55fe62f96 100644 --- a/sass/base/_extends.scss +++ b/sass/base/_extends.scss @@ -204,3 +204,12 @@ h1.top-header { .tran { @include transition( all, .2s, $ease-in-out-quad); } + +p.ie-warning { + display: block !important; + line-height: 1.3em; + background: yellow; + padding: lh(); + text-align: left; + margin-bottom: 0; +} diff --git a/sass/courseware/_sequence-nav.scss b/sass/courseware/_sequence-nav.scss index 47b23adbc9..99e29a39d2 100644 --- a/sass/courseware/_sequence-nav.scss +++ b/sass/courseware/_sequence-nav.scss @@ -24,9 +24,9 @@ nav.sequence-nav { } .visited { - background-color: shade(#F6EFD4, 10%); + background-color: #DCCDA2; background-repeat: no-repeat; - border-color: shade(#F6EFD4, 10%); + @include box-shadow(inset 0 0 3px darken(#dccda2, 10%)); &:hover { background-color: #F6EFD4; @@ -52,7 +52,7 @@ nav.sequence-nav { border: none; border-right: 1px solid darken(#F6EFD4, 10%); cursor: pointer; - padding: 14px 4px; + padding: 15px 4px 14px; width: 28px; height: 17px; @@ -128,6 +128,7 @@ nav.sequence-nav { margin: 4px 0 0 -5px; text-shadow: 0 -1px 0 #000; color: #fff; + line-height: lh(); &:empty { background: none; diff --git a/sass/index/_extends.scss b/sass/index/_extends.scss index eaeb34a9e8..04bd5b83b6 100644 --- a/sass/index/_extends.scss +++ b/sass/index/_extends.scss @@ -85,3 +85,10 @@ } } +p.ie-warning { + display: block !important; + line-height: 1.3em; + background: yellow; + margin-bottom: lh(); + padding: lh(); +} diff --git a/sass/layout/_leanmodal.scss b/sass/layout/_leanmodal.scss index b344fbf9b9..b9399a39e4 100644 --- a/sass/layout/_leanmodal.scss +++ b/sass/layout/_leanmodal.scss @@ -47,10 +47,6 @@ div.leanModal_box { &#enroll { max-width: 600px; - p.ie-warning { - display: none; - } - ol { @extend .clearfix; padding-top: lh(); diff --git a/sass/marketing-ie.scss b/sass/marketing-ie.scss index 43c1e06f12..c92fd2f7fb 100644 --- a/sass/marketing-ie.scss +++ b/sass/marketing-ie.scss @@ -9,11 +9,6 @@ body { } div#enroll { - p.ie-warning { - display: block !important; - line-height: 1.3em; - } - form { display: none; } diff --git a/sass/wiki/_wiki.scss b/sass/wiki/_wiki.scss index 850099fc4e..4e88811dc7 100644 --- a/sass/wiki/_wiki.scss +++ b/sass/wiki/_wiki.scss @@ -24,9 +24,10 @@ div.wiki-wrapper { p { float: left; - padding: lh(.75) lh(); margin-bottom: 0; color: darken(#F6EFD4, 55%); + line-height: 46px; + padding-left: lh(); } ul { @@ -46,6 +47,7 @@ div.wiki-wrapper { @include border-radius(0); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); color: darken(#F6EFD4, 80%); + display: block; font-weight: normal; font-size: 12px; letter-spacing: 1px;