From 8c5586dda450e1bf38355927368fc7bce6fcc399 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Sun, 1 Nov 2020 11:53:20 +0200 Subject: [PATCH 1/3] remove 'md' size that doesn't exist --- src/components/extra_buttons/extra_buttons.vue | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue index f32ea02d2..a33f6e87a 100644 --- a/src/components/extra_buttons/extra_buttons.vue +++ b/src/components/extra_buttons/extra_buttons.vue @@ -16,7 +16,6 @@ @click.prevent="muteConversation" > {{ $t("status.mute_conversation") }} @@ -27,7 +26,6 @@ @click.prevent="unmuteConversation" > {{ $t("status.unmute_conversation") }} @@ -39,7 +37,6 @@ @click="close" > {{ $t("status.pin") }} @@ -51,7 +48,6 @@ @click="close" > {{ $t("status.unpin") }} @@ -63,7 +59,6 @@ @click="close" > {{ $t("status.bookmark") }} @@ -75,7 +70,6 @@ @click="close" > {{ $t("status.unbookmark") }} @@ -87,7 +81,6 @@ @click="close" > {{ $t("status.delete") }} @@ -98,7 +91,6 @@ @click="close" > {{ $t("status.copy_link") }} @@ -109,7 +101,6 @@ From 8b1213ea1e75a2d0f824cc71992d4867a4ea0bb5 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 1 Nov 2020 16:44:57 +0200 Subject: [PATCH 2/3] lint --- src/App.js | 2 +- src/components/desktop_nav/desktop_nav.js | 4 +- src/components/desktop_nav/desktop_nav.vue | 42 +++++++++---------- src/components/mobile_nav/mobile_nav.vue | 2 +- .../post_status_form/post_status_form.vue | 3 +- src/components/react_button/react_button.vue | 2 +- src/components/search_bar/search_bar.vue | 26 ++++++------ 7 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/App.js b/src/App.js index 4871b4ac1..527003191 100644 --- a/src/App.js +++ b/src/App.js @@ -37,7 +37,7 @@ export default { GlobalNoticeList }, data: () => ({ - mobileActivePanel: 'timeline', + mobileActivePanel: 'timeline' }), created () { // Load the locale from the storage diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js index ee99ec102..e048f53d3 100644 --- a/src/components/desktop_nav/desktop_nav.js +++ b/src/components/desktop_nav/desktop_nav.js @@ -69,7 +69,7 @@ export default { hideSitename () { return this.$store.state.instance.hideSitename }, logoLeft () { return this.$store.state.instance.logoLeft }, currentUser () { return this.$store.state.users.currentUser }, - privateMode () { return this.$store.state.instance.private }, + privateMode () { return this.$store.state.instance.private } }, methods: { scrollToTop () { @@ -84,6 +84,6 @@ export default { }, openSettingsModal () { this.$store.dispatch('openSettingsModal') - }, + } } } diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue index d166be081..3a6e40333 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -4,7 +4,7 @@ class="DesktopNav" :class="{ '-logoLeft': logoLeft }" @click="scrollToTop()" - > + >
+ > {{ sitename }}
@@ -20,58 +20,58 @@ class="logo" :to="{ name: 'root' }" :style="logoBgStyle" - > + >
+ /> + >
+ /> + > + /> + > -
+ >
+
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index 30b15149b..6651fc8e3 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -1,7 +1,7 @@