From 8320ac6c745f1ca125f76728170a0b47ded4fc4c Mon Sep 17 00:00:00 2001 From: sliver Date: Wed, 27 Sep 2023 10:56:32 +0900 Subject: [PATCH 01/14] =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=81=AE?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E5=86=85=E5=AE=B9=E3=82=92=E5=BE=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/ja_pedantic.json | 30 ++++++++++++++++-------------- src/panel.scss | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json index 5f315172..99e64d4c 100644 --- a/src/i18n/ja_pedantic.json +++ b/src/i18n/ja_pedantic.json @@ -375,13 +375,13 @@ "text/bbcode": "BBCode", "text/html": "HTML", "text/markdown": "Markdown", - "text/plain": "プレーンテキスト", + "text/plain": "Plane", "text/x.misskeymarkdown": "MFM" }, - "content_warning": "警告 (省略可)", - "default": "ただいまルーナノヴァ魔法学校に到着しました", - "direct_warning_to_all": "この投稿は、メンションされたすべてのユーザーが、見ることができます。", - "direct_warning_to_first_only": "この投稿は、メッセージの冒頭でメンションされたユーザーだけが、見ることができます。", + "content_warning": "CW (省略可)", + "default": "いま、なにをしていますか？", + "direct_warning_to_all": "この投稿は、メンションされたすべてのユーザーが見ることができます。", + "direct_warning_to_first_only": "この投稿は、メッセージの冒頭でメンションされたユーザーだけが見ることができます。", "edit_remote_warning": "注意：リモートインスタンスには、編集した投稿が見えないかもしれません", "edit_status": "編集", "edit_unsupported_warning": "編集しても投票やメンションが更新されません", @@ -412,12 +412,12 @@ "awaiting_email_confirmation": "あなたにメールが送られました。メールをご覧くださって、リンクをクリックしてください", "awaiting_email_confirmation_title": "メール確認中", "bio": "プロフィール", - "bio_placeholder": "例:\nこんにちは。私は玲音。\n私はアニメのキャラクターで、日本の郊外に住んでいます。私をWiredで見たことがあるかもしれません。", + "bio_placeholder": "例:\nこんにちは。", "captcha": "CAPTCHA", "email": "Eメール", "email_language": "サーバーからのメールの言語", "fullname": "スクリーンネーム", - "fullname_placeholder": "例: 岩倉玲音", + "fullname_placeholder": "例: 田中太郎", "new_captcha": "文字が読めないときは、画像をクリックすると、新しい画像になります", "password_confirm": "パスワードの確認", "reason": "登録するための目的", @@ -823,15 +823,15 @@ "weight": "太さ" }, "preview": { - "button": "ボタン", - "checkbox": "利用規約を読みました", - "content": "本文", + "button": "ボタン例", + "checkbox": "チェックの例", + "content": "名前", "error": "エラーの例", - "faint_link": "とても助けになるマニュアル", - "fine_print": "私たちの{0}を、読まないでください！", + "faint_link": "リンク例", + "fine_print": "引用はこんな感じ{0}", "header": "プレビュー", "header_faint": "エラーではありません", - "input": "ただいまルーナノヴァ魔法学校に到着しました", + "input": "投稿内容", "link": "ハイパーリンク", "mono": "monospace", "text": "これは{0}と{1}の例です" @@ -940,7 +940,9 @@ }, "virtual_scrolling": "タイムラインの描画を最適化する", "word_filter": "単語フィルタ", - "wordfilter": "単語フィルター" + "wordfilter": "単語フィルター", + + "show_Favorite_Button": "いいねボタンを表示する" }, "settings_profile": { "creating": "新しい設定プロファイル {profile}を作成しています", diff --git a/src/panel.scss b/src/panel.scss index 3a814269..593b81a5 100644 --- a/src/panel.scss +++ b/src/panel.scss @@ -29,7 +29,7 @@ padding: var(--panel-body-padding, 0); &:empty::before { - content: "¯\\_(ツ)_/¯"; // Could use words but it'd require translations + content: "No Data"; // Could use words but it'd require translations display: block; margin: 1em; text-align: center; From 984ec59f6323320114fd98763d8b5b73c2c9d907 Mon Sep 17 00:00:00 2001 From: sliver Date: Wed, 27 Sep 2023 10:57:21 +0900 Subject: [PATCH 02/14] =?UTF-8?q?=E3=81=84=E3=81=84=E3=81=AD=E3=81=BC?= =?UTF-8?q?=E3=81=9F=E3=82=93=E8=A1=A8=E7=A4=BA=E5=88=87=E6=9B=BF=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/settings_modal/tabs/general_tab.vue | 8 ++++++++ src/components/status/status.vue | 1 + src/modules/config.js | 3 +++ 3 files changed, 12 insertions(+) diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue index 7dc1c3f1..0c520db6 100644 --- a/src/components/settings_modal/tabs/general_tab.vue +++ b/src/components/settings_modal/tabs/general_tab.vue @@ -382,6 +382,14 @@ {{ $t('settings.no_rich_text_description') }} +
  • + + {{ $t('settings.show_Favorite_Button') }} ◎ + +

    • {{ $t('settings.attachments') }}

  • diff --git a/src/modules/config.js b/src/modules/config.js index ebb27929..0f340fe0 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -119,6 +119,9 @@ export const defaultState = { supportedTranslationLanguages: {}, // instance default userProfileDefaultTab: 'statuses', useBlurhash: true, + + //donutAddConfig + showFavoriteButton: true, } // caching the instance default properties From f66a620275cd5a450946d25895da46075a68eb15 Mon Sep 17 00:00:00 2001 From: sliver Date: Wed, 27 Sep 2023 14:58:07 +0900 Subject: [PATCH 03/14] =?UTF-8?q?=E7=94=A8=E8=AA=9E=E3=81=AE=E5=BE=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/ja_pedantic.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json index 99e64d4c..3b598d30 100644 --- a/src/i18n/ja_pedantic.json +++ b/src/i18n/ja_pedantic.json @@ -137,10 +137,10 @@ }, "scope_in_timeline": { "direct": "ダイレクト", - "local": "ローカル：このインスタンスのユーザーしか見えません", + "local": "連合なし", "private": "フォロワー限定", "public": "公開", - "unlisted": "アンリステッド" + "unlisted": "ホーム" }, "show_less": "たたむ", "show_more": "もっと見る", @@ -302,8 +302,8 @@ "announcements": "お知らせ", "back": "戻る", "bookmarks": "ブックマーク", - "bubble_timeline": "バブルタイムライン", - "bubble_timeline_description": "管理者がおすすめしているインスタンスからの投稿", + "bubble_timeline": "バブル+ホーム", + "bubble_timeline_description": "管理者がおすすめしているインスタンスと、ホームタイムラインの集合", "chats": "チャット", "dms": "ダイレクトメッセージ", "friend_requests": "フォローリクエスト", @@ -315,11 +315,11 @@ "moderation": "管理", "preferences": "設定", "public_timeline_description": "このインスタンスからの公開投稿", - "public_tl": "公開タイムライン", + "public_tl": "ローカルタイムライン", "search": "検索", "timeline": "タイムライン", "timelines": "タイムライン", - "twkn": "すべてのネットワーク", + "twkn": "グローバルタイムライン", "twkn_timeline_description": "全連合からの投稿", "user_search": "ユーザーを探す", "who_to_follow": "おすすめユーザー" @@ -396,16 +396,16 @@ "preview_empty": "何もありません", "scope": { "direct": "ダイレクト: メンションされたユーザーのみに届きます", - "local": "ローカル: 連合に送信しません", + "local": "ローカル: このインスタンスにのみ届きます", "private": "フォロワー限定: フォロワーのみに届きます", - "public": "パブリック: 公開タイムラインに届きます", - "unlisted": "アンリステッド: 公開タイムラインに届きません" + "public": "パブリック: すべてのタイムラインに届きます", + "unlisted": "ホーム: ローカルやグローバルタイムラインに届きません" }, "scope_notice": { "local": "このインスタンスのユーザーしか見えません", "private": "この投稿は、あなたのフォロワーだけが、見ることができます", "public": "この投稿は、誰でも見ることができます", - "unlisted": "この投稿は、パブリックタイムラインと、接続しているすべてのネットワークには、表示されません" + "unlisted": "この投稿は、ホームタイムライン、あなたのプロフィール以外には、表示されません" } }, "registration": { @@ -1070,7 +1070,7 @@ "bookmark": "ブックマーク", "favorite": "お気に入り", "media_upload": "メディアをアップロード", - "quote": "参照", + "quote": "引用", "reject_follow_request": "フォローリクエストを拒否", "repeat": "リピート", "reply": "返信", From 35cc1e86f421a8d9ff7f5d9b0adbbc309f5da503 Mon Sep 17 00:00:00 2001 From: sliver Date: Wed, 27 Sep 2023 15:12:26 +0900 Subject: [PATCH 04/14] =?UTF-8?q?Pull-to-Refresh=E7=84=A1=E5=8A=B9?= =?UTF-8?q?=E5=8C=96=E3=81=AE=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.scss b/src/App.scss index 36176b35..66c271b1 100644 --- a/src/App.scss +++ b/src/App.scss @@ -20,7 +20,7 @@ body { color: var(--text, $fallback--text); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - overscroll-behavior-y: none; + //overscroll-behavior-y: none; overflow-x: clip; overflow-y: scroll; From 1f81df7cb039b3d5a20183f3fe7a2895ee3f483d Mon Sep 17 00:00:00 2001 From: sliver Date: Wed, 27 Sep 2023 15:41:34 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=E9=9D=9E=E6=9F=BB=E5=8F=8E=E3=82=A2?= =?UTF-8?q?=E3=82=A4=E3=82=B3=E3=83=B3=E3=82=92=E3=83=9B=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scope_selector/scope_selector.vue | 2 +- src/components/status/status.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue index 64c34fb1..b6e7d970 100644 --- a/src/components/scope_selector/scope_selector.vue +++ b/src/components/scope_selector/scope_selector.vue @@ -38,7 +38,7 @@ @click="changeVis('unlisted')" > diff --git a/src/components/status/status.js b/src/components/status/status.js index 9bb3364f..a861645d 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -453,7 +453,7 @@ const Status = { case 'private': return 'lock' case 'unlisted': - return 'lock-open' + return 'home' case 'direct': return 'envelope' case 'local': From a442ef67ac879d1ca5aeaa297e735f839652f3f6 Mon Sep 17 00:00:00 2001 From: sliver Date: Wed, 27 Sep 2023 16:56:16 +0900 Subject: [PATCH 06/14] =?UTF-8?q?=E5=85=AC=E9=96=8B=E7=AF=84=E5=9B=B2?= =?UTF-8?q?=E3=81=AB=E3=82=88=E3=82=8B=E8=83=8C=E6=99=AF=E8=89=B2=E3=81=AE?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/status/status.scss | 13 +++++++++++++ src/components/status/status.vue | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/components/status/status.scss b/src/components/status/status.scss index cd65b890..e2bb98ee 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -55,6 +55,19 @@ } } + .status-container.private { + background-color: #f0d7e6c0; + } + .status-container.unlisted { + background-color: #d3f2d7c0; + } + .status-container.local { + background-color: #d6e4f2c0; + } + .status-container.direct { + background-color: #f2f2d6c0; + } + .pin { padding: var(--status-margin, $status-margin) var(--status-margin, $status-margin) 0; display: flex; diff --git a/src/components/status/status.vue b/src/components/status/status.vue index befa7ba0..ba54f967 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -113,7 +113,7 @@
    Date: Sat, 30 Sep 2023 23:48:35 +0900 Subject: [PATCH 07/14] =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=81=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/emoji_grid/emoji_grid.js | 10 ++++++---- src/components/emoji_grid/emoji_grid.scss | 14 ++++++++++---- src/components/react_button/react_button.vue | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/components/emoji_grid/emoji_grid.js b/src/components/emoji_grid/emoji_grid.js index f73b0913..7ac84498 100644 --- a/src/components/emoji_grid/emoji_grid.js +++ b/src/components/emoji_grid/emoji_grid.js @@ -1,4 +1,5 @@ -const EMOJI_SIZE = 32 + 8 +const EMOJI_SIZE = 64 + 2 +const EMOJI_SIZE_HEIGHT = 48 + 2 const GROUP_TITLE_HEIGHT = 24 const BUFFER_SIZE = 3 * EMOJI_SIZE @@ -98,14 +99,15 @@ const EmojiGrid = { id: `${group.id}-${emoji.displayText}`, emoji }) + //絵文字サイズの二倍を指定 x += EMOJI_SIZE - if (x + EMOJI_SIZE > this.containerWidth) { - y += EMOJI_SIZE + if (x + (EMOJI_SIZE ) > this.containerWidth) { + y += EMOJI_SIZE_HEIGHT x = 0 } } if (x > 0) { - y += EMOJI_SIZE + y += EMOJI_SIZE_HEIGHT x = 0 } } diff --git a/src/components/emoji_grid/emoji_grid.scss b/src/components/emoji_grid/emoji_grid.scss index 5d5b153f..e5d4b600 100644 --- a/src/components/emoji_grid/emoji_grid.scss +++ b/src/components/emoji_grid/emoji_grid.scss @@ -21,7 +21,7 @@ } } margin-left: 5px; - min-height: 200px; + min-height: 400px; } &-group-title { @@ -40,14 +40,20 @@ &-item { position: absolute; - width: 32px; - height: 32px; + width: 64px; + height: 48px; box-sizing: border-box; display: flex; font-size: 32px; align-items: center; justify-content: center; - margin: 4px; + margin: 0px; + padding: 2px; + + border-width: thin; + border-color: #fa606091; + border-style: solid; + border-radius: 5px; cursor: pointer; diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index c196417c..22f3e7b2 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -106,7 +106,7 @@ .popover { transform: translateX(-64px) translateY(5px); - min-width: 70%; + min-width: 100%; } } From 91db7c3307a9ac84e6de42f89a38799b15fa8d73 Mon Sep 17 00:00:00 2001 From: sliver Date: Sat, 30 Sep 2023 23:50:20 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AB=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E7=B5=B5=E6=96=87=E5=AD=97?= =?UTF-8?q?=E3=81=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/notification/notification.scss | 3 ++- src/components/status/status.scss | 4 ++-- src/components/user_list_popover/user_list_popover.vue | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss index b0da18f9..1a8f5c88 100644 --- a/src/components/notification/notification.scss +++ b/src/components/notification/notification.scss @@ -1,7 +1,8 @@ @import '../../_variables.scss'; .notification-reaction-emoji { - width: 40px; + width: 100%; + height: 24px; display: inline-flex; vertical-align: middle; flex-direction: column; diff --git a/src/components/status/status.scss b/src/components/status/status.scss index e2bb98ee..24550e89 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -150,7 +150,7 @@ flex-wrap: wrap; img { - aspect-ratio: 1 / 1; + aspect-ratio: auto } .nowrap { @@ -293,7 +293,7 @@ margin-right: 0; .emoji { - width: 14px; + width: auto; height: 14px; vertical-align: middle; object-fit: contain; diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue index bdc3aa92..fcf49854 100644 --- a/src/components/user_list_popover/user_list_popover.vue +++ b/src/components/user_list_popover/user_list_popover.vue @@ -67,7 +67,8 @@ min-width: 5em; img { - width: 1em; + //絵文字サイズ対応 + //width: 1em; height: 1em; } } From e86ee45111387f5291c33b1e68a9bde841563674 Mon Sep 17 00:00:00 2001 From: sliver Date: Sat, 30 Sep 2023 23:54:23 +0900 Subject: [PATCH 09/14] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=81=AE=E3=83=AA?= =?UTF-8?q?=E3=82=A2=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E7=B5=B5?= =?UTF-8?q?=E6=96=87=E5=AD=97=E3=82=B5=E3=82=A4=E3=82=BA=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/notification/notification.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss index 1a8f5c88..85d43f5c 100644 --- a/src/components/notification/notification.scss +++ b/src/components/notification/notification.scss @@ -1,7 +1,7 @@ @import '../../_variables.scss'; .notification-reaction-emoji { - width: 100%; + width: auto; height: 24px; display: inline-flex; vertical-align: middle; From 5150ae2d505a68e0e785cd820a7e04322d124601 Mon Sep 17 00:00:00 2001 From: sliver Date: Sun, 1 Oct 2023 15:24:28 +0900 Subject: [PATCH 10/14] =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=94?= =?UTF-8?q?=E3=83=83=E3=82=AB=E3=83=BC=E3=81=AEUnicode=E7=A7=BB=E5=8B=95?= =?UTF-8?q?=E3=80=81=E5=88=9D=E6=9C=9F=E3=82=BF=E3=83=96=E3=82=92=E5=B1=A5?= =?UTF-8?q?=E6=AD=B4=E3=81=B8=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/emoji_picker/emoji_picker.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index 9a2307cb..05e267ec 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -31,7 +31,7 @@ const EmojiPicker = { data () { return { keyword: '', - activeGroup: 'standard', + activeGroup: 'recent', showingStickers: false, keepOpen: false } @@ -110,17 +110,16 @@ const EmojiPicker = { replacement: '🕒', }, emojis: this.filterByKeyword(recentEmojis) - }, - { - id: 'standard', - text: this.$t('emoji.unicode'), - first: { - imageUrl: '', - replacement: '🥴' - }, - emojis: this.filterByKeyword(standardEmojis) } - ].concat(emojiPacks) + ].concat(emojiPacks).concat([{ + id: 'standard', + text: this.$t('emoji.unicode'), + first: { + imageUrl: '', + replacement: '🥴' + }, + emojis: this.filterByKeyword(standardEmojis) + }]) }, sortedEmoji () { const customEmojis = this.$store.state.instance.customEmoji || [] From 89502a14b5906e6f369c5cf8608bf333e4dca78b Mon Sep 17 00:00:00 2001 From: sliver Date: Sat, 18 Nov 2023 21:11:57 +0900 Subject: [PATCH 11/14] =?UTF-8?q?=E3=83=AD=E3=82=B4=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/logo-512.png | Bin 18994 -> 21211 bytes static/logo.svg | 411 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 377 insertions(+), 34 deletions(-) diff --git a/static/logo-512.png b/static/logo-512.png index c8397e35a1a2a240f419a202efb5677160e534e0..afbe08473fe48cbde6bce37d73fce3b1034514ba 100755 GIT binary patch literal 21211 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 literal 18994 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 Q34A^j7n2zMOBAp8Z@K~PkN^Mx diff --git a/static/logo.svg b/static/logo.svg index 01ddbadb..6ca8cffd 100755 --- a/static/logo.svg +++ b/static/logo.svg @@ -1,34 +1,377 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + From 8f8e0c215224aaacd765ff063ab972885e3edb68 Mon Sep 17 00:00:00 2001 From: sliver Date: Sun, 31 Mar 2024 19:31:04 +0900 Subject: [PATCH 12/14] =?UTF-8?q?=E7=8B=AC=E8=87=AA=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/themes/flyer_dark.json | 448 ++++++++++++++++++++++++++++++++ static/themes/flyer_light.json | 458 +++++++++++++++++++++++++++++++++ 2 files changed, 906 insertions(+) create mode 100644 static/themes/flyer_dark.json create mode 100644 static/themes/flyer_light.json diff --git a/static/themes/flyer_dark.json b/static/themes/flyer_dark.json new file mode 100644 index 00000000..db2f1da6 --- /dev/null +++ b/static/themes/flyer_dark.json @@ -0,0 +1,448 @@ +{ + "_pleroma_theme_version": 2, + "name": "flyer dark", + "theme": { + "themeEngineVersion": 3, + "shadows": { + "panel": [ + { + "color": "#668bb2", + "x": "0", + "y": "2", + "blur": "9", + "spread": 0, + "inset": false, + "alpha": "0.1" + }, + { + "color": "#668bb2", + "x": "0", + "y": "1", + "blur": "2", + "spread": "-1", + "inset": false, + "alpha": "0.1" + } + ], + "topBar": [ + { + "color": "#3e618e", + "x": 0, + "y": "3", + "blur": "8", + "spread": 0, + "inset": false, + "alpha": "0.1" + }, + { + "color": "#3e618e", + "x": 0, + "y": "1", + "blur": "4", + "spread": 0, + "inset": false, + "alpha": "0.1" + } + ], + "popup": [ + { + "color": "#668bb2", + "x": "0", + "y": "3", + "blur": "11", + "spread": 0, + "alpha": "0.2" + }, + { + "color": "#668bb2", + "x": "0", + "y": "2", + "blur": "3", + "spread": "-1", + "alpha": "0.2" + } + ], + "avatar": [ + { + "color": "#3e618e", + "x": 0, + "y": "2", + "blur": "5", + "spread": "0", + "alpha": "0.9" + } + ], + "avatarStatus": [ + { + "color": "#3e618e", + "x": "0", + "y": "2", + "blur": "4", + "spread": "0", + "inset": false, + "alpha": "0.1" + } + ], + "panelHeader": [], + "button": [ + { + "color": "#463f78", + "x": 0, + "y": "2", + "blur": "5", + "spread": 0, + "alpha": "0.1", + "inset": false + } + ], + "buttonHover": [ + { + "color": "#494949", + "x": 0, + "y": 2, + "blur": 3, + "spread": -2, + "alpha": "0.5" + } + ], + "buttonPressed": [ + { + "color": "#494949", + "x": 0, + "y": 2, + "blur": 3, + "spread": -3, + "alpha": "0.5" + } + ], + "input": [ + { + "color": "#6277b7", + "x": 0, + "y": "1", + "blur": "2", + "spread": 0, + "inset": true, + "alpha": "0.1" + } + ] + }, + "colors": { + "underlay": "#000000", + "bg": "#4b3f42", + "fg": "#5f5353", + "cRed": "#d8c5ca", + "cGreen": "#ffa5bf", + "cOrange": "#ffa5bf", + "cBlue": "#ffa5bf", + "accent": "#0077ff", + "link": "#ff8aa7", + "text": "#878787", + "badgeNotification": "#d8c5ca", + "badgeNotificationText": "#000000", + "alertNeutral": "#878787", + "alertNeutralText": "#ffffff", + "alertPopupNeutral": "#878787", + "alertPopupNeutralText": "#000000", + "alertSuccess": "#ffa5bf", + "alertSuccessText": "#000000", + "alertPopupSuccess": "#ffa5bf", + "alertPopupSuccessText": "#000000", + "alertWarning": "#ffa5bf", + "alertWarningText": "#000000", + "alertPopupWarning": "#ffa5bf", + "alertPopupWarningText": "#000000", + "alertError": "#d8c5ca", + "alertErrorText": "#000000", + "alertPopupError": "#d8c5ca", + "alertPopupErrorText": "#000000", + "panel": "#5f5353", + "panelText": "#ffffff", + "alertNeutralPanelText": "#ffffff", + "alertSuccessPanelText": "#000000", + "alertWarningPanelText": "#000000", + "alertErrorPanelText": "#000000", + "fgText": "#ffffff", + "topBar": "#5f5353", + "topBarText": "#5f5353", + "input": "#5f5353", + "inputTopbarText": "#ffffff", + "inputPanelText": "#ffffff", + "inputText": "#ffffff", + "btn": "#5f5353", + "btnText": "#cea1a1", + "btnTopBarText": "#ffffff", + "btnDisabled": "#504447", + "btnDisabledTopBarText": "#7c7375", + "btnPanelText": "#ffffff", + "btnDisabledPanelText": "#7c7375", + "btnDisabledText": "#705c5d", + "btnToggled": "#948585", + "btnToggledTopBarText": "#000000", + "btnToggledPanelText": "#000000", + "btnToggledText": "#000000", + "btnPressed": "#5f5353", + "btnPressedTopBarText": "#ffffff", + "btnPressedTopBar": "#5f5353", + "btnPressedPanelText": "#ffffff", + "btnPressedPanel": "#5f5353", + "btnPressedText": "#ffffff", + "tabActiveText": "#ffffff", + "tabText": "#ffffff", + "tab": "#5f5353", + "fgLink": "#76001d", + "topBarLink": "#ff8aa6", + "panelLink": "#ff8aa6", + "panelFaint": "#ffffff", + "icon": "#696365", + "poll": "#2d568e", + "pollText": "#ffffff", + "border": "#655858", + "postCyantext": "#ffa5bf", + "postGreentext": "#ffa5bf", + "postLink": "#ffbdbd", + "lightText": "#bababa", + "popover": "#4b3f42", + "selectedMenuPopover": "#f1f2f3", + "highlight": "#594b4f", + "highlightText": "#ffffff", + "selectedMenu": "#594b4f", + "selectedMenuText": "#ffffff", + "selectedMenuPopoverIcon": "#f8f9f9", + "highlightLink": "#76001d", + "selectedMenuLink": "#ff8aa6", + "selectedMenuPopoverLink": "#76001b", + "selectedMenuPopoverText": "#000000", + "faintLink": "#ff8aa7", + "highlightFaintLink": "#76001d", + "selectedMenuFaintLink": "#ff8aa6", + "selectedMenuPopoverFaintLink": "#76001b", + "faint": "#878787", + "highlightFaintText": "#ffffff", + "selectedMenuFaintText": "#ffffff", + "selectedMenuPopoverFaintText": "#000000", + "highlightLightText": "#ffffff", + "selectedMenuLightText": "#ffffff", + "selectedMenuPopoverLightText": "#000000", + "selectedMenuIcon": "#aca5a7", + "selectedPost": "#f1f2f3", + "selectedPostText": "#000000", + "selectedPostIcon": "#79797a", + "selectedPostLink": "#76001d", + "selectedPostFaintLink": "#76001d", + "highlightPostLink": "#ffbdbd", + "selectedPostPostLink": "#420000", + "selectedPostLightText": "#000000", + "selectedPostFaintText": "#000000", + "popoverText": "#ffffff", + "popoverIcon": "#a59fa1", + "popoverLink": "#ff8aa7", + "postFaintLink": "#ffbdbd", + "popoverPostFaintLink": "#ffbdbd", + "popoverFaintLink": "#ff8aa7", + "popoverFaintText": "#ffffff", + "popoverPostLink": "#ffbdbd", + "popoverLightText": "#bababa", + "highlightIcon": "#aca5a7", + "highlightPostFaintLink": "#ffbdbd", + "profileTint": "#4b3f42", + "profileBg": "#272326", + "wallpaper": "#251d21" + }, + "opacity": { + "underlay": 0, + "bg": 1, + "alert": 0.5, + "alertPopup": 0.95, + "panel": 1, + "input": 0.5, + "btn": 1, + "faint": 0.5, + "border": 0, + "popover": 1, + "profileTint": 0.5 + }, + "radii": { + "btn": "5", + "input": "3", + "checkbox": "7", + "panel": "7", + "avatar": "7", + "avatarAlt": "8", + "tooltip": "8", + "attachment": "26" + }, + "fonts": { + "interface": { + "family": "sans-serif" + }, + "input": { + "family": "inherit" + }, + "post": { + "family": "inherit" + }, + "postCode": { + "family": "monospace" + } + } + }, + "source": { + "themeEngineVersion": 3, + "fonts": {}, + "shadows": { + "panel": [ + { + "x": "0", + "y": "2", + "blur": "9", + "spread": 0, + "inset": false, + "color": "#668bb2", + "alpha": "0.1" + }, + { + "x": "0", + "y": "1", + "blur": "2", + "spread": "-1", + "inset": false, + "color": "#668bb2", + "alpha": "0.1" + } + ], + "topBar": [ + { + "x": 0, + "y": "3", + "blur": "8", + "spread": 0, + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + }, + { + "x": 0, + "y": "1", + "blur": "4", + "spread": 0, + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + } + ], + "button": [ + { + "x": 0, + "y": "2", + "blur": "5", + "spread": 0, + "color": "#463f78", + "alpha": "0.1", + "inset": false + } + ], + "input": [ + { + "x": 0, + "y": "1", + "blur": "2", + "spread": 0, + "inset": true, + "color": "#6277b7", + "alpha": "0.1" + } + ], + "buttonHover": [ + { + "x": 0, + "y": 2, + "blur": 3, + "spread": -2, + "color": "#494949", + "alpha": "0.5" + } + ], + "buttonPressed": [ + { + "x": 0, + "y": 2, + "blur": 3, + "spread": -3, + "color": "#494949", + "alpha": "0.5" + } + ], + "avatarStatus": [ + { + "x": "0", + "y": "2", + "blur": "4", + "spread": "0", + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + } + ], + "avatar": [ + { + "x": 0, + "y": "2", + "blur": "5", + "spread": "0", + "color": "#3e618e", + "alpha": "0.9" + } + ], + "popup": [ + { + "x": "0", + "y": "3", + "blur": "11", + "spread": 0, + "color": "#668bb2", + "alpha": "0.2" + }, + { + "x": "0", + "y": "2", + "blur": "3", + "spread": "-1", + "color": "#668bb2", + "alpha": "0.2" + } + ] + }, + "opacity": { + "underlay": 0, + "border": "0" + }, + "colors": { + "bg": "#4b3f42", + "wallpaper": "#251d21", + "fg": "#5f5353", + "text": "#878787", + "link": "#ff8aa7", + "accent": "#0077ff", + "cBlue": "#ffa5bf", + "cRed": "#d8c5ca", + "cGreen": "#ffa5bf", + "cOrange": "#ffa5bf", + "selectedPost": "#f1f2f3", + "selectedMenuPopover": "#f1f2f3", + "postLink": "#ffbdbd", + "topBarText": "#5f5353", + "btnText": "#cea1a1" + }, + "radii": { + "btn": "5", + "input": "3", + "checkbox": "7", + "panel": "7", + "avatar": "7", + "avatarAlt": "8", + "tooltip": "8", + "attachment": "26" + } + } +} \ No newline at end of file diff --git a/static/themes/flyer_light.json b/static/themes/flyer_light.json new file mode 100644 index 00000000..ee78f0a6 --- /dev/null +++ b/static/themes/flyer_light.json @@ -0,0 +1,458 @@ +{ + "_pleroma_theme_version": 2, + "name": "flyer light", + "theme": { + "themeEngineVersion": 3, + "shadows": { + "panel": [ + { + "color": "#668bb2", + "x": "0", + "y": "2", + "blur": "9", + "spread": 0, + "inset": false, + "alpha": "0.1" + }, + { + "color": "#668bb2", + "x": "0", + "y": "1", + "blur": "2", + "spread": "-1", + "inset": false, + "alpha": "0.1" + } + ], + "topBar": [ + { + "color": "#3e618e", + "x": 0, + "y": "3", + "blur": "8", + "spread": 0, + "inset": false, + "alpha": "0.1" + }, + { + "color": "#3e618e", + "x": 0, + "y": "1", + "blur": "4", + "spread": 0, + "inset": false, + "alpha": "0.1" + } + ], + "popup": [ + { + "color": "#668bb2", + "x": "0", + "y": "3", + "blur": "11", + "spread": 0, + "alpha": "0.2" + }, + { + "color": "#668bb2", + "x": "0", + "y": "2", + "blur": "3", + "spread": "-1", + "alpha": "0.2" + } + ], + "avatar": [ + { + "color": "#3e618e", + "x": 0, + "y": "2", + "blur": "5", + "spread": "0", + "alpha": "0.9" + } + ], + "avatarStatus": [ + { + "color": "#3e618e", + "x": "0", + "y": "2", + "blur": "4", + "spread": "0", + "inset": false, + "alpha": "0.1" + } + ], + "panelHeader": [], + "button": [ + { + "color": "#463f78", + "x": 0, + "y": "2", + "blur": "5", + "spread": 0, + "alpha": "0.1", + "inset": false + } + ], + "buttonHover": [ + { + "color": "#494949", + "x": 0, + "y": 2, + "blur": 3, + "spread": -2, + "alpha": "0.5" + } + ], + "buttonPressed": [ + { + "color": "#494949", + "x": 0, + "y": 2, + "blur": 3, + "spread": -3, + "alpha": "0.5" + } + ], + "input": [ + { + "color": "#6277b7", + "x": 0, + "y": "1", + "blur": "2", + "spread": 0, + "inset": true, + "alpha": "0.1" + } + ] + }, + "colors": { + "underlay": "#f1f2f3", + "bg": "#fef6f8", + "fg": "#ffebf1", + "cRed": "#707070", + "cGreen": "#ff336d", + "cOrange": "#ffd500", + "cBlue": "#ff336d", + "accent": "#ff8aa7", + "link": "#de6382", + "text": "#6e6e6e", + "badgeNotification": "#fe81a2", + "badgeNotificationText": "#ffffff", + "alertNeutral": "#6e6e6e", + "alertNeutralText": "#000000", + "alertPopupNeutral": "#6e6e6e", + "alertPopupNeutralText": "#000000", + "alertSuccess": "#ff336d", + "alertSuccessText": "#000000", + "alertPopupSuccess": "#ff336d", + "alertPopupSuccessText": "#000000", + "alertWarning": "#ffd500", + "alertWarningText": "#000000", + "alertPopupWarning": "#ffd500", + "alertPopupWarningText": "#000000", + "alertError": "#707070", + "alertErrorText": "#000000", + "alertPopupError": "#707070", + "alertPopupErrorText": "#000000", + "panel": "#ffebf1", + "panelText": "#000000", + "alertNeutralPanelText": "#000000", + "alertSuccessPanelText": "#000000", + "alertWarningPanelText": "#000000", + "alertErrorPanelText": "#000000", + "fgText": "#000000", + "topBar": "#ffe5ed", + "topBarText": "#ffe5ed", + "input": "#ffebf1", + "inputTopbarText": "#1b0008", + "inputPanelText": "#000000", + "inputText": "#6e6e6e", + "btn": "#ffebf1", + "btnText": "#fe86aa", + "btnTopBarText": "#7a0125", + "btnDisabled": "#fff4f7", + "btnDisabledTopBarText": "#ddb7c2", + "btnPanelText": "#7a0125", + "btnDisabledPanelText": "#ddb7c2", + "btnDisabledText": "#ffd8e4", + "btnToggled": "#ff85a9", + "btnToggledTopBarText": "#7a0125", + "btnToggledPanelText": "#7a0125", + "btnToggledText": "#7a0125", + "btnPressed": "#ffebf1", + "btnPressedTopBarText": "#7a0125", + "btnPressedTopBar": "#ffebf1", + "btnPressedPanelText": "#7a0125", + "btnPressedPanel": "#ffebf1", + "btnPressedText": "#7a0125", + "tabActiveText": "#6e6e6e", + "tabText": "#7a0125", + "tab": "#ffebf1", + "fgLink": "#9c2140", + "topBarLink": "#fe86aa", + "panelLink": "#9c2140", + "panelFaint": "#000000", + "icon": "#be798a", + "poll": "#ffcbd8", + "pollText": "#000000", + "border": "#ffffff", + "postCyantext": "#cc0039", + "postGreentext": "#cc0039", + "postLink": "#ffbdbd", + "lightText": "#3c3c3c", + "popover": "#fef6f8", + "selectedMenuPopover": "#f1f2f3", + "highlight": "#fce0e6", + "highlightText": "#000000", + "selectedMenu": "#ffd6e2", + "selectedMenuText": "#fe4d85", + "selectedMenuPopoverIcon": "#f8a0bc", + "highlightLink": "#9c2140", + "selectedMenuLink": "#fe4d85", + "selectedMenuPopoverLink": "#b20138", + "selectedMenuPopoverText": "#b20138", + "faintLink": "#de6382", + "highlightFaintLink": "#9c2140", + "selectedMenuFaintLink": "#9c2140", + "selectedMenuPopoverFaintLink": "#9c2140", + "faint": "#6e6e6e", + "highlightFaintText": "#000000", + "selectedMenuFaintText": "#000000", + "selectedMenuPopoverFaintText": "#000000", + "highlightLightText": "#3c3c3c", + "selectedMenuLightText": "#3c3c3c", + "selectedMenuPopoverLightText": "#3c3c3c", + "selectedMenuIcon": "#ff92b4", + "selectedPost": "#f1f2f3", + "selectedPostText": "#000000", + "selectedPostIcon": "#79797a", + "selectedPostLink": "#9c2140", + "selectedPostFaintLink": "#9c2140", + "highlightPostLink": "#420000", + "selectedPostPostLink": "#420000", + "selectedPostLightText": "#3c3c3c", + "selectedPostFaintText": "#000000", + "popoverText": "#6e6e6e", + "popoverIcon": "#b6b2b3", + "popoverLink": "#9c2140", + "postFaintLink": "#ffbdbd", + "popoverPostFaintLink": "#420000", + "popoverFaintLink": "#9c2140", + "popoverFaintText": "#6e6e6e", + "popoverPostLink": "#420000", + "popoverLightText": "#3c3c3c", + "highlightIcon": "#7e7073", + "highlightPostFaintLink": "#420000", + "profileTint": "#fef6f8", + "profileBg": "#868992", + "wallpaper": "#dbdbdb" + }, + "opacity": { + "underlay": 0, + "bg": 1, + "alert": 0.5, + "alertPopup": 0.95, + "panel": 1, + "input": 0.5, + "btn": 1, + "faint": 0.5, + "border": 0, + "popover": 1, + "profileTint": 0.5 + }, + "radii": { + "btn": "5", + "input": "3", + "checkbox": "7", + "panel": "7", + "avatar": "7", + "avatarAlt": "8", + "tooltip": "8", + "attachment": "26" + }, + "fonts": { + "interface": { + "family": "sans-serif" + }, + "input": { + "family": "inherit" + }, + "post": { + "family": "inherit" + }, + "postCode": { + "family": "monospace" + } + } + }, + "source": { + "themeEngineVersion": 3, + "fonts": {}, + "shadows": { + "panel": [ + { + "x": "0", + "y": "2", + "blur": "9", + "spread": 0, + "inset": false, + "color": "#668bb2", + "alpha": "0.1" + }, + { + "x": "0", + "y": "1", + "blur": "2", + "spread": "-1", + "inset": false, + "color": "#668bb2", + "alpha": "0.1" + } + ], + "topBar": [ + { + "x": 0, + "y": "3", + "blur": "8", + "spread": 0, + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + }, + { + "x": 0, + "y": "1", + "blur": "4", + "spread": 0, + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + } + ], + "button": [ + { + "x": 0, + "y": "2", + "blur": "5", + "spread": 0, + "color": "#463f78", + "alpha": "0.1", + "inset": false + } + ], + "input": [ + { + "x": 0, + "y": "1", + "blur": "2", + "spread": 0, + "inset": true, + "color": "#6277b7", + "alpha": "0.1" + } + ], + "buttonHover": [ + { + "x": 0, + "y": 2, + "blur": 3, + "spread": -2, + "color": "#494949", + "alpha": "0.5" + } + ], + "buttonPressed": [ + { + "x": 0, + "y": 2, + "blur": 3, + "spread": -3, + "color": "#494949", + "alpha": "0.5" + } + ], + "avatarStatus": [ + { + "x": "0", + "y": "2", + "blur": "4", + "spread": "0", + "inset": false, + "color": "#3e618e", + "alpha": "0.1" + } + ], + "avatar": [ + { + "x": 0, + "y": "2", + "blur": "5", + "spread": "0", + "color": "#3e618e", + "alpha": "0.9" + } + ], + "popup": [ + { + "x": "0", + "y": "3", + "blur": "11", + "spread": 0, + "color": "#668bb2", + "alpha": "0.2" + }, + { + "x": "0", + "y": "2", + "blur": "3", + "spread": "-1", + "color": "#668bb2", + "alpha": "0.2" + } + ] + }, + "opacity": { + "underlay": 0, + "border": "0" + }, + "colors": { + "bg": "#fef6f8", + "wallpaper": "#dbdbdb", + "fg": "#ffebf1", + "text": "#6e6e6e", + "underlay": "#f1f2f3", + "link": "#de6382", + "accent": "#ff8aa7", + "cBlue": "#ff336d", + "cRed": "#707070", + "cGreen": "#ff336d", + "cOrange": "#ffd500", + "selectedPost": "#f1f2f3", + "selectedMenu": "#ffd6e2", + "selectedMenuText": "#fe4d85", + "selectedMenuLink": "#fe4d85", + "selectedMenuPopover": "#f1f2f3", + "postLink": "#ffbdbd", + "border": "#ffffff", + "icon": "#be798a", + "topBar": "#ffe5ed", + "topBarText": "#ffe5ed", + "topBarLink": "#fe86aa", + "btnText": "#fe86aa", + "badgeNotification": "#fe81a2", + "badgeNotificationText": "#ffffff" + }, + "radii": { + "btn": "5", + "input": "3", + "checkbox": "7", + "panel": "7", + "avatar": "7", + "avatarAlt": "8", + "tooltip": "8", + "attachment": "26" + } + } +} \ No newline at end of file From cafaf22f6a3fb33456abdb0c044b1a5fc1dc2e20 Mon Sep 17 00:00:00 2001 From: sliver Date: Sun, 31 Mar 2024 21:47:53 +0900 Subject: [PATCH 13/14] =?UTF-8?q?n=E3=82=AD=E3=83=BC=E3=81=A7=E6=8A=95?= =?UTF-8?q?=E7=A8=BF=E3=82=A6=E3=82=A3=E3=83=B3=E3=83=89=E3=82=A6=E3=82=92?= =?UTF-8?q?=E9=96=8B=E3=81=8F=EF=BC=88=E3=83=90=E3=82=B0=E3=81=82=E3=82=8A?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/timeline/timeline.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index cdb35e08..5705deba 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -152,8 +152,10 @@ const Timeline = { }, handleShortKey (e) { // Ignore when input fields are focused + // ショートカットキー入力部 if (['textarea', 'input'].includes(e.target.tagName.toLowerCase())) return - if (e.key === '.') this.showNewStatuses() + if (e.key === '.') this.showNewStatuses + if (e.key === 'n') this.$store.dispatch('openPostStatusModal') }, showNewStatuses () { if (this.timeline.flushMarker !== 0) { From 4db2c4d65b42f7db4ff5d85aac2509a6b857d011 Mon Sep 17 00:00:00 2001 From: sliver Date: Sun, 31 Mar 2024 21:48:18 +0900 Subject: [PATCH 14/14] =?UTF-8?q?=E3=81=A7=E3=81=A3=E3=81=91=EF=BD=9E?= =?UTF-8?q?=E6=8A=95=E7=A8=BF=E3=83=9C=E3=82=BF=E3=83=B3=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/user_panel/user_panel.js | 7 ++++++- src/components/user_panel/user_panel.vue | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/user_panel/user_panel.js b/src/components/user_panel/user_panel.js index c2f51eb6..094f2c2f 100644 --- a/src/components/user_panel/user_panel.js +++ b/src/components/user_panel/user_panel.js @@ -6,7 +6,12 @@ import { mapState } from 'vuex' const UserPanel = { computed: { signedIn () { return this.user }, - ...mapState({ user: state => state.users.currentUser }) + ...mapState({ user: state => state.users.currentUser }), + }, + methods: { + openPostForm () { + this.$store.dispatch('openPostStatusModal') + } }, components: { AuthForm, diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue index 243de387..3490fe17 100644 --- a/src/components/user_panel/user_panel.vue +++ b/src/components/user_panel/user_panel.vue @@ -10,7 +10,11 @@ :hide-bio="true" rounded="top" /> - + +