From 8a112b0cca0194c36c71bb788f9f5667a5450de2 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 21 Aug 2012 14:04:50 -0400 Subject: [PATCH 1/2] Added fix for cms sass --- cms/static/sass/_base.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss index 7d16f0c6f9..410f74ee07 100644 --- a/cms/static/sass/_base.scss +++ b/cms/static/sass/_base.scss @@ -14,6 +14,10 @@ $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; From 3273de93fe096eec7cee3e930d73fb39bb3969a8 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 21 Aug 2012 15:29:53 -0400 Subject: [PATCH 2/2] make tutorial headers normal size --- lms/static/sass/course/courseware/_courseware.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/static/sass/course/courseware/_courseware.scss b/lms/static/sass/course/courseware/_courseware.scss index 24ce46a9a3..1e7f13385a 100644 --- a/lms/static/sass/course/courseware/_courseware.scss +++ b/lms/static/sass/course/courseware/_courseware.scss @@ -58,18 +58,20 @@ div.course-wrapper { @extend h1.top-header; @include border-radius(0 4px 0 0); margin-bottom: -16px; + border-bottom: 0; h1 { margin: 0; + font-size: 1em; } h2 { float: right; - margin-right: 0; - margin-top: 8px; + margin: 12px 0 0; text-align: right; padding-right: 0; border-right: 0; + font-size: em(14, 24); } }