diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-06-27 07:19:49 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-06-27 07:19:49 +0000 |
| commit | ea0a12f6049241cb9e8fa7cd5bc6dc8b9852b57c (patch) | |
| tree | 36863abf8ac320756bc16906b11a7892ea7da0dc /src/components/domain_mute_card/domain_mute_card.vue | |
| parent | bad3dacfac1ef3dd2c0f55b53fb78f4bf410a01e (diff) | |
| parent | bbb91d8ae3f1c3d5374de7610e723e63121e8222 (diff) | |
Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts:
# src/components/settings_modal/tabs/profile_tab.vue
Diffstat (limited to 'src/components/domain_mute_card/domain_mute_card.vue')
| -rw-r--r-- | src/components/domain_mute_card/domain_mute_card.vue | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/components/domain_mute_card/domain_mute_card.vue b/src/components/domain_mute_card/domain_mute_card.vue index 567d81c5..97aee243 100644 --- a/src/components/domain_mute_card/domain_mute_card.vue +++ b/src/components/domain_mute_card/domain_mute_card.vue @@ -4,6 +4,7 @@ {{ domain }} </div> <ProgressButton + v-if="muted" :click="unmuteDomain" class="btn btn-default" > @@ -12,6 +13,16 @@ {{ $t('domain_mute_card.unmute_progress') }} </template> </ProgressButton> + <ProgressButton + v-else + :click="muteDomain" + class="btn btn-default" + > + {{ $t('domain_mute_card.mute') }} + <template slot="progress"> + {{ $t('domain_mute_card.mute_progress') }} + </template> + </ProgressButton> </div> </template> @@ -34,5 +45,9 @@ button { width: 10em; } + + .autosuggest-results & { + padding-left: 1em; + } } </style> |
