Restuta#207: fixes after review

AlexanderKapelyukhovskiy · May 29, 2017 · 387c74a · 387c74a
1 parent aa7eedb
commit 387c74a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/src/client/calendar/Calendars.jsx b/src/client/calendar/Calendars.jsx
@@ -8,19 +8,21 @@ class Calendars extends Component {
       calendars
     } = this.props
 
-    const calendarsComponent = Object.keys(calendars)
-      .map(k => <li key={k}>
-        <a href={`calendars/${k.replace('cal-', '')}`}>
-          {calendars[k].name}
+    const calendarsComponents = Object.keys(calendars)
+      .map(key => <li key={key}>
+        <a href={`calendars/${key.replace('cal-', '')}`}>
+          {calendars[key].name}
         </a>
-        {calendars[k].description && <p>Description: <b>{calendars[k].description}</b></p>}
+        {calendars[key].description && <p>Description: <b>{calendars[key].description}</b></p>}
       </li>)
 
     return (
-      <ul className='Calendars'>
-        <li>Calendars:</li>
-        {calendarsComponent}
-      </ul>
+      <div style={{display: 'flex'}}>
+        <div>Calendars:</div>
+        <ul className='Calendars'>
+          {calendarsComponents}
+        </ul>
+      </div>
     )
   }
 }

diff --git a/src/client/calendar/Calendars.scss b/src/client/calendar/Calendars.scss
@@ -2,18 +2,13 @@
   list-style-type: none;
 
   li {
-    height: 100px;
-    width: 240px;
+    height: 8rem;
+    width: 20rem;
     float: left;
     text-align: center;
-    margin-right: 20px;
-    border: 1px solid #aaa;
-    padding: 0 20px;
-  }
-
-  li:first-child {
-    border: none;
-    text-align: right;
+    margin-right: 1rem;
+    border: 0.1rem solid #aaa;
+    padding: 0 1rem;
   }
 
   li a {