diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-19 15:05:39 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-19 15:05:39 +0900 |
| commit | 7a270275efcb49c182db5db73ce10c65ba6ad3ff (patch) | |
| tree | 4eb87d011ec38b23ed123d713b6640cc4ac9e2ea /src/client | |
| parent | Add doc (diff) | |
| download | sharkey-7a270275efcb49c182db5db73ce10c65ba6ad3ff.tar.gz sharkey-7a270275efcb49c182db5db73ce10c65ba6ad3ff.tar.bz2 sharkey-7a270275efcb49c182db5db73ce10c65ba6ad3ff.zip | |
Add new text syntax
And some fixes
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/note-html.ts | 13 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/notes.note.vue | 12 | ||||
| -rw-r--r-- | src/client/app/mobile/views/components/note.vue | 12 |
3 files changed, 35 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/note-html.ts b/src/client/app/common/views/components/note-html.ts index 24e750a671..38f6251cf7 100644 --- a/src/client/app/common/views/components/note-html.ts +++ b/src/client/app/common/views/components/note-html.ts @@ -97,7 +97,9 @@ export default Vue.component('mk-note-html', { }, token.content); case 'code': - return createElement('pre', [ + return createElement('pre', { + class: 'code' + }, [ createElement('code', { domProps: { innerHTML: token.html @@ -132,6 +134,13 @@ export default Vue.component('mk-note-html', { }, text2.replace(/\n/g, ' ')); } + case 'title': + return createElement('div', { + attrs: { + class: 'title' + } + }, token.title); + case 'emoji': const emoji = emojilib.lib[token.emoji]; return createElement('span', emoji ? emoji.char : token.content); @@ -144,7 +153,7 @@ export default Vue.component('mk-note-html', { const _els = []; els.forEach((el, i) => { if (el.tag == 'br') { - if (els[i - 1].tag != 'div') { + if (!['div', 'pre'].includes(els[i - 1].tag)) { _els.push(el); } } else { diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue index 752242d7d0..873d724b25 100644 --- a/src/client/app/desktop/views/components/notes.note.vue +++ b/src/client/app/desktop/views/components/notes.note.vue @@ -456,6 +456,18 @@ export default Vue.extend({ font-size 1.1em color #717171 + >>> .title + display block + margin-bottom 4px + padding 4px + font-size 90% + text-align center + background #eef1f3 + border-radius 4px + + >>> .code + margin 8px 0 + >>> .quote margin 8px padding 6px 12px diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue index 5d3a6c7362..71fa43aea2 100644 --- a/src/client/app/mobile/views/components/note.vue +++ b/src/client/app/mobile/views/components/note.vue @@ -391,6 +391,18 @@ export default Vue.extend({ font-size 1.1em color #717171 + >>> .title + display block + margin-bottom 4px + padding 4px + font-size 90% + text-align center + background #eef1f3 + border-radius 4px + + >>> .code + margin 8px 0 + >>> .quote margin 8px padding 6px 12px |