merge remote master

vinaypuppal · vinaypuppal · commit 1d245f3c0a4b · 2017-10-19T00:18:26.000+05:30
diff --git a/components/header.js b/components/header.js
@@ -103,8 +103,8 @@ export default props => {
           align-items: center;
         }
         .nav__logo img {
-          width: 72px;
-          height: 72px;
+          width: 50px;
+          height: 50px;
           margin-right: 5px;
         }
         .nav__links {
diff --git a/components/row-events.js b/components/row-events.js
@@ -20,10 +20,13 @@ const RowEvent = props => {
         </span>
         <span className="card_icons">
           <Icon name="users" />
-          {`${props.yesCount} attended`}
+          {props.yesCount}
+          {props.status === 'upcoming' ? ' attending' : ' attended'}
+        </span>
+        <span className="card_icons">
+          <Icon name="log out" />
+          {props.venue === undefined ? 'Free session' : 'Free entry'}
         </span>
-        <Icon name="log out" />
-        {props.venue === undefined ? 'Free session' : 'Free entry'}
       </Card.Content>
       <style jsx>{`
         .card_venue {
@@ -32,6 +35,12 @@ const RowEvent = props => {
         .card_icons {
           margin-right: 15px;
         }
+        @media (max-width: 700px) {
+          .card_icons {
+            display: flex;
+            margin: 5px 0;
+          }
+        }
       `}</style>
     </Card>
   );
diff --git a/pages/events.js b/pages/events.js
@@ -62,6 +62,7 @@ class Events extends React.Component {
                       time={event.time}
                       venue={event.venue}
                       link={event.link}
+                      status={event.status}
                     />
                   </Card.Group>
                 ))}
@@ -77,6 +78,7 @@ class Events extends React.Component {
                       time={event.time}
                       venue={event.venue}
                       link={event.link}
+                      status={event.status}
                     />
                   </Card.Group>
                 ))}

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ export default props => {`
`103`	`103`	`align-items: center;`
`104`	`104`	`}`
`105`	`105`	`.nav__logo img {`
`106`		`- width: 72px;`
`107`		`- height: 72px;`
	`106`	`+ width: 50px;`
	`107`	`+ height: 50px;`
`108`	`108`	`margin-right: 5px;`
`109`	`109`	`}`
`110`	`110`	`.nav__links {`