summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-08-15 04:46:52 +0900
committerGitHub <noreply@github.com>2018-08-15 04:46:52 +0900
commitba2eeabe386ca5dd6f45fe78fe39b8d74174f22a (patch)
treebd26045fa5c74ca1eeaa15ed0609609f8f595acc /src
parent5.24.1 (diff)
parentResolve #2201 (diff)
downloadsharkey-ba2eeabe386ca5dd6f45fe78fe39b8d74174f22a.tar.gz
sharkey-ba2eeabe386ca5dd6f45fe78fe39b8d74174f22a.tar.bz2
sharkey-ba2eeabe386ca5dd6f45fe78fe39b8d74174f22a.zip
Merge pull request #2216 from syuilo/patch-2201
Resolve #2201
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/pages/admin/admin.suspend-user.vue16
-rw-r--r--src/client/app/desktop/views/pages/admin/admin.vue11
2 files changed, 24 insertions, 3 deletions
diff --git a/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue b/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
index 01d0301eb1..6eb82f0a51 100644
--- a/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
@@ -1,8 +1,8 @@
<template>
<div>
<header>%i18n:@suspend-user%</header>
- <input v-model="username"/>
- <button @click="suspendUser" :disabled="suspending">%i18n:@suspend%</button>
+ <input v-model="username" type="text" class="ui"/>
+ <button class="ui" @click="suspendUser" :disabled="suspending">%i18n:@suspend%</button>
</div>
</template>
@@ -37,3 +37,15 @@ export default Vue.extend({
}
});
</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+header
+ margin 10px 0
+
+
+button
+ margin 16px 0
+
+</style>
diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index a2b8d47ff6..12858cc6d0 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -3,7 +3,7 @@
<nav>
<ul>
<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%fa:chalkboard .fw%%i18n:@dashboard%</li>
- <!-- <li @click="nav('users')" :class="{ active: page == 'users' }">%fa:users .fw%%i18n:@users%</li> -->
+ <li @click="nav('users')" :class="{ active: page == 'users' }">%fa:users .fw%%i18n:@users%</li>
<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:@drive%</li> -->
<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li> -->
</ul>
@@ -87,4 +87,13 @@ export default Vue.extend({
width 100%
padding 16px 32px
+header
+ margin 10px 0
+
+
+button
+ margin 16px 0
+ position absolute
+ right 0
+
</style>