Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list

webapp/components/User/User.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="user" v-if="displayAnonymous">
-    <hc-avatar />
+    <hc-avatar class="avatar" />
     <div>
       <b class="username">{{ $t('profile.userAnonym') }}</b>
     </div>
@@ -9,7 +9,7 @@
     <template slot="default" slot-scope="{ openMenu, closeMenu, isOpen }">
       <nuxt-link :to="userLink" :class="['user', isOpen && 'active']">
         <div @mouseover="openMenu(true)" @mouseleave="closeMenu(true)">
-          <hc-avatar :user="user" />
+          <hc-avatar class="avatar" :user="user" />
           <div>
             <b class="username">{{ userName | truncate(18) }}</b>
           </div>
@@ -134,7 +134,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
 .avatar {
   display: inline-block;
   float: left;

webapp/pages/index.spec.js

@@ -88,6 +88,8 @@ describe('PostIndex', () => {
     })
 
     it('clears the search when the filter menu emits clearSearch', () => {
+      mocks.$route.query.hashtag = '#samplehashtag'
+      wrapper = Wrapper()
       wrapper.find(FilterMenu).vm.$emit('clearSearch')
       expect(wrapper.vm.hashtag).toBeNull()
     })

webapp/pages/index.vue

@@ -222,7 +222,6 @@ export default {
   width: 250px;
   position: relative;
   float: right;
-  padding: 0 18px;
   margin: 4px 0;
 }
 </style>