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

Fix #1130

Browse source
This commit is contained in:
syuilo 2018-02-24 07:54:37 +09:00
parent a2ed259501
commit 2c007ff36f
3 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/web/app/common/views/components/post-html.ts
View file

@ -81,7 +81,11 @@ export default Vue.component('mk-post-html', {
case 'code':
return createElement('pre', [
createElement('code', token.html)
createElement('code', {
domProps: {
innerHTML: token.html
}
})
]);
case 'inline-code':

49
src/web/app/desktop/views/components/posts.post.vue
View file

@ -37,7 +37,7 @@
<a :href="`${_CH_URL_}/${p.channel.id}`" target="_blank">{{ p.channel.title }}</a>:
</p>
<a class="reply" v-if="p.reply">%fa:reply%</a>
<mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i"/>
<mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i" :class="$style.text"/>
<a class="quote" v-if="p.repost">RP:</a>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
</div>
@ -413,9 +413,6 @@ export default Vue.extend({
font-size 1.1em
color #717171
> .dummy
display none
.mk-url-preview
margin-top 8px
@ -431,27 +428,6 @@ export default Vue.extend({
font-style oblique
color #a0bf46
code
padding 4px 8px
margin 0 0.5em
font-size 80%
color #525252
background #f8f8f8
border-radius 2px
pre > code
padding 16px
margin 0
[data-is-me]:after
content "you"
padding 0 4px
margin-left 4px
font-size 80%
color $theme-color-foreground
background $theme-color
border-radius 4px
> .mk-poll
font-size 80%
@ -505,3 +481,26 @@ export default Vue.extend({
</style>
<style lang="stylus" module>
.text
code
padding 4px 8px
margin 0 0.5em
font-size 80%
color #525252
background #f8f8f8
border-radius 2px
pre > code
padding 16px
margin 0
[data-is-me]:after
content "you"
padding 0 4px
margin-left 4px
font-size 80%
color $theme-color-foreground
background $theme-color
border-radius 4px
</style>

28
src/web/app/mobile/views/components/posts.post.vue
View file

@ -34,7 +34,7 @@
<a class="reply" v-if="p.reply">
%fa:reply%
</a>
<mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i"/>
<mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i" :class="$style.text"/>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
<a class="quote" v-if="p.repost != null">RP:</a>
</div>
@ -364,18 +364,6 @@ export default Vue.extend({
font-style oblique
color #a0bf46
code
padding 4px 8px
margin 0 0.5em
font-size 80%
color #525252
background #f8f8f8
border-radius 2px
pre > code
padding 16px
margin 0
[data-is-me]:after
content "you"
padding 0 4px
@ -445,3 +433,17 @@ export default Vue.extend({
</style>
<style lang="stylus" module>
.text
code
padding 4px 8px
margin 0 0.5em
font-size 80%
color #525252
background #f8f8f8
border-radius 2px
pre > code
padding 16px
margin 0
</style>