From 40c86c585b63fe888651f9467195f17c33d2707d Mon Sep 17 00:00:00 2001 From: lindwurm Date: Fri, 2 Feb 2024 01:15:50 +0900 Subject: [PATCH] [maud] Fix bigger-publish Signed-off-by: lindwurm --- .github/workflows/build-security.yml | 64 ------------------- .../compose/components/compose_form.jsx | 15 +++-- app/javascript/mastodon/locales/ja.json | 21 ++++++ .../styles/mods/bigger-publish.scss | 18 ++---- app/javascript/styles/mods/custom.scss | 4 ++ 5 files changed, 37 insertions(+), 85 deletions(-) delete mode 100644 .github/workflows/build-security.yml diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml deleted file mode 100644 index b03b787d5f73c6..00000000000000 --- a/.github/workflows/build-security.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: Build security nightly container image -on: - workflow_dispatch: - -permissions: - contents: read - packages: write - -jobs: - compute-suffix: - runs-on: ubuntu-latest - if: github.repository == 'mastodon/mastodon' - steps: - - id: version_vars - env: - TZ: Etc/UTC - run: | - echo mastodon_version_prerelease=nightly.$(date --date='next day' +'%Y-%m-%d')-security>> $GITHUB_OUTPUT - outputs: - prerelease: ${{ steps.version_vars.outputs.mastodon_version_prerelease }} - - build-image: - needs: compute-suffix - uses: ./.github/workflows/build-container-image.yml - with: - file_to_build: Dockerfile - platforms: linux/amd64,linux/arm64 - use_native_arm64_builder: true - cache: false - push_to_images: | - tootsuite/mastodon - ghcr.io/mastodon/mastodon - version_prerelease: ${{ needs.compute-suffix.outputs.prerelease }} - labels: | - org.opencontainers.image.description=Nightly build image used for testing purposes - flavor: | - latest=auto - tags: | - type=raw,value=edge - type=raw,value=nightly - type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }} - secrets: inherit - - build-image-streaming: - needs: compute-suffix - uses: ./.github/workflows/build-container-image.yml - with: - file_to_build: streaming/Dockerfile - platforms: linux/amd64,linux/arm64 - use_native_arm64_builder: true - cache: false - push_to_images: | - tootsuite/mastodon-streaming - ghcr.io/mastodon/mastodon-streaming - version_prerelease: ${{ needs.compute-suffix.outputs.prerelease }} - labels: | - org.opencontainers.image.description=Nightly build image used for testing purposes - flavor: | - latest=auto - tags: | - type=raw,value=edge - type=raw,value=nightly - type=schedule,pattern=${{ needs.compute-suffix.outputs.prerelease }} - secrets: inherit diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx index b93bac9d19bce9..b7079b9c4db46b 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.jsx +++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx @@ -300,15 +300,16 @@ class ComposeForm extends ImmutablePureComponent { + -
-
+
+
+ diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 47a4b5cc88ef84..ca296f9b16b0db 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -90,6 +90,7 @@ "announcement.announcement": "お知らせ", "attachments_list.unprocessed": "(未処理)", "audio.hide": "音声を閉じる", + "autosuggest_hashtag.per_week": "{count} 回 / 週", "boost_modal.combo": "次からは{combo}を押せばスキップできます", "bundle_column_error.copy_stacktrace": "エラーレポートをコピー", "bundle_column_error.error.body": "要求されたページをレンダリングできませんでした。コードのバグ、またはブラウザの互換性の問題が原因である可能性があります。", @@ -146,12 +147,22 @@ "compose_form.lock_disclaimer": "あなたのアカウントは{locked}になっていません。誰でもあなたをフォローすることができ、フォロワー限定の投稿を見ることができます。", "compose_form.lock_disclaimer.lock": "承認制", "compose_form.placeholder": "今なにしてる？", + "compose_form.poll.add_option": "追加", "compose_form.poll.duration": "アンケート期間", + "compose_form.poll.option_placeholder": "項目 {number}", + "compose_form.poll.remove_option": "この項目を削除", "compose_form.poll.switch_to_multiple": "複数選択に変更", "compose_form.poll.switch_to_single": "単一選択に変更", + "compose_form.publish": "トゥート", "compose_form.publish_form": "トゥート", + "compose_form.publish_loud": "{publish}！", + "compose_form.save_changes": "変更を保存", + "compose_form.sensitive.hide": "メディアを閲覧注意にする", + "compose_form.sensitive.marked": "メディアに閲覧注意が設定されています", + "compose_form.sensitive.unmarked": "メディアに閲覧注意が設定されていません", "compose_form.spoiler.marked": "本文は警告の後ろに隠されます", "compose_form.spoiler.unmarked": "本文は隠されていません", + "compose_form.spoiler_placeholder": "ここに警告を書いてください", "confirmation_modal.cancel": "キャンセル", "confirmations.block.block_and_report": "ブロックし通報", "confirmations.block.confirm": "ブロック", @@ -398,6 +409,7 @@ "navigation_bar.direct": "非公開の返信", "navigation_bar.discover": "見つける", "navigation_bar.domain_blocks": "ブロックしたドメイン", + "navigation_bar.edit_profile": "プロフィールを編集", "navigation_bar.explore": "探索する", "navigation_bar.favourites": "お気に入り", "navigation_bar.filters": "フィルター設定", @@ -515,7 +527,14 @@ "poll_button.add_poll": "アンケートを追加", "poll_button.remove_poll": "アンケートを削除", "privacy.change": "公開範囲を変更", + "privacy.direct.long": "指定された相手のみ閲覧可", + "privacy.direct.short": "指定された相手のみ", + "privacy.private.long": "フォロワーのみ閲覧可", + "privacy.private.short": "フォロワーのみ", + "privacy.public.long": "誰でも閲覧可", "privacy.public.short": "公開", + "privacy.unlisted.long": "誰でも閲覧可、サイレント", + "privacy.unlisted.short": "非収載", "privacy_policy.last_updated": "{date}に更新", "privacy_policy.title": "プライバシーポリシー", "recommended": "おすすめ", @@ -697,8 +716,10 @@ "upload_error.poll": "アンケートではファイルをアップロードできません。", "upload_form.audio_description": "聴き取りが難しいユーザーへの説明", "upload_form.description": "視覚的に閲覧が難しいユーザーへの説明", + "upload_form.description_missing": "説明を追加していません", "upload_form.edit": "編集", "upload_form.thumbnail": "サムネイルを変更", + "upload_form.undo": "削除", "upload_form.video_description": "聴き取りや視覚的に閲覧が難しいユーザーへの説明", "upload_modal.analyzing_picture": "画像を解析中…", "upload_modal.apply": "適用", diff --git a/app/javascript/styles/mods/bigger-publish.scss b/app/javascript/styles/mods/bigger-publish.scss index 4729042121d3a7..40336b79461014 100644 --- a/app/javascript/styles/mods/bigger-publish.scss +++ b/app/javascript/styles/mods/bigger-publish.scss @@ -1,16 +1,6 @@ .bigger-publish { - .compose-form__publish { - display: contents; + .compose-form__submit > button { + padding: 24px 50%; + font-size: 24px; } - .compose-form__publish-button-wrapper { - height: 2em; - width: 100%; - font-size: 3rem; - } - - .compose-form__publish-button-wrapper > button { - height: 100%; - width: 100%; - font-size: 80%; - } -} \ No newline at end of file +} diff --git a/app/javascript/styles/mods/custom.scss b/app/javascript/styles/mods/custom.scss index a3733f2893a7fa..03725c18b3fe0b 100644 --- a/app/javascript/styles/mods/custom.scss +++ b/app/javascript/styles/mods/custom.scss @@ -34,3 +34,7 @@ font-size: 24px; border-radius: 50%; } + +.compose-form__submit > button { + padding: 7px 50%; +}