From 8d7b46b51b44a7c97cf0a2786e8e62e4f3efcfa3 Mon Sep 17 00:00:00 2001
From: Giulio Gratta <giulio@giuliogratta.com>
Date: Tue, 28 May 2013 10:15:39 -0700
Subject: [PATCH 1/4] fix footer element spacing issues

---
 lms/static/sass/shared/_footer.scss | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss
index e3e99ae301..b7ff7973ec 100644
--- a/lms/static/sass/shared/_footer.scss
+++ b/lms/static/sass/shared/_footer.scss
@@ -33,8 +33,8 @@
 
     // colophon
     .colophon {
-      margin-right: flex-gutter(2);
-      width: flex-grid(6,12);
+      //margin-right: flex-gutter(2);
+      width: flex-grid(8,12);
       float: left;
 
       .nav-colophon {
@@ -71,7 +71,7 @@
 
         p {
           float: left;
-          width: 460px;
+          width: flex-grid(9,12);
           margin-left: $baseline;
           padding-left: $baseline;
           font-size: em(13);
@@ -91,7 +91,7 @@
         text-align: right;
 
         li {
-          margin-right: ($baseline/10);
+          //margin-right: ($baseline/10);
           display: inline-block;
 
           &:last-child {

From ef6c365ca0c67905772fe1dc9d2f37e1147c22e7 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 28 May 2013 13:36:47 -0400
Subject: [PATCH 2/4] lms/mktg - revises paragraph in colophon portion of
 footer to match footer's flex-grid value

---
 lms/static/sass/shared/_footer.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss
index b7ff7973ec..100977639c 100644
--- a/lms/static/sass/shared/_footer.scss
+++ b/lms/static/sass/shared/_footer.scss
@@ -71,7 +71,7 @@
 
         p {
           float: left;
-          width: flex-grid(9,12);
+          width: flex-grid(6,8);
           margin-left: $baseline;
           padding-left: $baseline;
           font-size: em(13);
@@ -154,9 +154,5 @@
     .colophon-about img {
       margin-top: ($baseline*1.5);
     }
-
-    .colophon-about p {
-      width: 360px;
-    }
   }
 }

From 25305dc8f7f2d76e3b18b77991c4955f74f3dae1 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 28 May 2013 13:44:16 -0400
Subject: [PATCH 3/4] lms/mktg - removes margins from social icons and
 reinstates flex-gutter margin to colophon area of footer

---
 lms/static/sass/shared/_footer.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss
index 100977639c..864cf57d03 100644
--- a/lms/static/sass/shared/_footer.scss
+++ b/lms/static/sass/shared/_footer.scss
@@ -33,7 +33,7 @@
 
     // colophon
     .colophon {
-      //margin-right: flex-gutter(2);
+      margin-right: flex-gutter();
       width: flex-grid(8,12);
       float: left;
 
@@ -91,7 +91,6 @@
         text-align: right;
 
         li {
-          //margin-right: ($baseline/10);
           display: inline-block;
 
           &:last-child {

From 186da0d5fe6f2931522a626ea618d438c6e2bb3e Mon Sep 17 00:00:00 2001
From: Giulio Gratta <giulio@giuliogratta.com>
Date: Tue, 28 May 2013 10:49:58 -0700
Subject: [PATCH 4/4] fix user button/dropdown spacing/scrolling issue

---
 lms/static/sass/shared/_header.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/static/sass/shared/_header.scss b/lms/static/sass/shared/_header.scss
index 6987b35c84..0608a8faf4 100644
--- a/lms/static/sass/shared/_header.scss
+++ b/lms/static/sass/shared/_header.scss
@@ -14,7 +14,6 @@ header.global {
     padding: 18px 10px 0px;
     max-width: grid-width(12);
     min-width: 760px;
-    width: flex-grid(12);
   }
 
   h1.logo {