Merge branch 'master' into ref-update

Author: lmccart

src/assets/css/main.css

@@ -795,7 +795,7 @@ textarea {
     width: 100px;*/
   height: 100px;
   position: relative;
-  margin-top: 1.5em; /* temp promo */
+  /* margin-top: 1.5em; temp promo */
 }
 
 #navi,
@@ -1644,7 +1644,7 @@ footer {
 @media (min-width: 769px) {
   .container {
     width: 49em !important;
-    margin: 11.5em auto; /* temp promo, normally 10em */
+    margin: 10em auto; /* temp promo, 11.5em */
   }
   main {
     width: 36em;
@@ -1657,7 +1657,7 @@ footer {
 
 @media (min-width: 720px) {
   .container {
-    margin: 11.5em auto; /* temp promo, normally 10em */
+    margin: 10em auto; /* temp promo, 11.5em */
     width: 100%;
     padding: 0.8em 0 0 0;
     height: auto;
@@ -1683,7 +1683,7 @@ footer {
   }
   #i18n-btn {
     position: absolute;
-    top: 4.0em; /* temp promo, normally 2.5em */
+    top: 2.5em; /* temp promo, 4.0em */
     right: 1em;
   }
   #i18n-btn a {