diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 22:36:13 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 22:36:13 +0900 |
| commit | c201326906b00a9a356a17144cf7d04ee46e5ae5 (patch) | |
| tree | ae3f879b75eb5b3a09eb5975bc086e2e9dbcffda /src/client | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.24.2 (diff) | |
| download | sharkey-c201326906b00a9a356a17144cf7d04ee46e5ae5.tar.gz sharkey-c201326906b00a9a356a17144cf7d04ee46e5ae5.tar.bz2 sharkey-c201326906b00a9a356a17144cf7d04ee46e5ae5.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client')
6 files changed, 17 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/activity.vue b/src/client/app/common/views/components/activity.vue index 395d764fb8..a958616943 100644 --- a/src/client/app/common/views/components/activity.vue +++ b/src/client/app/common/views/components/activity.vue @@ -72,6 +72,9 @@ export default Vue.extend({ columnWidth: '80%' } }, + dataLabels: { + enabled: false + }, grid: { clipMarkers: false, padding: { diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.vue b/src/client/app/common/views/components/misskey-flavored-markdown.vue index fa24f6dfa4..a0ecbecbb2 100644 --- a/src/client/app/common/views/components/misskey-flavored-markdown.vue +++ b/src/client/app/common/views/components/misskey-flavored-markdown.vue @@ -1,5 +1,5 @@ <template> -<mfm-core v-bind="$attrs" class="havbbuyv" v-once/> +<mfm-core v-bind="$attrs" class="havbbuyv" :class="{ plain: $attrs['plain-text'] }" v-once/> </template> <script lang="ts"> @@ -17,6 +17,9 @@ export default Vue.extend({ .havbbuyv white-space pre-wrap + &.plain + white-space pre + >>> .title display block margin-bottom 4px diff --git a/src/client/app/common/views/deck/deck.hashtag-column.vue b/src/client/app/common/views/deck/deck.hashtag-column.vue index 1af1632581..0d719c2199 100644 --- a/src/client/app/common/views/deck/deck.hashtag-column.vue +++ b/src/client/app/common/views/deck/deck.hashtag-column.vue @@ -73,6 +73,9 @@ export default Vue.extend({ enabled: true }, }, + dataLabels: { + enabled: false + }, grid: { clipMarkers: false, padding: { diff --git a/src/client/app/common/views/deck/deck.user-column.home.vue b/src/client/app/common/views/deck/deck.user-column.home.vue index 49cc869eb9..56b117a7dd 100644 --- a/src/client/app/common/views/deck/deck.user-column.home.vue +++ b/src/client/app/common/views/deck/deck.user-column.home.vue @@ -163,6 +163,9 @@ export default Vue.extend({ columnWidth: '80%' } }, + dataLabels: { + enabled: false + }, grid: { clipMarkers: false, padding: { diff --git a/src/client/app/common/views/filters/bytes.ts b/src/client/app/common/views/filters/bytes.ts index 5b5d966cfd..227ccae3a4 100644 --- a/src/client/app/common/views/filters/bytes.ts +++ b/src/client/app/common/views/filters/bytes.ts @@ -2,7 +2,7 @@ import Vue from 'vue'; Vue.filter('bytes', (v, digits = 0) => { if (v == null) return '?'; - const sizes = ['B', 'KB', 'MB', 'GB', 'TB']; + const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']; if (v == 0) return '0'; const isMinus = v < 0; if (isMinus) v = -v; diff --git a/src/client/app/common/views/widgets/queue.vue b/src/client/app/common/views/widgets/queue.vue index 27ba35fbcd..6e49f1efb0 100644 --- a/src/client/app/common/views/widgets/queue.vue +++ b/src/client/app/common/views/widgets/queue.vue @@ -90,6 +90,9 @@ export default define({ enabled: true, } }, + dataLabels: { + enabled: false + }, tooltip: { enabled: false }, |