diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-04-09 16:21:54 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-04-09 16:21:54 -0400 |
| commit | 7ee87c7618bfba986ec7a04581273629a1db9983 (patch) | |
| tree | 5a380aafa6c821d47e0d1efedddd95811efda87f /src/components/status/status.vue | |
| parent | f3ca011fbedb2ce6271bcc887d290828ccd1d284 (diff) | |
| parent | cd959d9df8c5cec8361892d92daf524ecfa4c76f (diff) | |
Merge branch 'feature/filtering' into 'develop'
Feature/filtering
See merge request !68
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 993ce796..b471888a 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -3,6 +3,7 @@ <template v-if="muted"> <div class="media status container muted"> <small><router-link :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small> + <small class="muteWords">{{muteWordHits.join(', ')}}</small> <a href="#" class="unmute" @click.prevent="toggleMute"><i class="icon-eye-off"></i></a> </div> </template> @@ -52,10 +53,10 @@ <small> <a href="#" @click.prevent="toggleExpanded" ><i class="icon-plus-squared"></i></a> </small> - <small v-if="status.user.muted"> - <a href="#" @click.prevent="toggleMute" ><i class="icon-eye-off"></i></a> - </small> </template> + <small v-if="unmuted"> + <a href="#" @click.prevent="toggleMute" ><i class="icon-eye-off"></i></a> + </small> <small v-if="!status.is_local" class="source_url"> <a :href="status.external_url" target="_blank" ><i class="icon-binoculars"></i></a> </small> @@ -167,6 +168,10 @@ button { margin-left: auto; } + + .muteWords { + margin-left: 10px; + } } a.unmute { |