Merge branch 'niklas_dev2' of Software_Engineering_I/greenvironment-frontend into master

src/app/components/feed/postlist/postlist.component.html

@@ -11,10 +11,10 @@
         <p [innerHTML]="post.htmlContent" id="content"></p>
     </div>
     <div class="vote">
-        <button id="down" type='submit'><span><i class="fa fa-thumbs-o-down fa-2x" aria-hidden="true" (click)="voteDown(post)"></i></span></button>
-        <button id="up" type='submit'><span><i class="fa fa-thumbs-o-up fa-2x" aria-hidden="true" (click)="voteUp(post)"></i></span></button>
-        <span id="downvotes">{{post.downvotes}}</span>
-        <span id="upvotes">{{post.upvotes}}</span>
+      <button id="down" type='submit'><span><i class="fa fa-thumbs-o-down fa-2x" aria-hidden="true" (click)="voteDown(post)"></i></span></button>
+      <span id="downvotes">{{post.downvotes}}</span>
+      <button id="up" type='submit'><span><i class="fa fa-thumbs-o-up fa-2x" aria-hidden="true" (click)="voteUp(post)"></i></span></button>
+      <span id="upvotes">{{post.upvotes}}</span>
     </div>
   </div>
 </div>

src/app/components/feed/postlist/postlist.component.sass

@@ -43,6 +43,7 @@
         @include gridPosition(1, 2, 2, 3)
         display: grid
         grid-template: 70% 30% /50% 50%
+        height: 3em
         button
             background-color: $cFeedItemBackground
             border: none