From 600aff59a690cfe1ebe4fca8063bf6843b0bc06c Mon Sep 17 00:00:00 2001 From: Galen Frechette Date: Mon, 16 Jul 2012 19:29:02 -0400 Subject: [PATCH] imporves course object header typography --- lms/static/sass/_course_about.scss | 4 ++-- lms/static/sass/_courses.scss | 2 +- ..._course_object.scss => _courseware_subnav.scss} | 0 lms/static/sass/application.css | 14 +++++++------- lms/static/sass/application.scss | 4 ++-- ...ed_list_of_courses.scss => _course_object.scss} | 5 +++++ lms/templates/courses.html | 2 +- lms/templates/university_profile.html | 6 +++--- 8 files changed, 21 insertions(+), 16 deletions(-) rename lms/static/sass/{_course_object.scss => _courseware_subnav.scss} (100%) rename lms/static/sass/shared_styles/{_shared_list_of_courses.scss => _course_object.scss} (96%) diff --git a/lms/static/sass/_course_about.scss b/lms/static/sass/_course_about.scss index 8a98dfac2c..51d00f8d81 100644 --- a/lms/static/sass/_course_about.scss +++ b/lms/static/sass/_course_about.scss @@ -243,12 +243,12 @@ border: 1px solid rgb(200,200,200); border-top: none; float: left; - padding: 20px 20px 30px; + padding: 16px 20px 30px; width: flex-grid(4); header { margin-bottom: 30px; - padding-bottom: 20px; + padding-bottom: 16px; position: relative; text-align: center; diff --git a/lms/static/sass/_courses.scss b/lms/static/sass/_courses.scss index 718f596a85..c78ba37878 100644 --- a/lms/static/sass/_courses.scss +++ b/lms/static/sass/_courses.scss @@ -4,7 +4,7 @@ header.search { background: rgb(240,240,240); - @include background-image(url('/static/images/shot-2-large.jpg')); + //@include background-image(url('/static/images/shot-2-large.jpg')); background-size: cover; border-bottom: 1px solid rgb(100,100,100); @include box-shadow(inset 0 -1px 8px 0 rgba(0,0,0, 0.2), inset 0 1px 12px 0 rgba(0,0,0, 0.3)); diff --git a/lms/static/sass/_course_object.scss b/lms/static/sass/_courseware_subnav.scss similarity index 100% rename from lms/static/sass/_course_object.scss rename to lms/static/sass/_courseware_subnav.scss diff --git a/lms/static/sass/application.css b/lms/static/sass/application.css index 20630f3725..dfebdce865 100644 --- a/lms/static/sass/application.css +++ b/lms/static/sass/application.css @@ -2108,6 +2108,7 @@ header.global { clear: both; } .highlighted-courses .courses .course .meta-info p, .find-courses .courses .course .meta-info p { color: white; + font-style: italic; line-height: 1.2em; padding: 4px 12px 5px; } .highlighted-courses .courses .course .inner-wrapper, .find-courses .courses .course .inner-wrapper { @@ -2142,7 +2143,11 @@ header.global { top: 0px; } .highlighted-courses .courses .course header.course-preview > a hgroup h2, .find-courses .courses .course header.course-preview > a hgroup h2 { color: #3c3c3c; + font-family: "Open Sans", Verdana, Geneva, sans-serif; + font-size: 1em; + font-weight: 700; margin-bottom: 0px; + overflow: hidden; padding-top: 9px; text-shadow: 0 1px rgba(255, 255, 255, 0.6); text-overflow: ellipsis; @@ -4173,11 +4178,6 @@ nav.course-material { padding-bottom: 60px; } .find-courses header.search, .university-profile header.search { background: #f0f0f0; - background-image: url("/static/images/shot-2-large.jpg"); - background-image: url("/static/images/shot-2-large.jpg"); - background-image: url("/static/images/shot-2-large.jpg"); - background-image: url("/static/images/shot-2-large.jpg"); - background-image: url("/static/images/shot-2-large.jpg"); background-size: cover; border-bottom: 1px solid #646464; -webkit-box-shadow: inset 0 -1px 8px 0 rgba(0, 0, 0, 0.2), inset 0 1px 12px 0 rgba(0, 0, 0, 0.3); @@ -4590,11 +4590,11 @@ nav.course-material { border: 1px solid #c8c8c8; border-top: none; float: left; - padding: 20px 20px 30px; + padding: 16px 20px 30px; width: 31.984%; } .course-info .course-sidebar header { margin-bottom: 30px; - padding-bottom: 20px; + padding-bottom: 16px; position: relative; text-align: center; } .course-info .course-sidebar header::after { diff --git a/lms/static/sass/application.scss b/lms/static/sass/application.scss index 1cdc7ce7e9..e51658ba5b 100644 --- a/lms/static/sass/application.scss +++ b/lms/static/sass/application.scss @@ -13,14 +13,14 @@ @import 'shared_styles/shared_forms'; @import 'shared_styles/shared_footer'; @import 'shared_styles/shared_header'; -@import 'shared_styles/shared_list_of_courses'; +@import 'shared_styles/course_object'; @import 'shared_styles/shared_course_filter'; @import 'shared_styles/shared_modal'; @import 'shared_styles/activation_messages'; @import 'home'; @import 'dashboard'; -@import 'course_object'; +@import 'courseware_subnav'; @import 'courses'; @import 'course_about'; @import 'jobs'; diff --git a/lms/static/sass/shared_styles/_shared_list_of_courses.scss b/lms/static/sass/shared_styles/_course_object.scss similarity index 96% rename from lms/static/sass/shared_styles/_shared_list_of_courses.scss rename to lms/static/sass/shared_styles/_course_object.scss index 377cd23d5c..82df5f3705 100644 --- a/lms/static/sass/shared_styles/_shared_list_of_courses.scss +++ b/lms/static/sass/shared_styles/_course_object.scss @@ -33,6 +33,7 @@ p { color: rgb(255,255,255); + font-style: italic; line-height: 1.2em; padding: 4px 12px 5px; } @@ -69,7 +70,11 @@ h2 { color: $base-font-color; + font-family: $sans-serif; + font-size: 1em; + font-weight: 700; margin-bottom: 0px; + overflow: hidden; padding-top: 9px; text-shadow: 0 1px rgba(255,255,255, 0.6); text-overflow: ellipsis; diff --git a/lms/templates/courses.html b/lms/templates/courses.html index d789f8fd9e..44ba213069 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -3,7 +3,7 @@ <%namespace name='static' file='static_content.html'/>
-
+