diff --git a/lms/static/images/courses/edx_hp_video_thumbsmall.jpg b/lms/static/images/courses/edx_hp_video_thumbsmall.jpg new file mode 100644 index 0000000000..8d4fcec72d Binary files /dev/null and b/lms/static/images/courses/edx_hp_video_thumbsmall.jpg differ diff --git a/lms/static/images/homepage-bg.jpg b/lms/static/images/homepage-bg.jpg index 29e408ea6f..c2c1e805b5 100644 Binary files a/lms/static/images/homepage-bg.jpg and b/lms/static/images/homepage-bg.jpg differ diff --git a/lms/static/sass/_course_about.scss b/lms/static/sass/_course_about.scss index f5085ae216..0f453e242a 100644 --- a/lms/static/sass/_course_about.scss +++ b/lms/static/sass/_course_about.scss @@ -25,8 +25,9 @@ @include clearfix; margin: 0 auto; max-width: 1200px; + min-width: 760px; position: relative; - width: grid-width(12); + width: 100%; z-index: 2; diff --git a/lms/static/sass/_courses.scss b/lms/static/sass/_courses.scss index 246a7d1083..6fef20ea22 100644 --- a/lms/static/sass/_courses.scss +++ b/lms/static/sass/_courses.scss @@ -15,6 +15,7 @@ height: 120px; margin: 0 auto; max-width: 1200px; + min-width: 760px; padding-top: 200px; position: relative; text-align: center; diff --git a/lms/static/sass/_home.scss b/lms/static/sass/_home.scss index 8f18752438..0a03faa28d 100644 --- a/lms/static/sass/_home.scss +++ b/lms/static/sass/_home.scss @@ -19,7 +19,8 @@ margin: 0 auto; padding: 200px 10px 0px; position: relative; - width: grid-width(12); + max-width: 1200px; + min-width: 760px; } .title { diff --git a/lms/static/sass/_password_reset.scss b/lms/static/sass/_password_reset.scss index 292ca34e77..a2365e3e3e 100644 --- a/lms/static/sass/_password_reset.scss +++ b/lms/static/sass/_password_reset.scss @@ -6,7 +6,7 @@ @include box-shadow(0 5px 50px 0 rgba(0,0,0, 0.3)); margin: 120px auto 0; padding: 0px 40px 40px; - width: grid-width(5); + width: flex-grid(5); header { margin-bottom: 30px; diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss index 63b88d5698..80ca693155 100644 --- a/lms/static/sass/base/_base.scss +++ b/lms/static/sass/base/_base.scss @@ -83,7 +83,7 @@ a:link, a:visited { @include clearfix; margin: 0 auto 0; padding: 0px 10px; - width: grid-width(12); + max-width: grid-width(12); } span.edx { diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index db473c77a7..4fb95f7004 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -15,7 +15,8 @@ footer { max-width: 1200px; margin: 0 auto; padding: 30px 10px 0; - width: grid-width(12); + max-width: grid-width(12); + min-width: 760px; .top { border-bottom: 1px solid rgb(200,200,200); diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 657ee4c56e..857db39a8d 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -13,7 +13,8 @@ header.global { margin: 0 auto; max-width: 1200px; padding: 14px 10px 0px; - width: grid-width(12); + max-width: grid-width(12); + min-width: 760px; } h1.logo { diff --git a/lms/templates/index.html b/lms/templates/index.html index d7c205ce46..bfc6402098 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -19,15 +19,15 @@
- - - -
@@ -36,7 +36,7 @@
- +
diff --git a/lms/templates/portal/course_about.html b/lms/templates/portal/course_about.html index 95afcfd73c..7a9adbee4c 100644 --- a/lms/templates/portal/course_about.html +++ b/lms/templates/portal/course_about.html @@ -68,13 +68,12 @@
- - -
diff --git a/lms/templates/university_profile/berkeleyx.html b/lms/templates/university_profile/berkeleyx.html index 9e36d99597..0cbcbbd6de 100644 --- a/lms/templates/university_profile/berkeleyx.html +++ b/lms/templates/university_profile/berkeleyx.html @@ -16,7 +16,7 @@ <%block name="university_description"> -

The University of California, Berkeley was chartered in 1868 and its flagship campus — envisioned as a "City of Learning" — was established at Berkeley, on San Francisco Bay. Berkeley Faculty consists of 1,582 fulltime and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units. 28 Nobel prizes have been awarded to Berkeley Alumni. There are 8 Nobel Laureates, 32 MacArthur Fellows, and 4 Pulitzer Prize winners among the current faculty.

+

The University of California, Berkeley was chartered in 1868 and its flagship campus — envisioned as a "City of Learning" — was established at Berkeley, on San Francisco Bay. Berkeley Faculty consists of 1,582 fulltime and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units. 28 Nobel prizes have been awarded to Berkeley Alumni. There are eight Nobel Laureates, 32 MacArthur Fellows, and four Pulitzer Prize winners among the current faculty.

${parent.body()}