Merge branch 'master' into class-properties-initializers

src/components/EntryListing.js

@@ -17,9 +17,8 @@ export default class EntryListing extends React.Component {
         { mq: '495px', columns: 2, gutter: 15 },
         { mq: '750px', columns: 3, gutter: 15 },
         { mq: '1005px', columns: 4, gutter: 15 },
-        { mq: '1260px', columns: 5, gutter: 15 },
-        { mq: '1515px', columns: 6, gutter: 15 },
-        { mq: '1770px', columns: 7, gutter: 15 },
+        { mq: '1515px', columns: 5, gutter: 15 },
+        { mq: '1770px', columns: 6, gutter: 15 },
       ]
     };
 

src/components/UnpublishedListing.css

@@ -24,25 +24,26 @@
 
 .card {
   width: 100% !important;
-  margin: 7px 0;
+  margin: 7px 0 0 10px;
+  padding: 7px 0;
+}
 
-  & h2 {
-    font-size: 17px;
-    & small {
-      font-weight: normal;
-    }
+.cardHeading {
+  font-size: 17px;
+  & small {
+    font-weight: normal;
   }
+}
 
-  & p {
-    color: #555;
-    font-size: 12px;
-    margin-top: 5px;
-  }
+.cardText {
+  color: #555;
+  font-size: 12px;
+  margin-top: 5px;
+}
 
-  & button {
-    margin: 10px 10px 0 0;
-    float: right;
-  }
+.button {
+  margin: 10px 10px 0 0;
+  float: right;
 }
 
 

src/components/UnpublishedListing.js

@@ -53,10 +53,10 @@ class UnpublishedListing extends React.Component {
             <DragSource key={slug} slug={slug} collection={collection} ownStatus={ownStatus}>
               <div className={styles.drag}>
                 <Card className={styles.card}>
-                  <h2><Link to={link}>{entry.getIn(['data', 'title'])}</Link> <small>by {author}</small></h2>
-                  <p>Last updated: {timeStamp} by {entry.getIn(['metaData', 'user'])}</p>
+                  <span className={styles.cardHeading}><Link to={link}>{entry.getIn(['data', 'title'])}</Link> <small>by {author}</small></span>
+                  <p className={styles.cardText}>Last updated: {timeStamp} by {entry.getIn(['metaData', 'user'])}</p>
                   {(ownStatus === status.last()) &&
-                    <button onClick={this.requestPublish.bind(this, collection, slug, status)}>Publish now</button>
+                    <button className={styles.button} onClick={this.requestPublish.bind(this, collection, slug, status)}>Publish now</button>
                   }
                 </Card>
               </div>