Merge branch 'develop' of github.com:edenspiekermann/globus-prototype…

… into develop
edenspiekermann · May 2, 2018 · 50f26a2 · 50f26a2
2 parents 5d0c6a1 + 88d2621
commit 50f26a2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/listicle/summary/index.jsx b/components/listicle/summary/index.jsx
@@ -141,7 +141,7 @@ export default class extends React.Component {
               order: 1;
               padding: 0;
               transform: translateX(7.5%);
-              width: 33.333%;
+              width: 50%;
             }
           }
 

diff --git a/components/main-content/styles.js b/components/main-content/styles.js
@@ -6,13 +6,13 @@ export default css`
   .main-content {
     display: flex;
     flex-direction: column;
-    padding-bottom: 80px;
   }
 
   @media ${tokens.mq.tablet} {
     .main-content {
       flex-direction: row;
       justify-content: space-between;
+      padding-bottom: 80px;
     }
   }
 `;