Merge pull request #2125 from edx/giulio/fix-footer-layout

fix footer and header spacing/margin issues

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();
+      width: flex-grid(8,12);
       float: left;
 
       .nav-colophon {
@@ -71,7 +71,7 @@
 
         p {
           float: left;
-          width: 460px;
+          width: flex-grid(6,8);
           margin-left: $baseline;
           padding-left: $baseline;
           font-size: em(13);
@@ -91,7 +91,6 @@
         text-align: right;
 
         li {
-          margin-right: ($baseline/10);
           display: inline-block;
 
           &:last-child {
@@ -154,9 +153,5 @@
     .colophon-about img {
       margin-top: ($baseline*1.5);
     }
-
-    .colophon-about p {
-      width: 360px;
-    }
   }
 }

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 {