diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-16 17:56:08 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-16 17:56:08 +0900 |
| commit | 83a3426dd5e8cd463b949c4b1b0d88e37433b27c (patch) | |
| tree | 33460570b3c5afa303851c2571d78cd02f067715 /src/client/app | |
| parent | Update misskey-flavored-markdown.ts (diff) | |
| parent | Fix #3224 (#3265) (diff) | |
| download | misskey-83a3426dd5e8cd463b949c4b1b0d88e37433b27c.tar.gz misskey-83a3426dd5e8cd463b949c4b1b0d88e37433b27c.tar.bz2 misskey-83a3426dd5e8cd463b949c4b1b0d88e37433b27c.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client/app')
| -rw-r--r-- | src/client/app/common/views/widgets/server.info.vue | 1 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/post-form.vue | 1 | ||||
| -rw-r--r-- | src/client/app/desktop/views/widgets/post-form.vue | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/client/app/common/views/widgets/server.info.vue b/src/client/app/common/views/widgets/server.info.vue index 3cb1748128..00bc83de9a 100644 --- a/src/client/app/common/views/widgets/server.info.vue +++ b/src/client/app/common/views/widgets/server.info.vue @@ -3,6 +3,7 @@ <p>Maintainer: <b><a :href="'mailto:' + meta.maintainer.email" target="_blank">{{ meta.maintainer.name }}</a></b></p> <p>Machine: {{ meta.machine }}</p> <p>Node: {{ meta.node }}</p> + <p>Version: {{ meta.version }} </p> </div> </template> diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue index 02478b4eb3..2a3b9c1511 100644 --- a/src/client/app/desktop/views/components/post-form.vue +++ b/src/client/app/desktop/views/components/post-form.vue @@ -508,6 +508,7 @@ export default Vue.extend({ border solid 1px var(--primaryAlpha01) border-radius 4px transition border-color .2s ease + padding-right 30px &:hover border-color var(--primaryAlpha02) diff --git a/src/client/app/desktop/views/widgets/post-form.vue b/src/client/app/desktop/views/widgets/post-form.vue index 36cf30bbe7..5c8d25ac61 100644 --- a/src/client/app/desktop/views/widgets/post-form.vue +++ b/src/client/app/desktop/views/widgets/post-form.vue @@ -227,6 +227,7 @@ export default define({ background var(--desktopPostFormTextareaBg) border none border-bottom solid 1px var(--faceDivider) + padding-right 30px &:focus & + .emoji |