colors fixed

This commit is contained in:
Daniel Shleifman
2021-07-06 15:44:20 +03:00
parent e09b72e53d
commit 3b8e334f90
6 changed files with 55 additions and 27 deletions

View File

@@ -95,7 +95,7 @@ export default function PrimarySettingsComponent({
/> />
<FormControlLabel <FormControlLabel
control={<Switch checked={!!PreloadBuffer} onChange={inputForm} id='PreloadBuffer' color='primary' />} control={<Switch checked={!!PreloadBuffer} onChange={inputForm} id='PreloadBuffer' color='secondary' />}
label={t('SettingsDialog.PreloadBuffer')} label={t('SettingsDialog.PreloadBuffer')}
/> />
</div> </div>
@@ -123,7 +123,9 @@ export default function PrimarySettingsComponent({
</div> </div>
<FormControlLabel <FormControlLabel
control={<Switch checked={RemoveCacheOnDrop} onChange={inputForm} id='RemoveCacheOnDrop' color='primary' />} control={
<Switch checked={RemoveCacheOnDrop} onChange={inputForm} id='RemoveCacheOnDrop' color='secondary' />
}
label={t('SettingsDialog.RemoveCacheOnDrop')} label={t('SettingsDialog.RemoveCacheOnDrop')}
/> />
<div> <div>

View File

@@ -30,27 +30,27 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
<SettingSectionLabel>{t('SettingsDialog.AdditionalSettings')}</SettingSectionLabel> <SettingSectionLabel>{t('SettingsDialog.AdditionalSettings')}</SettingSectionLabel>
<FormControlLabel <FormControlLabel
control={<Switch checked={EnableIPv6} onChange={inputForm} id='EnableIPv6' color='primary' />} control={<Switch checked={EnableIPv6} onChange={inputForm} id='EnableIPv6' color='secondary' />}
label='IPv6' label='IPv6'
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={!DisableTCP} onChange={inputForm} id='DisableTCP' color='primary' />} control={<Switch checked={!DisableTCP} onChange={inputForm} id='DisableTCP' color='secondary' />}
label='TCP (Transmission Control Protocol)' label='TCP (Transmission Control Protocol)'
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={!DisableUTP} onChange={inputForm} id='DisableUTP' color='primary' />} control={<Switch checked={!DisableUTP} onChange={inputForm} id='DisableUTP' color='secondary' />}
label='μTP (Micro Transport Protocol)' label='μTP (Micro Transport Protocol)'
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={!DisablePEX} onChange={inputForm} id='DisablePEX' color='primary' />} control={<Switch checked={!DisablePEX} onChange={inputForm} id='DisablePEX' color='secondary' />}
label='PEX (Peer Exchange)' label='PEX (Peer Exchange)'
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={ForceEncrypt} onChange={inputForm} id='ForceEncrypt' color='primary' />} control={<Switch checked={ForceEncrypt} onChange={inputForm} id='ForceEncrypt' color='secondary' />}
label={t('SettingsDialog.ForceEncrypt')} label={t('SettingsDialog.ForceEncrypt')}
/> />
<br /> <br />
@@ -75,7 +75,7 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={!DisableDHT} onChange={inputForm} id='DisableDHT' color='primary' />} control={<Switch checked={!DisableDHT} onChange={inputForm} id='DisableDHT' color='secondary' />}
label={t('SettingsDialog.DHT')} label={t('SettingsDialog.DHT')}
/> />
<br /> <br />
@@ -100,7 +100,7 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={!DisableUpload} onChange={inputForm} id='DisableUpload' color='primary' />} control={<Switch checked={!DisableUpload} onChange={inputForm} id='DisableUpload' color='secondary' />}
label={t('SettingsDialog.Upload')} label={t('SettingsDialog.Upload')}
/> />
<br /> <br />
@@ -125,7 +125,7 @@ export default function SecondarySettingsComponent({ settings, inputForm }) {
/> />
<br /> <br />
<FormControlLabel <FormControlLabel
control={<Switch checked={!DisableUPNP} onChange={inputForm} id='DisableUPNP' color='primary' />} control={<Switch checked={!DisableUPNP} onChange={inputForm} id='DisableUPNP' color='secondary' />}
label='UPnP (Universal Plug and Play)' label='UPnP (Universal Plug and Play)'
/> />
<br /> <br />

View File

@@ -102,8 +102,8 @@ export default function SettingsDialog({ handleClose }) {
<Tabs <Tabs
value={selectedTab} value={selectedTab}
onChange={handleChange} onChange={handleChange}
indicatorColor='primary' indicatorColor='secondary'
textColor='primary' textColor='secondary'
variant='fullWidth' variant='fullWidth'
> >
<Tab label={t('SettingsDialog.Tabs.Main')} {...a11yProps(0)} /> <Tab label={t('SettingsDialog.Tabs.Main')} {...a11yProps(0)} />
@@ -169,7 +169,7 @@ export default function SettingsDialog({ handleClose }) {
{t('SettingsDialog.ResetToDefault')} {t('SettingsDialog.ResetToDefault')}
</Button> </Button>
<Button variant='contained' onClick={handleSave} color='primary'> <Button variant='contained' onClick={handleSave} color='secondary'>
{t('Save')} {t('Save')}
</Button> </Button>
</FooterSection> </FooterSection>

View File

@@ -28,7 +28,14 @@ export default function SliderInput({
<Grid container spacing={2} alignItems='center'> <Grid container spacing={2} alignItems='center'>
<Grid item xs> <Grid item xs>
<Slider min={sliderMin} max={sliderMax} value={value} onChange={onSliderChange} step={step} /> <Slider
min={sliderMin}
max={sliderMax}
value={value}
onChange={onSliderChange}
step={step}
color='secondary'
/>
</Grid> </Grid>
{isProMode && ( {isProMode && (

View File

@@ -17,18 +17,24 @@ export const SettingsHeader = styled(Header)`
` `
export const FooterSection = styled.div` export const FooterSection = styled.div`
padding: 20px; ${({
display: grid; theme: {
grid-auto-flow: column; settingsDialog: { footerBG },
justify-content: end; },
gap: 10px; }) => css`
align-items: center; padding: 20px;
background: #e8e5eb; display: grid;
grid-auto-flow: column;
justify-content: end;
gap: 10px;
align-items: center;
background: ${footerBG};
@media (max-width: 500px) { @media (max-width: 500px) {
grid-auto-flow: row; grid-auto-flow: row;
justify-content: stretch; justify-content: stretch;
} }
`}
` `
export const Divider = styled.div` export const Divider = styled.div`
height: 1px; height: 1px;
@@ -37,8 +43,13 @@ export const Divider = styled.div`
` `
export const Content = styled.div` export const Content = styled.div`
${({ isLoading }) => css` ${({
background: #f1eff3; isLoading,
theme: {
settingsDialog: { contentBG },
},
}) => css`
background: ${contentBG};
overflow: auto; overflow: auto;
flex: 1; flex: 1;

View File

@@ -47,6 +47,10 @@ export const themeColors = {
defaultSecondaryColor: '#00a383', defaultSecondaryColor: '#00a383',
defaultTertiaryColor: '#03aa89', defaultTertiaryColor: '#03aa89',
}, },
settingsDialog: {
contentBG: '#f1eff3',
footerBG: '#f1eff3',
},
}, },
dark: { dark: {
app: { app: {
@@ -94,6 +98,10 @@ export const themeColors = {
defaultSecondaryColor: rgba('#545a5e', 0.9), defaultSecondaryColor: rgba('#545a5e', 0.9),
defaultTertiaryColor: '#545a5e', defaultTertiaryColor: '#545a5e',
}, },
settingsDialog: {
contentBG: '#5A6166',
footerBG: '#323637',
},
}, },
} }