every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Refactor] Tidy up the color variables.

Browse Source
This commit is contained in:
Sakamoto Shiina
2025-01-02 19:22:09 +09:00
parent d798562de7
commit 5d0e9e0559
28 changed files with 30 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/app/_index_css/root.css
View File

@@ -3,7 +3,7 @@
:root { :root {
font-size: 62.5%; font-size: 62.5%;
color: #F2F2F2; color: var(--dark_basic_text_color);
} }
* { * {

9
src-ui/app/_index_css/variables.css
View File

@@ -20,6 +20,10 @@
--sent_400_color: #6197b4; --sent_400_color: #6197b4;
--received_300_color: #a861b4; --received_300_color: #a861b4;
--error_bc_color: #bb4448;
--error_bc_active_color: #9c3938;
--success_bc_color: #368777;
--waring_color: #cb944f;
--dark_basic_text_color: #f2f2f2; --dark_basic_text_color: #f2f2f2;
--dark_100_color: #f5f7fb; --dark_100_color: #f5f7fb;
@@ -48,8 +52,11 @@
--dark_975_color: #1a1b1d; --dark_975_color: #1a1b1d;
--dark_1000_color: #151517; --dark_1000_color: #151517;
--dark_825_color_cc: #434447cc;
--dark_550_color_22: #94959922; --dark_550_color_22: #94959922;
--dark_825_color_cc: #434447cc;
--dark_1000_color_66: #15151766;
--dark_1000_color_aa: #151517aa;
--dark_1000_color_dd: #151517dd;
--title_bar_height: 2rem; --title_bar_height: 2rem;

1
src-ui/app/config_page/setting_section/setting_box/_components/_atoms/_entry/_Entry.module.scss
View File

@@ -16,7 +16,6 @@
height: 100%; height: 100%;
font-size: 1.4rem; font-size: 1.4rem;
resize: none; resize: none;
color: var(--dark_basic_text_color);
&.is_disabled { &.is_disabled {
color: var(--dark_500_color); color: var(--dark_500_color);
pointer-events: none; pointer-events: none;

7
src-ui/app/config_page/setting_section/setting_box/_components/deepl_auth_key/DeeplAuthKey.module.scss
View File

@@ -22,11 +22,11 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
border-radius: 0.4rem; border-radius: 0.4rem;
background-color: (#00000044); background-color: var(--dark_1000_color_66);
backdrop-filter: blur(4rem); backdrop-filter: blur(4rem);
border: solid 0.1rem var(--dark_700_color); border: solid 0.1rem var(--dark_700_color);
&:hover { &:hover {
background-color: (#00000088); background-color: var(--dark_1000_color_aa);
} }
&:active { &:active {
backdrop-filter: blur(1.4rem); backdrop-filter: blur(1.4rem);
@@ -35,7 +35,6 @@
.edit_button { .edit_button {
padding: 0.8rem 1.2rem; padding: 0.8rem 1.2rem;
color: var(--dark_basic_text_color);
height: 100%; height: 100%;
width: 100%; width: 100%;
font-size: 1.4rem; font-size: 1.4rem;
@@ -62,7 +61,6 @@
} }
.save_button_label { .save_button_label {
color: var(--dark_basic_text_color);
font-size: 1.4rem; font-size: 1.4rem;
} }
@@ -91,7 +89,6 @@
.open_webpage_text { .open_webpage_text {
font-size: 1.2rem; font-size: 1.2rem;
color: var(--dark_basic_text_color);
} }
.external_link_svg { .external_link_svg {

22
src-ui/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.jsx
View File

@@ -1,12 +1,10 @@
import { useState, useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import clsx from "clsx";
import CircularProgress from "@mui/material/CircularProgress"; import CircularProgress from "@mui/material/CircularProgress";
import styles from "./DownloadModels.module.scss"; import styles from "./DownloadModels.module.scss";
import { import {
RadioButton, RadioButton,
// DownloadModels,
} from "../index"; } from "../index";
export const DownloadModels = (props) => { export const DownloadModels = (props) => {
const options = props.options.map(item => ({ const options = props.options.map(item => ({
...item, ...item,
@@ -25,25 +23,11 @@ export const DownloadModels = (props) => {
downloadStartFunction={props.downloadStartFunction} downloadStartFunction={props.downloadStartFunction}
/> />
</> </>
// <div className={styles.container}>
// {props.models.map((option) => (
// <ModelSelector key={option.model_id} option={option} {...props}/>
// ))}
// </div>
); );
}; };
const ModelSelector = ({option, ...props}) => { const ModelSelector = ({option, ...props}) => {
const { t } = useTranslation(); const { t } = useTranslation();
const [circular_color, setCircularColor] = useState("");
const [circular_color_2, setCircularColor2] = useState("");
useEffect(() => {
const circular_color = getComputedStyle(document.documentElement).getPropertyValue("--dark_600_color");
setCircularColor(circular_color.trim());
const circular_color_2 = getComputedStyle(document.documentElement).getPropertyValue("--primary_300_color");
setCircularColor2(circular_color_2.trim());
}, []);
const renderContent = () => { const renderContent = () => {
const circular_progress = Math.floor(option.progress / 10) * 10; const circular_progress = Math.floor(option.progress / 10) * 10;
@@ -56,13 +40,13 @@ const ModelSelector = ({option, ...props}) => {
variant={(option.progress === 100) ? "indeterminate" : "determinate"} variant={(option.progress === 100) ? "indeterminate" : "determinate"}
value={circular_progress} value={circular_progress}
size="3rem" size="3rem"
sx={{ color: circular_color_2 }} sx={{ color: "var(--primary_300_color)" }}
/> />
<p className={styles.progress_label}>{`${Math.round(option.progress)}%`}</p> <p className={styles.progress_label}>{`${Math.round(option.progress)}%`}</p>
</> </>
); );
case option.is_pending: case option.is_pending:
return <CircularProgress size="3rem" sx={{ color: circular_color }}/>; return <CircularProgress size="3rem" sx={{ color: "var(--dark_600_color)" }}/>;
case !option.is_downloaded: case !option.is_downloaded:
return ( return (
<button <button

2
src-ui/app/config_page/setting_section/setting_box/_components/download_models/DownloadModels.module.scss
View File

@@ -22,11 +22,9 @@
} }
.download_button_label { .download_button_label {
font-size: 1.2rem; font-size: 1.2rem;
color: var(--dark_basic_text_color);
} }
.progress_label { .progress_label {
position: absolute; position: absolute;
font-size: 1rem; font-size: 1rem;
color: var(--dark_basic_text_color);
} }

1
src-ui/app/config_page/setting_section/setting_box/_components/label_component/LabelComponent.module.scss
View File

@@ -8,7 +8,6 @@
.label { .label {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 400; font-weight: 400;
color: var(--dark_basic_text_color);
white-space: nowrap; white-space: nowrap;
width: max-content; width: max-content;
} }

7
src-ui/app/config_page/setting_section/setting_box/_components/slider/Slider.jsx
View File

@@ -31,13 +31,6 @@ export const Slider = (props) => {
backgroundColor: "var(--dark_800_color)", backgroundColor: "var(--dark_800_color)",
padding: "0.6rem 1rem", padding: "0.6rem 1rem",
lineHeight: "1.15", lineHeight: "1.15",
// top: "-1.4rem",
// "&::before": {
// left: "30%",
// width: "1rem",
// height: "1rem",
// clipPath: "polygon(50% 0, 100% 100%, 0 100%)",
// },
}, },
}, },
"& .MuiSlider-markLabel": { "& .MuiSlider-markLabel": {

1
src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/threshold_entry/ThresholdEntry.module.scss
View File

@@ -16,7 +16,6 @@
height: 100%; height: 100%;
font-size: 1.4rem; font-size: 1.4rem;
resize: none; resize: none;
color: var(--dark_basic_text_color);
&.is_disable { &.is_disable {
color: var(--dark_500_color); color: var(--dark_500_color);
pointer-events: none; pointer-events: none;

1
src-ui/app/config_page/setting_section/setting_box/_components/threshold_component/volume_check_button/VolumeCheckButton.module.scss
View File

@@ -41,5 +41,4 @@
.button_text { .button_text {
font-size: 1.2rem; font-size: 1.2rem;
color: var(--dark_basic_text_color);
} }

4
src-ui/app/config_page/setting_section/setting_box/_components/word_filter/WordFilter.module.scss
View File

@@ -32,7 +32,6 @@
.item_text { .item_text {
font-size: 1.4rem; font-size: 1.4rem;
font-weight: 300; font-weight: 300;
color: var(--dark_basic_text_color);
&.is_redoable { &.is_redoable {
text-decoration: line-through; text-decoration: line-through;
} }
@@ -56,7 +55,7 @@
.delete_svg { .delete_svg {
width: 2.4rem; width: 2.4rem;
color: #bb4448; color: var(--error_bc_color);
} }
.redo_svg { .redo_svg {
@@ -77,7 +76,6 @@
.add_button { .add_button {
padding: 0.8rem 1.2rem; padding: 0.8rem 1.2rem;
background-color: var(--primary_600_color); background-color: var(--primary_600_color);
color: var(--dark_basic_text_color);
font-size: 1.4rem; font-size: 1.4rem;
border-radius: 0.4rem; border-radius: 0.4rem;
text-align: center; text-align: center;

1
src-ui/app/config_page/setting_section/setting_box/device/Device.module.scss
View File

@@ -61,7 +61,6 @@
.device_label { .device_label {
font-size: 1.8rem; font-size: 1.8rem;
color: var(--dark_basic_text_color);
} }
.device_contents { .device_contents {

4
src-ui/app/config_page/setting_section/setting_box/vr/Vr.module.scss
View File

@@ -39,7 +39,7 @@
background-color: var(--dark_850_color); background-color: var(--dark_850_color);
} }
&.is_selected .controller_switcher_label { &.is_selected .controller_switcher_label {
color: var(--dark_basic_text_color); color: var(--dark_200_color);
} }
} }
.controller_switcher_label { .controller_switcher_label {
@@ -92,7 +92,6 @@
transform: translateX(10%) rotate(90deg); transform: translateX(10%) rotate(90deg);
} }
.sample_text_button_label { .sample_text_button_label {
color: var(--dark_basic_text_color);
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 110%; top: 110%;
@@ -281,7 +280,6 @@
} }
.restore_default_settings_button { .restore_default_settings_button {
color: var(--dark_basic_text_color);
font-size: 1.2rem; font-size: 1.2rem;
margin-top: 6rem; margin-top: 6rem;
padding: 0.8rem; padding: 0.8rem;

1
src-ui/app/config_page/sidebar_section/SidebarSection.module.scss
View File

@@ -22,7 +22,6 @@
display: flex; display: flex;
justify-content: left; justify-content: left;
align-items: center; align-items: center;
color: var(--dark_basic_text_color);
padding: 0.8rem 0 0.8rem 1rem; padding: 0.8rem 0 0.8rem 1rem;
cursor: pointer; cursor: pointer;
&:hover { &:hover {

36
src-ui/app/main_page/MainPage.module.scss
View File

@@ -25,40 +25,4 @@
justify-content: space-between; justify-content: space-between;
background-color: var(--dark_888_color); background-color: var(--dark_888_color);
position: relative; position: relative;
}
.main_page_cover {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background-color: (#000000cc);
display: flex;
flex-direction: column;
gap: 2rem;
justify-content: center;
align-items: center;
backdrop-filter: blur(0.8rem);
color: var(--dark_basic_text_color);
}
.cover_message {
font-size: 2rem;
font-weight: 300;
}
.close_settings_window_button {
font-size: 1.6rem;
font-weight: 300;
padding: 1rem 1.4rem;
border-radius: 0.4rem;
background-color: var(--dark_888_color);
cursor: pointer;
&:hover {
background-color: var(--dark_825_color);
}
&:active {
background-color: var(--dark_925_color);
}
} }

1
src-ui/app/main_page/main_section/language_selector/LanguageSelector.module.scss
View File

@@ -46,5 +46,4 @@
.language_label { .language_label {
font-size: 1.4rem; font-size: 1.4rem;
color: var(--dark_basic_text_color);
} }

1
src-ui/app/main_page/main_section/message_container/log_box/message_container/MessageContainer.module.scss
View File

@@ -81,7 +81,6 @@
} }
.message_main { .message_main {
color: var(--dark_basic_text_color);
user-select: text; user-select: text;
font-size: 1.4em; font-size: 1.4em;
} }

2
src-ui/app/main_page/main_section/message_container/log_box/message_container/message_sub_menu_container/MessageSubMenuContainer.module.scss
View File

@@ -30,7 +30,7 @@
.tooltip_title { .tooltip_title {
font-size: 1.2rem; font-size: 1.2rem;
color: var(--dark_basic_text_color); color: var(--dark_200_color);
} }
.hold_progress_bar { .hold_progress_bar {

2
src-ui/app/main_page/sidebar_section/language_settings/language_selector_open_button/LanguageSelectorOpenButton.module.scss
View File

@@ -57,7 +57,6 @@
.selected_language { .selected_language {
font-size: 1.2rem; font-size: 1.2rem;
color: var(--dark_basic_text_color);
} }
.arrow_left_svg { .arrow_left_svg {
@@ -66,7 +65,6 @@
margin: 0 0.2rem; margin: 0 0.2rem;
transform: rotate(180deg); transform: rotate(180deg);
width: 1.6rem; width: 1.6rem;
color: var(--dark_basic_text_color);
&.reverse { &.reverse {
transform: rotate(0deg); transform: rotate(0deg);
} }

2
src-ui/app/main_page/sidebar_section/language_settings/language_swap_button/LanguageSwapButton.module.scss
View File

@@ -31,6 +31,6 @@
font-size: 1.2rem; font-size: 1.2rem;
color: var(--dark_500_color); color: var(--dark_500_color);
&.is_hovered { &.is_hovered {
color: var(--dark_basic_text_color); color: var(--dark_200_color);
} }
} }

2
src-ui/app/main_page/sidebar_section/language_settings/preset_tab_selector/PresetTabSelector.module.scss
View File

@@ -21,7 +21,7 @@
} }
&.is_selected { &.is_selected {
background-color: var(--dark_800_color); background-color: var(--dark_800_color);
color: var(--dark_basic_text_color); color: var(--dark_200_color);
cursor: default; cursor: default;
pointer-events: none; pointer-events: none;
} }

3
src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/TranslatorSelectorOpenButton.module.scss
View File

@@ -24,7 +24,6 @@
.label { .label {
font-size: 1.2rem; font-size: 1.2rem;
color: var(--dark_basic_text_color);
white-space: nowrap; white-space: nowrap;
} }
@@ -32,5 +31,5 @@
margin-left: 0.2rem; margin-left: 0.2rem;
padding-bottom: 0.2rem; padding-bottom: 0.2rem;
width: 1.8rem; width: 1.8rem;
color: #cb944f; color: var(--waring_color);
} }

6
src-ui/app/main_page/sidebar_section/language_settings/translator_selector_open_button/translator_selector/TranslatorSelector.module.scss
View File

@@ -3,8 +3,7 @@
bottom: 100%; bottom: 100%;
width: 100%; width: 100%;
height: 26rem; height: 26rem;
background-color: (#000000dd); background-color: var(--dark_1000_color_dd);
// background-color: (var(--dark_875_color) + 80);
backdrop-filter: blur(0.1rem); backdrop-filter: blur(0.1rem);
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -75,7 +74,7 @@ $box_size: 6.8rem;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: (#22222233); background-color: var(--dark_1000_color_66);
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: start; align-items: start;
@@ -87,5 +86,4 @@ $box_size: 6.8rem;
font-size: 1.4rem; font-size: 1.4rem;
text-align: center; text-align: center;
text-wrap: balance; text-wrap: balance;
color: var(--dark_basic_text_color);
} }

3
src-ui/app/main_page/sidebar_section/main_function_switch/MainFunctionSwitch.module.scss
View File

@@ -35,11 +35,9 @@
gap: 0.8rem; gap: 0.8rem;
} }
$basic_label_color: var(--dark_basic_text_color);
$pending_label_color: var(--dark_500_color); $pending_label_color: var(--dark_500_color);
.switch_label { .switch_label {
font-size: 1.4rem; font-size: 1.4rem;
color: $basic_label_color;
&.is_compact_mode { &.is_compact_mode {
display: none; display: none;
} }
@@ -50,7 +48,6 @@ $pending_label_color: var(--dark_500_color);
.switch_svg { .switch_svg {
width: 1.8rem; width: 1.8rem;
color: $basic_label_color;
&.is_pending { &.is_pending {
color: $pending_label_color; color: $pending_label_color;
} }

3
src-ui/app/modal_controller/update_modal/UpdateModal.module.scss
View File

@@ -66,7 +66,6 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: var(--dark_basic_text_color);
} }
.accept_button { .accept_button {
@@ -137,7 +136,6 @@
gap: 0.6rem; gap: 0.6rem;
} }
.version_desc_point { .version_desc_point {
background-color: var(--dark_basic_text_color);
width: 0.3rem; width: 0.3rem;
border-radius: 50%; border-radius: 50%;
aspect-ratio: 1 / 1; aspect-ratio: 1 / 1;
@@ -147,5 +145,4 @@
max-width: 48rem; max-width: 48rem;
// text-align: center; // text-align: center;
font-weight: 300; font-weight: 300;
color: var(--dark_basic_text_color);
} }

4
src-ui/app/snackbar_controller/SnackbarController.module.scss
View File

@@ -4,10 +4,10 @@
padding: 2rem; padding: 2rem;
color: #fff; color: #fff;
&.is_success { &.is_success {
background-color: #368777; background-color: var(--success_bc_color);
} }
&.is_error { &.is_error {
background-color: #bb4448; background-color: var(--error_bc_color);
} }
} }

8
src-ui/app/splash_component/SplashComponent.module.scss
View File

@@ -22,13 +22,13 @@
animation: appear .3s ease; animation: appear .3s ease;
} }
& .announcements_link_svg { & .announcements_link_svg {
color: var(--dark_basic_text_color); color: var(--dark_200_color);
} }
} }
&:hover { &:hover {
background-color: var(--dark_825_color); background-color: var(--dark_825_color);
& .announcements_label { & .announcements_label {
color: var(--dark_basic_text_color); color: var(--dark_200_color);
} }
& .announcements_link_svg { & .announcements_link_svg {
color: var(--primary_300_color); color: var(--primary_300_color);
@@ -79,14 +79,14 @@
width: 68px; width: 68px;
aspect-ratio: 1 / 1; aspect-ratio: 1 / 1;
&:hover { &:hover {
background-color: #bb4448; background-color: var(--error_bc_color);
& .x_mark_svg { & .x_mark_svg {
color: var(--dark_200_color); color: var(--dark_200_color);
transform: rotate(45deg); transform: rotate(45deg);
} }
} }
&:active { &:active {
background-color: #9c3938; background-color: var(--error_bc_active_color);
} }
transition: all 0.1s ease; transition: all 0.1s ease;
} }

4
src-ui/app/window_title_bar/WindowTitleBar.module.scss
View File

@@ -61,10 +61,10 @@
} }
.close_button { .close_button {
&:hover { &:hover {
background-color: #bb4448; background-color: var(--error_bc_color);
} }
&:active { &:active {
background-color: #9c3938; background-color: var(--error_bc_active_color);
} }
} }