From b557363ac289469ee3a2dc2b4df3f9c98806a7b6 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 23 Jul 2012 13:23:06 -0400 Subject: [PATCH 1/3] Added som fixed for fluid design --- lms/static/sass/base/_base.scss | 2 +- lms/static/sass/multicourse/_home.scss | 9 +++++---- lms/templates/index.html | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index 80ca693155..961427d490 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -82,7 +82,7 @@ a:link, a:visited { .container { @include clearfix; margin: 0 auto 0; - padding: 0px 10px; + padding: 0px 30px; max-width: grid-width(12); } diff --git a/lms/static/sass/multicourse/_home.scss b/lms/static/sass/multicourse/_home.scss index c7cda46cb4..89af76abaf 100644 --- a/lms/static/sass/multicourse/_home.scss +++ b/lms/static/sass/multicourse/_home.scss @@ -30,11 +30,11 @@ border: 1px solid rgb(100,100,100); @include box-shadow(0 4px 25px 0 rgba(0,0,0, 0.5)); @include box-sizing(border-box); - height: 120px; + min-height: 120px; margin-left: grid-width(2) + $gw-gutter; + width: flex-grid(6); float: left; position: relative; - text-align: center; @include transition(all, 0.2s, linear); vertical-align: top; @@ -46,7 +46,6 @@ > hgroup { @include box-sizing(border-box); - height: 120px; @include inline-block; left: 0px; opacity: 1; @@ -86,7 +85,7 @@ padding: 4px; position: relative; vertical-align: top; - width: 210px; + width: flex-grid(2) + flex-gutter(); z-index: 2; &:hover { @@ -97,6 +96,8 @@ height: 100%; overflow: hidden; position: relative; + background: url('../images/courses/video-thumb.jpg') center no-repeat; + @include background-size(cover); .play-intro { @include background-image(linear-gradient(-90deg, rgba(0,0,0, 0.65), rgba(0,0,0, 0.75))); diff --git a/lms/templates/index.html b/lms/templates/index.html index e3786b1af2..be779769a6 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -36,7 +36,6 @@
-
From 6da83900aa79d45ae7e6f9e66dc80f9bf47372ca Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 23 Jul 2012 13:23:34 -0400 Subject: [PATCH 2/3] Added min width for container --- lms/static/sass/base/_base.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index 961427d490..6e4881865e 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -84,6 +84,7 @@ a:link, a:visited { margin: 0 auto 0; padding: 0px 30px; max-width: grid-width(12); + min-width: 760px; } span.edx { From 54516a95603fe64100bef687a930b4ebe5b1a343 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 23 Jul 2012 13:56:11 -0400 Subject: [PATCH 3/3] Fix grid and make sure that everything is fluid --- lms/static/sass/multicourse/_about_pages.scss | 17 +++++------ lms/static/sass/multicourse/_jobs.scss | 8 ++--- lms/static/sass/shared/_modal.scss | 30 +++---------------- lms/templates/contact.html | 4 +-- lms/templates/signup_modal.html | 2 +- lms/templates/static_templates/contact.html | 4 +-- 6 files changed, 21 insertions(+), 44 deletions(-) diff --git a/lms/static/sass/multicourse/_about_pages.scss b/lms/static/sass/multicourse/_about_pages.scss index fd4891b8bf..7b527c9a19 100644 --- a/lms/static/sass/multicourse/_about_pages.scss +++ b/lms/static/sass/multicourse/_about_pages.scss @@ -1,5 +1,5 @@ .container.about { - padding: 20px 10px 120px; + padding: 20px 30px 120px; > nav { margin-bottom: 80px; @@ -102,7 +102,6 @@ img { background: rgb(245,245,245); display: block; - //height: 200px; width: 100%; } } @@ -257,14 +256,14 @@ .contact { @include clearfix; margin: 0 auto; - width: flex-grid(10); - .map { - background: rgb(245,245,245); + .photo { + @include box-sizing(border-box); + background: rgb(255,255,255); + border: 1px solid rgb(210,210,210); + padding: 1px; float: left; - margin-right: flex-gutter(); - overflow: hidden; - width: flex-grid(6); + width: flex-grid(3); img { max-width: 100%; @@ -275,7 +274,7 @@ @include box-sizing(border-box); float: left; padding-left: 40px; - width: flex-grid(6); + width: flex-grid(9); ul { list-style: none; diff --git a/lms/static/sass/multicourse/_jobs.scss b/lms/static/sass/multicourse/_jobs.scss index 136281c561..306851e602 100644 --- a/lms/static/sass/multicourse/_jobs.scss +++ b/lms/static/sass/multicourse/_jobs.scss @@ -1,5 +1,5 @@ .container.jobs { - padding: 60px 0 120px; + padding: 60px 30px 120px; q { display: block; @@ -34,8 +34,7 @@ img { background: rgb(245,245,245); display: block; - height: 200px; - width: 100%; + max-width: 100%; } } @@ -54,7 +53,7 @@ p { margin-left: 0; font-style: italic; - line-height: 1.4; + line-height: 1.6; font-size: 1.1em; color: #666; } @@ -63,6 +62,7 @@ margin-top: 12px; display: block; color: #a0a0a0; + font-weight: 300; } } } diff --git a/lms/static/sass/shared/_modal.scss b/lms/static/sass/shared/_modal.scss index aea82910c7..7e90eeb01d 100644 --- a/lms/static/sass/shared/_modal.scss +++ b/lms/static/sass/shared/_modal.scss @@ -195,9 +195,8 @@ .citizenship, .gender, .date-of-birth { margin-bottom: 20px; - - .input-wrapper { - } + float: left; + width: flex-grid(4); label { display: block; @@ -205,36 +204,15 @@ select { width: 100%; + @include box-sizing(border-box); + display: block; } } .citizenship, .gender { - float: left; - width: flex-grid(4); - } - - .citizenship { margin-right: flex-gutter(); } - .date-of-birth { - float: left; - width: flex-grid(12); - - select { - @include box-sizing(border-box); - display: block; - float: left; - margin-right: flex-gutter(); - max-width: flex-grid(4); - width: flex-grid(4); - - &:last-child { - margin: 0px; - } - } - } - .submit { padding-top: 10px; diff --git a/lms/templates/contact.html b/lms/templates/contact.html index 940d4862c4..a8f5e6b732 100644 --- a/lms/templates/contact.html +++ b/lms/templates/contact.html @@ -11,12 +11,12 @@
-
+

Class Feedback

-

We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.

+

We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.

General Inquiries and Feedback

"If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit our FAQ page. You can also join the discussion on our facebook page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index f456a4c214..5ea4af1608 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -54,7 +54,7 @@
-
+