From 2019af41708ff337e6d8b02ddff1567a46281309 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Tue, 22 Jan 2013 09:31:40 -0500 Subject: [PATCH] drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons --- ...{social-facebook.png => ico-social-facebook.png} | Bin .../{social-google.png => ico-social-google.png} | Bin .../{social-meetup.png => ico-social-meetup.png} | Bin .../{social-twitter.png => ico-social-twitter.png} | Bin .../{social-youtube.png => ico-social-youtube.png} | Bin lms/static/sass/multicourse/_account.scss | 4 ++-- lms/static/sass/shared/_footer.scss | 9 +++++---- lms/static/sass/shared/_header.scss | 7 ++++--- lms/templates/footer.html | 10 +++++----- lms/templates/navigation.html | 2 +- 10 files changed, 17 insertions(+), 15 deletions(-) rename lms/static/images/social/{social-facebook.png => ico-social-facebook.png} (100%) rename lms/static/images/social/{social-google.png => ico-social-google.png} (100%) rename lms/static/images/social/{social-meetup.png => ico-social-meetup.png} (100%) rename lms/static/images/social/{social-twitter.png => ico-social-twitter.png} (100%) rename lms/static/images/social/{social-youtube.png => ico-social-youtube.png} (100%) diff --git a/lms/static/images/social/social-facebook.png b/lms/static/images/social/ico-social-facebook.png similarity index 100% rename from lms/static/images/social/social-facebook.png rename to lms/static/images/social/ico-social-facebook.png diff --git a/lms/static/images/social/social-google.png b/lms/static/images/social/ico-social-google.png similarity index 100% rename from lms/static/images/social/social-google.png rename to lms/static/images/social/ico-social-google.png diff --git a/lms/static/images/social/social-meetup.png b/lms/static/images/social/ico-social-meetup.png similarity index 100% rename from lms/static/images/social/social-meetup.png rename to lms/static/images/social/ico-social-meetup.png diff --git a/lms/static/images/social/social-twitter.png b/lms/static/images/social/ico-social-twitter.png similarity index 100% rename from lms/static/images/social/social-twitter.png rename to lms/static/images/social/ico-social-twitter.png diff --git a/lms/static/images/social/social-youtube.png b/lms/static/images/social/ico-social-youtube.png similarity index 100% rename from lms/static/images/social/social-youtube.png rename to lms/static/images/social/ico-social-youtube.png diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss index 74e3b6fccb..97233911fd 100644 --- a/lms/static/sass/multicourse/_account.scss +++ b/lms/static/sass/multicourse/_account.scss @@ -335,10 +335,10 @@ button[type="submit"] { @include button(simple, $blue); @include box-sizing(border-box); - @include border-radius(2px); + @include border-radius(3px); padding: ($baseline*0.75) $baseline; font-size: em(16); - font-weight: 600; + font-weight: 700; letter-spacing: 0; text-align: center; diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss index f2596f7ba2..7702d4d542 100644 --- a/lms/static/sass/shared/_footer.scss +++ b/lms/static/sass/shared/_footer.scss @@ -1,6 +1,6 @@ .wrapper-footer { border-top: 1px solid tint($m-gray,50%); - padding: $baseline ($baseline/2) ($baseline*1.5) ($baseline/2); + padding: 25px ($baseline/2) ($baseline*1.5) ($baseline/2); background: $white; footer { @@ -58,6 +58,7 @@ } .colophon-about { + @include clearfix(); img { width: 68px; @@ -79,12 +80,12 @@ // references .references { - margin: 0; + margin: -10px 0 0 0; width: flex-grid(4); float: right; .nav-social { - margin: 0 0 ($baseline/4) 0; + margin: 0; text-align: right; li { @@ -110,7 +111,7 @@ } .copyright { - margin: 0 0 ($baseline/4) 0; + margin: -2px 0 8px 0; font-size: em(11); color: tint($m-gray,50%); text-align: right; diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss index 0f0c1659d2..b676270261 100644 --- a/lms/static/sass/shared/_header.scss +++ b/lms/static/sass/shared/_header.scss @@ -299,10 +299,11 @@ header.global { @include box-sizing(border-box); @include border-radius(3px); padding: ($baseline/4) ($baseline/2); - font-size: em(14); - font-weight: 600; - letter-spacing: 0; + font-size: em(15); + font-weight: 500; + letter-spacing: 1px; text-align: center; + text-transform: uppercase; &:hover { text-decoration: none; diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 34fa9f17e3..642f0cfe01 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -42,27 +42,27 @@ diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html index 898c665b85..8b7831becf 100644 --- a/lms/templates/navigation.html +++ b/lms/templates/navigation.html @@ -91,7 +91,7 @@ site_status_msg = get_site_status_msg(course_id)
  1. % if not settings.MITX_FEATURES['DISABLE_LOGIN_BUTTON']: - + % endif