diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2020-02-09 20:53:08 +0900 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2020-02-09 20:53:08 +0900 |
| commit | e78e5274d383b598d946212014fc2312a4ab7b7d (patch) | |
| tree | cee45437b3b2b634087db906a775717749cc1583 /src/client/components | |
| parent | fix typo #5890 (diff) | |
| parent | いくつかのスタイルを調整 (#5894) (diff) | |
| download | misskey-e78e5274d383b598d946212014fc2312a4ab7b7d.tar.gz misskey-e78e5274d383b598d946212014fc2312a4ab7b7d.tar.bz2 misskey-e78e5274d383b598d946212014fc2312a4ab7b7d.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/notes.vue | 2 | ||||
| -rw-r--r-- | src/client/components/post-form.vue | 4 | ||||
| -rw-r--r-- | src/client/components/ui/input.vue | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/client/components/notes.vue b/src/client/components/notes.vue index 476b479fcd..cdf857b642 100644 --- a/src/client/components/notes.vue +++ b/src/client/components/notes.vue @@ -1,6 +1,6 @@ <template> <div class="mk-notes" v-size="[{ max: 500 }]"> - <div class="empty _panel" v-if="empty"> + <div class="empty" v-if="empty"> <img src="https://xn--931a.moe/assets/info.jpg" alt=""/> <div>{{ $t('noNotes') }}</div> </div> diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index 166b3c7c5f..e089912e0c 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -153,7 +153,7 @@ export default Vue.extend({ this.$t('_postForm._placeholders.f') ]; const x = xs[Math.floor(Math.random() * xs.length)]; - + return this.renote ? this.$t('_postForm.quotePlaceholder') : this.reply @@ -713,7 +713,7 @@ export default Vue.extend({ border-radius: 0; background: transparent; color: var(--fg); - font-family: initial; + font-family: inherit; @media (max-width: 500px) { padding: 0 16px; diff --git a/src/client/components/ui/input.vue b/src/client/components/ui/input.vue index 69d842ef0f..cd295b68d8 100644 --- a/src/client/components/ui/input.vue +++ b/src/client/components/ui/input.vue @@ -254,7 +254,7 @@ export default Vue.extend({ > .input { position: relative; - + &:before { content: ''; display: block; @@ -327,14 +327,16 @@ export default Vue.extend({ } > input { + $height: 32px; display: block; + height: $height; width: 100%; margin: 0; padding: 0; font: inherit; font-weight: normal; font-size: 16px; - line-height: 32px; + line-height: $height; color: var(--inputText); background: transparent; border: none; |