moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into refactor-emoji-input 

* upstream/develop:
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
This commit is contained in:
Henry Jameson 2019-06-08 14:31:49 +03:00
parent 96f31716f9 0ecf23881d
commit ca3140fd3e
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/who_to_follow/who_to_follow.js
View File

@ -20,7 +20,8 @@ const WhoToFollow = {
id: 0, id: 0,
name: i.display_name, name: i.display_name,
screen_name: i.acct, screen_name: i.acct,
profile_image_url: i.avatar || '/images/avi.png' profile_image_url: i.avatar || '/images/avi.png',
profile_image_url_original: i.avatar || '/images/avi.png'
} }
this.users.push(user) this.users.push(user)

24
src/components/who_to_follow_panel/who_to_follow_panel.vue
View File

@ -6,14 +6,18 @@
{{$t('who_to_follow.who_to_follow')}} {{$t('who_to_follow.who_to_follow')}}
</div> </div>
</div> </div>
<div class="panel-body who-to-follow"> <div class="who-to-follow">
<span v-for="user in usersToFollow"> <p v-for="user in usersToFollow" class="who-to-follow-items">
<img v-bind:src="user.img" /> <img v-bind:src="user.img" />
<router-link v-bind:to="userProfileLink(user.id, user.name)"> <router-link v-bind:to="userProfileLink(user.id, user.name)">
{{user.name}} {{user.name}}
</router-link><br /> </router-link><br />
</span> </p>
<img v-bind:src="$store.state.instance.logo"> <router-link :to="{ name: 'who-to-follow' }">{{$t('who_to_follow.more')}}</router-link> <p class="who-to-follow-more">
<router-link :to="{ name: 'who-to-follow' }">
{{$t('who_to_follow.more')}}
</router-link>
</p>
</div> </div>
</div> </div>
</div> </div>
@ -30,11 +34,19 @@
height: 32px; height: 32px;
} }
.who-to-follow { .who-to-follow {
padding: 0.5em 1em 0.5em 1em; padding: 0em 1em;
margin: 0px; margin: 0px;
line-height: 40px; }
.who-to-follow-items {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
padding: 0px;
margin: 1em 0em;
}
.who-to-follow-more {
padding: 0px;
margin: 1em 0em;
text-align: center;
} }
</style> </style>