summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSatsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>2019-07-17 23:59:21 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-17 23:59:21 +0900
commit0d8286cb2a5bd4199209ec82426cd4614b916037 (patch)
treebfe41975893ba0a198ee6bde7970eada821e9868 /src
parentImprove usability of users view (#5176) (diff)
downloadsharkey-0d8286cb2a5bd4199209ec82426cd4614b916037.tar.gz
sharkey-0d8286cb2a5bd4199209ec82426cd4614b916037.tar.bz2
sharkey-0d8286cb2a5bd4199209ec82426cd4614b916037.zip
Improve #5176 (#5178)
* :art: * Follow review * Remove unnecessary colon
Diffstat (limited to 'src')
-rw-r--r--src/client/app/admin/views/users.user.vue18
-rw-r--r--src/client/app/admin/views/users.vue2
2 files changed, 16 insertions, 4 deletions
diff --git a/src/client/app/admin/views/users.user.vue b/src/client/app/admin/views/users.user.vue
index 25ae0f3f52..9c3db2d6c2 100644
--- a/src/client/app/admin/views/users.user.vue
+++ b/src/client/app/admin/views/users.user.vue
@@ -1,11 +1,11 @@
<template>
-<div class="kofvwchc" @click="click(user.id)">
+<div class="kofvwchc">
<div>
<a :href="user | userPage(null, true)">
<mk-avatar class="avatar" :user="user" :disable-link="true"/>
</a>
</div>
- <div>
+ <div @click="click(user.id)">
<header>
<b><mk-user-name :user="user"/></b>
<span class="username">@{{ user | acct }}</span>
@@ -44,7 +44,7 @@ export default Vue.extend({
<style lang="stylus" scoped>
.kofvwchc
display flex
- padding 16px 0
+ padding 16px
border-top solid 1px var(--faceDivider)
> div:first-child
@@ -55,6 +55,7 @@ export default Vue.extend({
> div:last-child
flex 1
+ cursor pointer
padding-left 16px
@media (max-width 500px)
@@ -80,4 +81,15 @@ export default Vue.extend({
> .is-suspended
margin 0 0 0 .5em
color #4dabf7
+
+ &:hover
+ color var(--primaryForeground)
+ background var(--primary)
+ text-decoration none
+ border-radius 3px
+
+ &:active
+ color var(--primaryForeground)
+ background var(--primaryDarken10)
+ border-radius 3px
</style>
diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue
index 57377c7cee..92b23749ff 100644
--- a/src/client/app/admin/views/users.vue
+++ b/src/client/app/admin/views/users.vue
@@ -58,7 +58,7 @@
<ui-input v-model="searchUsername" type="text" spellcheck="false" @input="fetchUsers(true)">
<span>{{ $t('username') }}</span>
</ui-input>
- <ui-input v-model="searchHost" type="text" spellcheck="false" @input="fetchUsers(true)" :readonly="origin === 'local'">
+ <ui-input v-model="searchHost" type="text" spellcheck="false" @input="fetchUsers(true)" :disabled="origin === 'local'">
<span>{{ $t('host') }}</span>
</ui-input>
</ui-horizon-group>