Skip to content

Commit dc57bd6

Browse files
committed
fixed a few more visual bugs where text is white in light mode
1 parent f33b338 commit dc57bd6

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

app/src/components/bottom/BottomTabs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const BottomTabs = (props): JSX.Element => {
4343
Arrow.renderArrow(state.canvasFocus.childId);
4444

4545
return (
46-
<div className={`${classes.root} ${classes.rootLight}`} style={style}>
46+
<div className={`${classes.root} ${classes.rootLight}`} style={{ backgroundColor : '#003366' }}>
4747
<Box display="flex" justifyContent="space-between" alignItems="center" paddingBottom="10px" paddingRight="10px">
4848
<Tabs
4949
value={tab}

app/src/components/login/SignIn.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,12 +295,12 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
295295
</Button>
296296
<Grid container>
297297
<Grid item xs>
298-
<RouteLink to={`/signup`} className="nav_link">
298+
<RouteLink style={{color: props.darkMode ? '#aaaaaa' : 'black'}} to={`/signup`} className="nav_link">
299299
Forgot password?
300300
</RouteLink>
301301
</Grid>
302302
<Grid item>
303-
<RouteLink to={`/signup`} className="nav_link">
303+
<RouteLink style={{color: props.darkMode ? '#aaaaaa' : 'black'}} to={`/signup`} className="nav_link">
304304
Don't have an account? Sign Up
305305
</RouteLink>
306306
</Grid>

app/src/components/login/SignUp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ const SignUp: React.FC<LoginInt & RouteComponentProps> = props => {
312312
</Button>
313313
<Grid container justify="flex-end">
314314
<Grid item>
315-
<RouteLink to={`/login`} className="nav_link">
315+
<RouteLink style={{color: props.darkMode ? '#aaaaaa' : 'black'}} to={`/login`} className="nav_link">
316316
Already have an account? Sign In
317317
</RouteLink>
318318
</Grid>

app/src/components/main/AddLink.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,20 @@ function AddLink({ id, onClickHandler }) {
3737
}
3838

3939
const pagesItems = state.components.filter(comp => state.rootComponents.includes(comp.id));
40-
const dropDown = pagesItems.map(comp => <MenuItem value={comp.name}>{comp.name}</MenuItem>);
40+
const dropDown = pagesItems.map(comp => <MenuItem style={{ color: 'black' }} value={comp.name}>{comp.name}</MenuItem>);
4141

4242
return (
4343
<div style={{padding: '1px', float: 'right', display: 'flex', border: '2px solid red', alignSelf: 'center'}}>
4444
<FormControl size='medium' style={{display: 'flex'}}>
45-
<InputLabel style={ { color: isThemeLight? '#000' : '#fff'} }>Pages</InputLabel>
45+
{/* <InputLabel style={ { color: isThemeLight? '#fff' : '#000'} }>Pages</InputLabel> */}
4646
<Select label='pages'
4747
variant="outlined"
4848
onMouseDown={onClickHandler}
4949
onChange={handlePageSelect}
5050
id="page-select"
51-
style={ isThemeLight? {backgroundColor: '#eef0f1', color: '#000', border: '1px solid black', height: '28px', width: '200px'} : {backgroundColor: 'gray', color: '#fff', border: '1px solid white', height: '28px', width: '200px'}}
51+
style={ isThemeLight
52+
? {backgroundColor: '#eef0f1', color: '#000', border: '1px solid black', height: '28px', width: '200px'}
53+
: {backgroundColor: 'gray', color: '#fff', border: '1px solid white', height: '28px', width: '200px'}}
5254
>
5355
{dropDown}
5456
</Select>

app/src/public/styles/theme.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ export const theme1 = createTheme({
55
palette: {
66
type: 'dark',
77
primary: {
8-
main: '#3f51b5',
8+
main: '#003366', // navy blue
99
},
1010
secondary: {
11-
main: '#17a2b8',
11+
main: '#0099e6', // light blue
1212
},
1313
background: {
1414
paper: '#ffffff',
@@ -20,10 +20,10 @@ export const theme2 = createTheme({
2020
palette: {
2121
type: 'light',
2222
primary: {
23-
main: '#3f51b5',
23+
main: '#003366',
2424
},
2525
secondary: {
26-
main: '#17a2b8',
26+
main: '#0099e6',
2727
},
2828
background: {
2929
paper: '#ffffff',

0 commit comments

Comments
 (0)