From 987d8ea43bf301b2792b4377201bca64eee14dc3 Mon Sep 17 00:00:00 2001 From: Arjun Singh Date: Sat, 22 Sep 2012 14:17:34 -0700 Subject: [PATCH 1/2] Some 188-specific styling + default styling for static tabs --- lms/static/sass/course.scss | 1 + lms/static/sass/course/_syllabus.scss | 2 +- lms/static/sass/course/_tabs.scss | 13 ++++++++ .../course/courseware/courses/_cs188.scss | 31 +++++++++++++++++++ lms/templates/courseware/static_tab.html | 1 + 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 lms/static/sass/course/_tabs.scss diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss index 6061570969..886871e4fe 100644 --- a/lms/static/sass/course.scss +++ b/lms/static/sass/course.scss @@ -42,6 +42,7 @@ @import "course/textbook"; @import "course/profile"; @import "course/gradebook"; +@import "course/tabs"; // instructor @import "course/instructor/instructor"; diff --git a/lms/static/sass/course/_syllabus.scss b/lms/static/sass/course/_syllabus.scss index f1b6dfa636..48b5b1240e 100644 --- a/lms/static/sass/course/_syllabus.scss +++ b/lms/static/sass/course/_syllabus.scss @@ -35,7 +35,7 @@ div.syllabus { padding: 5px 10px; - &.day, &.due { + &.day, &.due, &.slides { white-space: nowrap; } diff --git a/lms/static/sass/course/_tabs.scss b/lms/static/sass/course/_tabs.scss new file mode 100644 index 0000000000..b0e3dcb703 --- /dev/null +++ b/lms/static/sass/course/_tabs.scss @@ -0,0 +1,13 @@ +div.static_tab_wrapper { + + padding: 2em 2.5em; + + h1 { + @extend .top-header + } + + section { + margin: 0px 0px 20px; + } + +} diff --git a/lms/static/sass/course/courseware/courses/_cs188.scss b/lms/static/sass/course/courseware/courses/_cs188.scss index 07830e6a11..a99611a231 100644 --- a/lms/static/sass/course/courseware/courses/_cs188.scss +++ b/lms/static/sass/course/courseware/courses/_cs188.scss @@ -1,5 +1,36 @@ body.cs188 { + .course-staff { + .teacher { + margin-bottom: 40px; + + h3 { + color: $base-font-color; + font-family: $sans-serif; + font-weight: 700; + margin-bottom: 15px; + text-transform: none; + } + + .teacher-image { + background: rgb(255,255,255); + border: 1px solid rgb(200,200,200); + height: 115px; + float: left; + margin: 0 15px 0px 0; + overflow: hidden; + padding: 1px; + width: 115px; + + img { + display: block; + min-height: 100%; + max-width: 100%; + } + } + } + } + .course-content{ .project { diff --git a/lms/templates/courseware/static_tab.html b/lms/templates/courseware/static_tab.html index 7a832d6a4c..5b6e1480dd 100644 --- a/lms/templates/courseware/static_tab.html +++ b/lms/templates/courseware/static_tab.html @@ -1,4 +1,5 @@ <%inherit file="/main.html" /> +<%block name="bodyclass">${course.css_class} <%namespace name='static' file='/static_content.html'/> <%block name="headextra"> From 015328ed5c881c66d60c3c33647b7db0184b15b9 Mon Sep 17 00:00:00 2001 From: Arjun Singh Date: Sat, 22 Sep 2012 17:19:27 -0700 Subject: [PATCH 2/2] more 188 styling --- .../course/courseware/courses/_cs188.scss | 148 +++++++++++------- lms/templates/courseware/info.html | 1 + 2 files changed, 92 insertions(+), 57 deletions(-) diff --git a/lms/static/sass/course/courseware/courses/_cs188.scss b/lms/static/sass/course/courseware/courses/_cs188.scss index a99611a231..7bcc09defe 100644 --- a/lms/static/sass/course/courseware/courses/_cs188.scss +++ b/lms/static/sass/course/courseware/courses/_cs188.scss @@ -1,69 +1,103 @@ body.cs188 { - .course-staff { - .teacher { - margin-bottom: 40px; - - h3 { - color: $base-font-color; - font-family: $sans-serif; - font-weight: 700; - margin-bottom: 15px; - text-transform: none; + .due_dates { + li { + .assignment { + float: left; + } + .due_date { + float: right; + &.next { + font-weight: bold; } + } + } + li.past { + .assignment, .due_date { + text-decoration: line-through; + &, a { + color: #999999; - .teacher-image { - background: rgb(255,255,255); - border: 1px solid rgb(200,200,200); - height: 115px; - float: left; - margin: 0 15px 0px 0; - overflow: hidden; - padding: 1px; - width: 115px; + } + a:hover{ + color: #666666; + } + } + } + li.next { + border-bottom: 2px solid $blue; + .assignment, .due_date { + &, a { + font-weight: bold; + } + } + } + } - img { - display: block; - min-height: 100%; - max-width: 100%; - } + .course-staff { + .teacher { + margin-bottom: 40px; + + h3 { + color: $base-font-color; + font-family: $sans-serif; + font-weight: 700; + margin-bottom: 15px; + text-transform: none; + } + + .teacher-image { + background: rgb(255,255,255); + border: 1px solid rgb(200,200,200); + height: 115px; + float: left; + margin: 0 15px 0px 0; + overflow: hidden; + padding: 1px; + width: 115px; + + img { + display: block; + min-height: 100%; + max-width: 100%; + } + } + } + } + + .course-content{ + + .project { + ul, ol { + margin-top: 3px; + list-style: disc; + ul, ol { + margin: 0px; } } } - .course-content{ - - .project { - ul, ol { - margin-top: 3px; - list-style: disc; - ul, ol { - margin: 0px; - } - } - } - - h3, h4 { - font-weight: bold; - a { - color: inherit; - } - } - - h4 { - font-size: 1em; - } - - p, .code_snippet { - margin-bottom: 1.416em; - } - - .choicegroup { - input[type=checkbox], input[type=radio] { - margin-right: 5px; - } - } - + h3, h4 { + font-weight: bold; + a { + color: inherit; + } } + h4 { + font-size: 1em; + } + + p, .code_snippet { + margin-bottom: 1.416em; + } + + .choicegroup { + input[type=checkbox], input[type=radio] { + margin-right: 5px; + } + } + + } + } diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html index ced427d31a..a1cab83104 100644 --- a/lms/templates/courseware/info.html +++ b/lms/templates/courseware/info.html @@ -1,4 +1,5 @@ <%inherit file="/main.html" /> +<%block name="bodyclass">${course.css_class} <%namespace name='static' file='/static_content.html'/> <%block name="headextra">