Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-23 06:32:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1621 from danielyxie/dev

Browse Source 
added button as editable color
This commit is contained in:
hydroflame 2021-10-28 17:38:33 -04:00 committed by GitHub
commit ee3ae4f44a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.bundle.js
View File

File diff suppressed because one or more lines are too long

2
main.bundle.js.map
View File

File diff suppressed because one or more lines are too long

3
src/Settings/Settings.ts
View File

@ -137,6 +137,7 @@ interface IDefaultSettings {
disabled: string;
backgroundprimary: string;
backgroundsecondary: string;
button: string;
};
}
@ -213,6 +214,7 @@ export const defaultSettings: IDefaultSettings = {
disabled: "#66cfbc",
backgroundprimary: "#000",
backgroundsecondary: "#000",
button: "#333",
},
};
@ -277,6 +279,7 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
disabled: defaultSettings.theme.disabled,
backgroundprimary: defaultSettings.theme.backgroundprimary,
backgroundsecondary: defaultSettings.theme.backgroundsecondary,
button: defaultSettings.theme.button,
},
init() {
Object.assign(Settings, defaultSettings);

5
src/ui/React/Theme.tsx
View File

@ -17,6 +17,7 @@ declare module "@mui/material/styles" {
rep: React.CSSProperties["color"];
backgroundprimary: React.CSSProperties["color"];
backgroundsecondary: React.CSSProperties["color"];
button: React.CSSProperties["color"];
};
}
interface ThemeOptions {
@ -30,6 +31,7 @@ declare module "@mui/material/styles" {
rep: React.CSSProperties["color"];
backgroundprimary: React.CSSProperties["color"];
backgroundsecondary: React.CSSProperties["color"];
button: React.CSSProperties["color"];
};
}
}
@ -48,6 +50,7 @@ export function refreshTheme(): void {
rep: Settings.theme.rep,
backgroundprimary: Settings.theme.backgroundprimary,
backgroundsecondary: Settings.theme.backgroundsecondary,
button: Settings.theme.button,
},
palette: {
primary: {
@ -140,7 +143,7 @@ export function refreshTheme(): void {
MuiButton: {
styleOverrides: {
root: {
backgroundColor: "#333",
backgroundColor: Settings.theme.button,
border: "1px solid " + Settings.theme.well,
// color: Settings.theme.primary,
"&:hover": {

6
src/ui/React/ThemeEditorModal.tsx
View File

@ -241,6 +241,12 @@ export function ThemeEditorModal(props: IProps): React.ReactElement {
color={customTheme["backgroundsecondary"]}
defaultColor={defaultSettings.theme["backgroundsecondary"]}
/>
<ColorEditor
name="button"
onColorChange={onColorChange}
color={customTheme["button"]}
defaultColor={defaultSettings.theme["button"]}
/>
<br />
<ColorEditor