diff options
| author | Henry Jameson <me@hjkos.com> | 2019-06-08 14:31:49 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-06-08 14:31:49 +0300 |
| commit | ca3140fd3ed1ce4522c04d445de42d721a0fbc87 (patch) | |
| tree | 802985e79496e07892929822f4733d207e18622a | |
| parent | 96f31716f94d0e7691b85ca90e7ea977ca3adb4d (diff) | |
| parent | 0ecf23881d1eea4ed46f151eaee2164ff390c926 (diff) | |
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
| -rw-r--r-- | src/components/who_to_follow/who_to_follow.js | 3 | ||||
| -rw-r--r-- | src/components/who_to_follow_panel/who_to_follow_panel.vue | 24 |
2 files changed, 20 insertions, 7 deletions
diff --git a/src/components/who_to_follow/who_to_follow.js b/src/components/who_to_follow/who_to_follow.js index be0b8827..7ae602a2 100644 --- a/src/components/who_to_follow/who_to_follow.js +++ b/src/components/who_to_follow/who_to_follow.js @@ -20,7 +20,8 @@ const WhoToFollow = { id: 0, name: i.display_name, 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) diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue index 25e3a9f6..74e82789 100644 --- a/src/components/who_to_follow_panel/who_to_follow_panel.vue +++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue @@ -6,14 +6,18 @@ {{$t('who_to_follow.who_to_follow')}} </div> </div> - <div class="panel-body who-to-follow"> - <span v-for="user in usersToFollow"> + <div class="who-to-follow"> + <p v-for="user in usersToFollow" class="who-to-follow-items"> <img v-bind:src="user.img" /> <router-link v-bind:to="userProfileLink(user.id, user.name)"> {{user.name}} </router-link><br /> - </span> - <img v-bind:src="$store.state.instance.logo"> <router-link :to="{ name: 'who-to-follow' }">{{$t('who_to_follow.more')}}</router-link> + </p> + <p class="who-to-follow-more"> + <router-link :to="{ name: 'who-to-follow' }"> + {{$t('who_to_follow.more')}} + </router-link> + </p> </div> </div> </div> @@ -30,11 +34,19 @@ height: 32px; } .who-to-follow { - padding: 0.5em 1em 0.5em 1em; + padding: 0em 1em; margin: 0px; - line-height: 40px; + } + .who-to-follow-items { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + padding: 0px; + margin: 1em 0em; + } + .who-to-follow-more { + padding: 0px; + margin: 1em 0em; + text-align: center; } </style> |