From c51f78bdfad4900e9e112f9d1abf831e5a226a79 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 24 Jul 2012 16:54:31 -0400 Subject: [PATCH 1/3] Added styles for course images to always the right dimentions --- lms/static/sass/multicourse/_course_about.scss | 13 +++++++------ lms/templates/portal/course_about.html | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index f96d12f7a3..de09505252 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -27,14 +27,17 @@ max-width: 1200px; min-width: 760px; position: relative; - width: 100%; z-index: 2; - + > div.table { + display: table; + width: 100%; + } .intro { @include box-sizing(border-box); @include clearfix; - float: left; + display: table-cell; + vertical-align: middle; padding: 20px 20px; position: relative; width: flex-grid(8) + flex-gutter(); @@ -130,9 +133,7 @@ .media { background: transparent; @include box-sizing(border-box); - display: block; - float: right; - height: 180px; + display: table-cell; padding: 20px; position: relative; width: flex-grid(4); diff --git a/lms/templates/portal/course_about.html b/lms/templates/portal/course_about.html index bb00a6abf0..7780d939de 100644 --- a/lms/templates/portal/course_about.html +++ b/lms/templates/portal/course_about.html @@ -51,6 +51,7 @@
+

${course.number}: ${get_course_about_section(course, "title")}${get_course_about_section(course, "university")}

@@ -84,6 +85,7 @@
% endif
+
From b402cde65014f1d078e85505622bd4389c7fdced Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Tue, 24 Jul 2012 13:48:20 -0400 Subject: [PATCH 2/3] Added some style for the dashboard message --- lms/static/sass/multicourse/_dashboard.scss | 21 +++++++++++++++++++++ lms/templates/dashboard.html | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index a3d21cb1b3..9c2b71f5c0 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -2,6 +2,27 @@ @include clearfix; padding: 60px 0px 120px; + .dashboard-banner { + background: $yellow; + border: 1px solid rgb(200,200,200); + @include box-shadow(0 1px 0 0 rgba(255,255,255, 0.6)); + padding: 10px; + margin-bottom: 30px; + + &:empty { + display: none; + background-color: #FFF; + } + + h2 { + margin-bottom: 0; + } + + p { + margin-bottom: 0; + } + } + .profile-sidebar { background: transparent; float: left; diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index b0d4308253..f1e19b6e5f 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -36,7 +36,6 @@
${message} -
From a2271d4e48992682d14b8c436a22d18fae6a2b09 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Tue, 24 Jul 2012 13:52:13 -0400 Subject: [PATCH 3/3] The message div will only show up when there is a message to display. --- lms/templates/dashboard.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index f1e19b6e5f..160b453853 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -34,9 +34,11 @@
-
- ${message} -
+ %if message: +
+ ${message} +
+ %endif