From f943e33e7955c39b88f1ee7ed8bbc7c8df844d83 Mon Sep 17 00:00:00 2001 From: Justin Edmund Date: Fri, 25 Aug 2023 14:46:51 -0700 Subject: [PATCH] Update static assets - Adds new variables for notices - Adds localizations for notices and modals relating to visibility --- public/locales/en/common.json | 36 +++++++++++++++++++++++++++++++++++ public/locales/ja/common.json | 36 +++++++++++++++++++++++++++++++++++ styles/themes.scss | 24 +++++++++++++++++++++++ styles/variables.scss | 30 ++++++++++++++++++++++++++++- 4 files changed, 125 insertions(+), 1 deletion(-) diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 0d13bf7d..b0559966 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -69,6 +69,7 @@ }, "dropdown": { "party": { + "visibility": "Change team visibility", "copy": "Copy link to team", "delete": "Delete team", "remix": "Remix team" @@ -401,6 +402,33 @@ "remove": "Remove summon" } }, + "team_visibility": { + "title": "Change team visibility", + "label": "Team visibility", + "description": "Change who can see this team and where it shows up on the site", + "alerts": { + "unsaved_changes": { + "message": "Are you sure you want to continue without changing your team's visibility?", + "buttons": { + "confirm": "Continue without saving", + "cancel": "Nevermind" + } + } + }, + "options": { + "public": "Public", + "unlisted": "Unlisted", + "private": "Private" + }, + "descriptions": { + "public": "Visible to everyone and appears on the Teams page", + "unlisted": "Only visible to people with the link and does not appear on the Teams page", + "private": "Only visible to you and does not appear on the Teams page" + }, + "buttons": { + "confirm": "Change visibility" + } + }, "weapon": { "title": "Modify Weapon", "buttons": { @@ -463,6 +491,14 @@ "with_count_one": "{{count}} turn", "with_count_other": "{{count}} turns" } + }, + "notices": { + "unlisted": "This party is unlisted. Only people with the link with can see it.", + "private": "This party is private. Only you can see it.", + "buttons": { + "copy_link": "Copy link", + "change_visibility": "Change visibility" + } } }, "proficiencies": { diff --git a/public/locales/ja/common.json b/public/locales/ja/common.json index 31bb4ed2..686864a5 100644 --- a/public/locales/ja/common.json +++ b/public/locales/ja/common.json @@ -69,6 +69,7 @@ }, "dropdown": { "party": { + "visibility": "編成のプライバシー設定を変更", "copy": "編成のリンクをコピー", "delete": "編成を削除", "remix": "編成をリミックス" @@ -401,6 +402,33 @@ "remove": "召喚石を削除する" } }, + "team_visibility": { + "title": "編成のプライバシー設定を変更", + "label": "プライバシー設定", + "description": "この編成は誰が共有できるかと編成一覧に表示されるかを変更できます", + "alerts": { + "unsaved_changes": { + "message": "編成のプライバシー設定を変更せずに続けますか?", + "buttons": { + "confirm": "変更せずに続ける", + "cancel": "キャンセル" + } + } + }, + "options": { + "public": "公開", + "unlisted": "限定公開", + "private": "非公開" + }, + "descriptions": { + "public": "誰でも自由に共有可能。編成一覧に表示します。", + "unlisted": "リンクが知っている人のみが共有可能。編成一覧に表示しません。", + "private": "自分自身だけが可視。編成一覧に表示しません。" + }, + "buttons": { + "confirm": "プライバシー設定を変更" + } + }, "weapon": { "title": "武器変更", "buttons": { @@ -463,6 +491,14 @@ "with_count_one": "{{count}}ターン", "with_count_other": "{{count}}ターン" } + }, + "notices": { + "unlisted": "この編成は限定公開でリンクが知っている人のみが共有可能", + "private": "この編成は未公開で自分自身だけが可視", + "buttons": { + "copy_link": "リンクをコピー", + "change_visibility": "プライバシー設定を変更" + } } }, "proficiencies": { diff --git a/styles/themes.scss b/styles/themes.scss index bac2d3c2..afeaa451 100644 --- a/styles/themes.scss +++ b/styles/themes.scss @@ -81,6 +81,11 @@ --notice-bg: #{$notice--bg--light}; --notice-text: #{$notice--text--light}; + --notice-button-bg: #{$notice--button--bg--light}; + --notice-button-bg-hover: #{$notice--button--bg--light--hover}; + --notice-button-text: #{$notice--button--text--light}; + --notice-button-text-hover: #{$notice--button--text--light--hover}; + // Light - Buttons --button-bg: #{$button--bg--light}; --button-bg-hover: #{$button--bg--light--hover}; @@ -112,6 +117,13 @@ --slider-thumb-shadow: #{$slider--thumb--shadow--light}; --slider-thumb-shadow-hover: #{$slider--thumb--shadow--light--hover}; + // Light - Radio Buttons + --radio-button-bg: #{$radio--bg--light}; + --radio-button-bg-hover: #{$radio--bg--light--hover}; + + --radio-active-bg: #{$radio--active--bg--light}; + --radio-active-bg-hover: #{$radio--active--bg--light--hover}; + // Light - About --link-item-bg: #{$link--item--bg--light}; --link-item-image-color: #{$link--item--bg--image--light}; @@ -313,6 +325,11 @@ --notice-bg: #{$notice--bg--dark}; --notice-text: #{$notice--text--dark}; + --notice-button-bg: #{$notice--button--bg--dark}; + --notice-button-bg-hover: #{$notice--button--bg--dark--hover}; + --notice-button-text: #{$notice--button--text--dark}; + --notice-button-text-hover: #{$notice--button--text--dark--hover}; + // Dark - Buttons --button-bg: #{$button--bg--dark}; --button-bg-hover: #{$button--bg--dark--hover}; @@ -344,6 +361,13 @@ --slider-thumb-shadow: #{$slider--thumb--shadow--dark}; --slider-thumb-shadow-hover: #{$slider--thumb--shadow--dark--hover}; + // Dark - Radio Buttons + --radio-button-bg: #{$radio--bg--dark}; + --radio-button-bg-hover: #{$radio--bg--dark--hover}; + + --radio-active-bg: #{$radio--active--bg--dark}; + --radio-active-bg-hover: #{$radio--active--bg--dark--hover}; + // Dark - About --link-item-bg: #{$link--item--bg--dark}; --link-item-image-color: #{$link--item--bg--image--dark}; diff --git a/styles/variables.scss b/styles/variables.scss index 7343a5db..80b7e2b7 100644 --- a/styles/variables.scss +++ b/styles/variables.scss @@ -107,10 +107,13 @@ $yellow-text-20: #ffed4c; $highlight-yellow: #ffed4c55; $accent--yellow--00: #463805; -$accent--yellow--20: #7f6a00; +$accent--yellow--10: #6c5a01; +$accent--yellow--20: #776300; $accent--yellow--40: #a39200; $accent--yellow--60: #c89d39; +$accent--yellow--70: #d1aa4f; $accent--yellow--80: #deb351; +$accent--yellow--90: #e6bd5e; $accent--yellow--100: #f9cc64; $selected--item--bg--dark: #f9cc645d; @@ -222,6 +225,18 @@ $notice--bg--dark: $accent--yellow--00; $notice--text--light: $accent--yellow--20; $notice--text--dark: $accent--yellow--100; +$notice--button--bg--light: $accent--yellow--80; +$notice--button--bg--dark: $accent--yellow--20; + +$notice--button--bg--light--hover: $accent--yellow--70; +$notice--button--bg--dark--hover: $accent--yellow--10; + +$notice--button--text--light: $accent--yellow--10; +$notice--button--text--dark: $accent--yellow--90; + +$notice--button--text--light--hover: $accent--yellow--00; +$notice--button--text--dark--hover: $accent--yellow--100; + // Color Definitions: Button $button--bg--light: $grey-80; $button--bg--light--hover: $grey-100; @@ -440,6 +455,19 @@ $icon--secondary--color--dark: $grey-50; $icon--secondary--hover--light: $grey-50; $icon--secondary--hover--dark: $grey-70; +// Color Definitions: Radio Buttons +$radio--bg--light: $grey-75; +$radio--bg--dark: $grey-10; + +$radio--bg--light--hover: $grey-70; +$radio--bg--dark--hover: $grey-00; + +$radio--active--bg--light: $accent--blue--light; +$radio--active--bg--dark: $accent--blue--dark; + +$radio--active--bg--light--hover: $accent--blue--light--focus; +$radio--active--bg--dark--hover: $accent--blue--dark--focus; + // Color Definitions: Tag $tag--bg--light: $grey-60; $tag--bg--dark: $grey-00;