From 597c1db5851f53ead73a697b5b2eb661da57c505 Mon Sep 17 00:00:00 2001 From: Galen Frechette Date: Tue, 10 Jul 2012 14:38:26 -0400 Subject: [PATCH] updates basic html structure and base color --- lms/static/sass/_base.scss | 7 +- lms/static/sass/_shared_footer.scss | 3 +- lms/static/sass/application.css | 11 +- lms/templates/courses.html | 2 +- lms/templates/dashboard.html | 204 ++++++++++++++-------------- lms/templates/index.html | 2 +- lms/templates/main.html | 8 +- 7 files changed, 117 insertions(+), 120 deletions(-) diff --git a/lms/static/sass/_base.scss b/lms/static/sass/_base.scss index 86a51c17a3..97873d0b76 100644 --- a/lms/static/sass/_base.scss +++ b/lms/static/sass/_base.scss @@ -15,7 +15,7 @@ $blue: rgb(29,157,217); $pink: rgb(182,37,104); html, body { - background: rgb(253,253,253); + background: rgb(250,250,250); font-size: 75%; } @@ -23,7 +23,6 @@ h1, h2, h3, h4, h5, h6 { color: $base-font-color; font: normal 1.4rem/2rem $serif; margin: 0px; - -webkit-font-smoothing: antialiased; } h1 { @@ -41,13 +40,13 @@ h2 { letter-spacing: 1px; margin-bottom: 15px; text-transform: uppercase; + -webkit-font-smoothing: antialiased; } p { color: $base-font-color; font: normal 1.3rem/2rem $serif; margin: 0px; - //-webkit-font-smoothing: antialiased; } p + p { @@ -73,7 +72,6 @@ a:link, a:visited { font: normal 1.2rem/2rem $sans-serif; text-decoration: none; @include transition(all, 0.1s, linear); - //-webkit-font-smoothing: antialiased; &:hover { color: $base-font-color; @@ -81,6 +79,7 @@ a:link, a:visited { } .content-wrapper { + background: rgb(255,255,255); margin: 0 auto 0; width: flex-grid(12); } diff --git a/lms/static/sass/_shared_footer.scss b/lms/static/sass/_shared_footer.scss index 148afedef7..e5d94b2e9e 100644 --- a/lms/static/sass/_shared_footer.scss +++ b/lms/static/sass/_shared_footer.scss @@ -1,5 +1,5 @@ footer { - background: rgb(250,250,250); + background: transparent; border-top: 1px solid rgb(200,200,200); @include box-shadow(inset 0 1px 3px 0 rgba(0,0,0, 0.1)); margin: 0 auto; @@ -67,7 +67,6 @@ footer { color: $lighter-base-font-color; font: italic 1.2rem/1.6rem $serif; margin-left: 5px; - //text-decoration: underline; } } } diff --git a/lms/static/sass/application.css b/lms/static/sass/application.css index 0f23d1aa3a..76051abb87 100755 --- a/lms/static/sass/application.css +++ b/lms/static/sass/application.css @@ -364,14 +364,13 @@ td { font-style: italic; } html, body { - background: #fdfdfd; + background: #fafafa; font-size: 75%; } h1, h2, h3, h4, h5, h6 { color: #3c3c3c; font: normal 1.4rem/2rem Georgia, Cambria, "Times New Roman", Times, serif; - margin: 0px; - -webkit-font-smoothing: antialiased; } + margin: 0px; } h1 { color: #a0a0a0; @@ -386,7 +385,8 @@ h2 { font: normal 1.4rem/2rem Georgia, Cambria, "Times New Roman", Times, serif; letter-spacing: 1px; margin-bottom: 15px; - text-transform: uppercase; } + text-transform: uppercase; + -webkit-font-smoothing: antialiased; } p { color: #3c3c3c; @@ -452,6 +452,7 @@ a:link, a:visited { color: #3c3c3c; } .content-wrapper { + background: white; margin: 0 auto 0; width: 100%; } @@ -1391,7 +1392,7 @@ form { box-shadow: inset 0 0 20px 0 #00295f, 0 1px 0 white; } footer { - background: #fafafa; + background: transparent; border-top: 1px solid #c8c8c8; -webkit-box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 3px 0 rgba(0, 0, 0, 0.1); diff --git a/lms/templates/courses.html b/lms/templates/courses.html index 35585efdfa..f00eaa77fa 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -16,7 +16,7 @@
## I'm removing this for now since we aren't using it for the fall. - <%include file="course_filter.html" /> + ## <%include file="course_filter.html" />
%for course in courses: <%include file="course.html" args="course=course" /> diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 10d5b4853b..a3923ece05 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -3,110 +3,108 @@ <%namespace name='static' file='static_content.html'/> -
-
+
-
-
- +
+
+
+ +
+
+

My Current Courses

+
+ + % if len(courses) > 0: + % for course in courses: + + % endfor + % else: +
+

Looks like you aren't registered for any courses. You should take a minute and Find some courses!

+
+ % endif + + +
+
diff --git a/lms/templates/index.html b/lms/templates/index.html index b53d095039..4deec79e31 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -2,7 +2,7 @@ <%inherit file="main.html" /> <%namespace name='static' file='static_content.html'/> -
+

The Future of Online Education

diff --git a/lms/templates/main.html b/lms/templates/main.html index ef9c78b302..43f6e9e4f7 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -67,14 +67,14 @@

You are using a browser that is not supported by edX, and you might not be able to complete pieces of the course. Please download the latest version of Firefox or Chrome to get the full experience.

- ${self.body()} +
+ ${self.body()} +
+ <%block name="bodyextra"/> <%include file="footer.html" /> <%block name="js_extra"/> -