From f68a97a63fe314770d00158bc5b3a3f419bea20c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 21 Aug 2012 13:54:58 -0400 Subject: [PATCH] Added changes to wiki 404 and fixed CMS Sass --- cms/static/sass/_base.scss | 5 ++++ lms/static/sass/course/wiki/_wiki.scss | 33 ++++++++++++++++++++++++++ lms/templates/wiki/wiki-404.html | 5 ++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 7d16f0c6f9..8d14bcff6b 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -14,6 +14,11 @@ $yellow: #fff8af; $cream: #F6EFD4; $border-color: #ddd; +// edX colors +$blue: rgb(29,157,217); +$pink: rgb(182,37,104); + + @mixin hide-text { background-color: transparent; border: 0; diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index 43769c93a6..a666607efb 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -767,6 +767,39 @@ section.wiki { text-decoration: none; } } + + .missing { + max-width: 400px; + margin: lh(2) auto; + display: block; + overflow: hidden; + background: $pink; + padding: lh(); + @include box-shadow(inset 0 0 0 1px lighten($pink, 10%)); + border: 1px solid darken($pink, 15%); + + p { + color: #fff; + + a { + display: block; + background: darken($pink, 8%); + margin: lh() (-(lh())) (-(lh())); + padding: lh(); + border-top: 1px solid darken($pink, 15%); + color: #fff; + font-weight: bold; + font-size: em(18); + @include transition; + text-align: center; + -webkit-font-smoothing: antialiased; + + &:hover { + background: darken($pink, 12%); + } + } + } + } } .modal-backdrop { diff --git a/lms/templates/wiki/wiki-404.html b/lms/templates/wiki/wiki-404.html index a18ea3786a..f44937c2e6 100644 --- a/lms/templates/wiki/wiki-404.html +++ b/lms/templates/wiki/wiki-404.html @@ -10,9 +10,8 @@ {% block wiki_contents %} -
-

This article was not found, and neither was the parent. Go back to the main wiki article.

- +
+

This article was not found, and neither was its parent article. Go back to the main wiki article

{% endblock %}