graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 12:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2018-11-16 17:56:08 +09:00
commit 83a3426dd5
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/client/app/common/views/widgets/server.info.vue
View file

@ -3,6 +3,7 @@
<p>Maintainer: <b><a :href="'mailto:' + meta.maintainer.email" target="_blank">{{ meta.maintainer.name }}</a></b></p> <p>Maintainer: <b><a :href="'mailto:' + meta.maintainer.email" target="_blank">{{ meta.maintainer.name }}</a></b></p>
<p>Machine: {{ meta.machine }}</p> <p>Machine: {{ meta.machine }}</p>
<p>Node: {{ meta.node }}</p> <p>Node: {{ meta.node }}</p>
<p>Version: {{ meta.version }} </p>
</div> </div>
</template> </template>

1
src/client/app/desktop/views/components/post-form.vue
View file

@ -508,6 +508,7 @@ export default Vue.extend({
border solid 1px var(--primaryAlpha01) border solid 1px var(--primaryAlpha01)
border-radius 4px border-radius 4px
transition border-color .2s ease transition border-color .2s ease
padding-right 30px
&:hover &:hover
border-color var(--primaryAlpha02) border-color var(--primaryAlpha02)

1
src/client/app/desktop/views/widgets/post-form.vue
View file

@ -227,6 +227,7 @@ export default define({
background var(--desktopPostFormTextareaBg) background var(--desktopPostFormTextareaBg)
border none border none
border-bottom solid 1px var(--faceDivider) border-bottom solid 1px var(--faceDivider)
padding-right 30px
&:focus &:focus
& + .emoji & + .emoji