diff --git a/.prettierrc b/.prettierrc index 6692425b..93a4b3df 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,5 +2,7 @@ "tabWidth": 2, "semi": false, "singleQuote": true, - "printWidth": 140 -} \ No newline at end of file + "printWidth": 140, + "trailingComma": "none", + "arrowParens": "avoid" +} diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue index 99b25785..cc51d766 100644 --- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue +++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue @@ -217,7 +217,7 @@ export default { this.$store.dispatch('TimelineSpace/Modals/NewToot/setupLoading') }, watch: { - newTootModal: function(newState, oldState) { + newTootModal: function (newState, oldState) { if (!oldState && newState) { this.showContentWarning = this.initialSpoiler this.status = this.initialStatus @@ -456,7 +456,7 @@ export default { font-size: 1.5rem; .fa-icon { - font-size: 0.9em; + font-size: 0.9rem; width: auto; height: 1em; max-width: 100%; @@ -469,6 +469,7 @@ export default { .el-dialog__footer { background-color: #f2f6fc; + font-size: var(--base-font-size); .upload-image { text-align: left; diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue index 3b44a5d1..1af0c584 100644 --- a/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue +++ b/src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue @@ -93,10 +93,10 @@ export default { }), ...mapGetters('TimelineSpace/Modals/NewToot/Status', ['pickerEmojis']), status: { - get: function() { + get: function () { return this.value }, - set: function(value) { + set: function (value) { this.$emit('input', value) } } @@ -110,9 +110,9 @@ export default { } }, watch: { - opened: function(newState, oldState) { + opened: function (newState, oldState) { if (!oldState && newState) { - this.$nextTick(function() { + this.$nextTick(function () { this.$refs.status.focus() if (this.fixCursorPos) { this.$refs.status.setSelectionRange(0, 0) @@ -268,6 +268,7 @@ export default { .status { position: relative; z-index: 1; + font-size: var(--base-font-size); textarea { display: block; @@ -300,7 +301,7 @@ export default { box-sizing: border-box; li { - font-size: 14px; + font-size: var(--base-font-size); padding: 0 20px; white-space: nowrap; overflow: hidden; diff --git a/src/renderer/components/organisms/Notification/Follow.vue b/src/renderer/components/organisms/Notification/Follow.vue index f798a5f1..d93840cf 100644 --- a/src/renderer/components/organisms/Notification/Follow.vue +++ b/src/renderer/components/organisms/Notification/Follow.vue @@ -1,28 +1,28 @@