diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss b/src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss index d93f76c6..19d4d541 100644 --- a/src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss +++ b/src-ui/app/config_page/setting_section/setting_box/supporters/Supporters.module.scss @@ -1,6 +1,6 @@ .container { display: flex; - gap: 1.2rem; + gap: 3.2rem; flex-direction: column; justify-content: center; align-items: center; diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx b/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx index 67997829..7c357a9f 100644 --- a/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.jsx @@ -1,22 +1,46 @@ -import fanbox_img from "@images/supporters/c_fanbox_1620x580.png"; -import fanbox_button from "@images/supporters/fanbox_button.png"; -import kofi_preparing from "@images/supporters/kofi_preparing.png"; +import top_img from "@images/supporters/patreon_1600x400px.png"; +import fanbox_logo from "@images/supporters/fanbox_logo.png"; +import kofi_logo from "@images/supporters/kofi_logo.png"; +import patreon_logo from "@images/supporters/patreon_logo.png"; import styles from "./SupportUsContainer.module.scss"; +import { clsx } from "clsx"; export const SupportUsContainer = () => { return (
- -
-
- - + +
+
+ + +
+
+
+ + +
+
+
+ + +
+
-

日本語 / Mainly Japanese

-
- -

Mainly English

+
+
+
+
+
diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss b/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss index d1dea0ad..4d4a1e41 100644 --- a/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss +++ b/src-ui/app/config_page/setting_section/setting_box/supporters/support_us_container/SupportUsContainer.module.scss @@ -3,42 +3,134 @@ flex-direction: column; justify-content: center; align-items: center; - gap: 2rem; + gap: 1.4rem; width: 100%; - } -.fanbox_img { - width: 60vw; +.support_buttons_wrapper { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + gap: 2rem; +} + +.top_img { + width: 100%; +} + +.lines_container { + display: flex; + gap: 3.6rem; +} + +.line_basic, .line_fuwa, .line_mochi, .line_mogu { + width: 8.6rem; + height: 0.2rem; +} + +.line_basic { + background-color: var(--dark_800_color); +} +.line_fuwa { + background-color: #5788a2; +} +.line_mochi { + background-color: var(--received_300_color); +} +.line_mogu { + background-color: var(--dark_basic_text_color); } .support_us_button_wrapper { display: flex; justify-content: center; align-items: center; - width: 100%; - gap: 4.8rem; -} -.fanbox_wrapper, .kofi_wrapper { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - gap: 1rem; -} -.fanbox_button { - width: 14rem; - transition: all 0.3s ease; - &:hover { - width: 16rem; - } -} -.kofi_preparing { - width: 6rem; + column-gap: 3.6rem; + flex-wrap: wrap; } -.mainly_japanese, .mainly_english { - font-size: 1.2rem; - color: var(--dark_400_color); +.support_button { + position: relative; + padding: 1.2rem 1.6rem; +} + +.support_img { + &.fanbox_logo { + height: 1.8rem; + } + &.kofi_logo, &.patreon_logo { + height: 2.2rem; + } +} + + + + +.spiral_top::before, +.spiral_top::after, +.spiral_bottom::before, +.spiral_bottom::after { + content: ""; + position: absolute; + transition-duration: 0.3s; +} +.spiral_top::before { + background: var(--dark_800_color); + box-shadow: 0 0 0.4rem 0 var(--dark_800_color); +} +.spiral_top::after { + background: #5788a2; + box-shadow: 0 0 0.4rem 0 #5788a2; +} +.spiral_bottom::before { + background: var(--received_300_color); + box-shadow: 0 0 0.4rem 0 var(--received_300_color); +} +.spiral_bottom::after { + background: var(--dark_basic_text_color); + box-shadow: 0 0 0.4rem 0 var(--dark_basic_text_color); +} + +.spiral_top::before { + top: 0; + left: 0; + width: 0.1rem; + height: 0; +} +.spiral_top::after { + top: 0; + right: 0; + width: 0; + height: 0.1rem; +} +.spiral_bottom::before { + bottom: 0; + left: 0; + width: 0; + height: 0.1rem; +} +.spiral_bottom::after { + bottom: 0; + right: 0; + width: 0.1rem; + height: 0; +} + +.support_button:hover +.spiral_top::before { + height: 100%; +} +.support_button:hover +.spiral_top::after { + width: 100%; +} +.support_button:hover +.spiral_bottom::before { + width: 100%; +} +.support_button:hover +.spiral_bottom::after { + height: 100%; } diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx index 6a44c3ec..903ca26b 100644 --- a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.jsx @@ -9,7 +9,6 @@ export const SupportersContainer = () => { return (
-

{`VRCT3.0のアップデートに向けて、めちゃ大変な開発を支えてくれた "Early Supporters" です。\nThey are the 'Early Supporters' who supported us through the incredibly challenging development toward the VRCT3.0 update.`}

diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss index f6ed3518..4b525879 100644 --- a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss +++ b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/SupportersContainer.module.scss @@ -8,10 +8,6 @@ .vrct_supporters_title { height: 6rem; } -.vrct_supporters_desc { - font-size: 1.4rem; - text-align: start; -} .vrct_supporters_desc_end { font-size: 1.4rem; diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx index f8e8e3f0..1a0a0a31 100644 --- a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx +++ b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.jsx @@ -178,10 +178,9 @@ export const SupportersWrapper = () => { }); return is_and_you ? ( - -
+ +
@@ -195,7 +194,6 @@ export const SupportersWrapper = () => { ): img_src ? (
@@ -219,9 +217,7 @@ export const SupportersWrapper = () => { }, []); return ( -
-
{renderImages()}
-
+
{renderImages()}
); }; @@ -247,7 +243,7 @@ const SupporterPeriodContainer = ({settings}) => { return (
- {Object.entries(period_data).map(([key, item]) => { + {Object.entries(period_data).map(([key, item], index) => { if (item === "") return null; const class_name = clsx(styles.period_box, { [styles.mogu_bar]: item === "もぐもぐ_2000", @@ -256,7 +252,7 @@ const SupporterPeriodContainer = ({settings}) => { [styles.basic_bar]: item === "Basic_300", }); - return
+ return
})}
); diff --git a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss index ea9aa61c..b4135b87 100644 --- a/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss +++ b/src-ui/app/config_page/setting_section/setting_box/supporters/supporters_container/supporters_wrapper/SupportersWrapper.module.scss @@ -4,8 +4,8 @@ align-items: center; align-content: start; flex-wrap: wrap; - column-gap: 1.4rem; - row-gap: 1.2rem; + column-gap: 1.8rem; + row-gap: 1rem; } .supporter_image_container { diff --git a/src-ui/assets/supporters/c_fanbox_1620x580.png b/src-ui/assets/supporters/c_fanbox_1620x580.png deleted file mode 100644 index 5c677f49..00000000 Binary files a/src-ui/assets/supporters/c_fanbox_1620x580.png and /dev/null differ diff --git a/src-ui/assets/supporters/fanbox_button.png b/src-ui/assets/supporters/fanbox_button.png deleted file mode 100644 index 7bf90626..00000000 Binary files a/src-ui/assets/supporters/fanbox_button.png and /dev/null differ diff --git a/src-ui/assets/supporters/fanbox_logo.png b/src-ui/assets/supporters/fanbox_logo.png new file mode 100644 index 00000000..a329d385 Binary files /dev/null and b/src-ui/assets/supporters/fanbox_logo.png differ diff --git a/src-ui/assets/supporters/kofi_logo.png b/src-ui/assets/supporters/kofi_logo.png new file mode 100644 index 00000000..d15fe04e Binary files /dev/null and b/src-ui/assets/supporters/kofi_logo.png differ diff --git a/src-ui/assets/supporters/kofi_preparing.png b/src-ui/assets/supporters/kofi_preparing.png deleted file mode 100644 index d674b8fb..00000000 Binary files a/src-ui/assets/supporters/kofi_preparing.png and /dev/null differ diff --git a/src-ui/assets/supporters/patreon_1600x400px.png b/src-ui/assets/supporters/patreon_1600x400px.png new file mode 100644 index 00000000..38c2c8e1 Binary files /dev/null and b/src-ui/assets/supporters/patreon_1600x400px.png differ diff --git a/src-ui/assets/supporters/patreon_logo.png b/src-ui/assets/supporters/patreon_logo.png new file mode 100644 index 00000000..7a31f52c Binary files /dev/null and b/src-ui/assets/supporters/patreon_logo.png differ diff --git a/src-ui/assets/supporters/vrct_supporters_title.png b/src-ui/assets/supporters/vrct_supporters_title.png index f606a502..c15324af 100644 Binary files a/src-ui/assets/supporters/vrct_supporters_title.png and b/src-ui/assets/supporters/vrct_supporters_title.png differ