Skip to content

Commit de69300

Browse files
committed
fixed darkmode background for creation tab, Philip, https://github.com/pmhua, Daniel https://github.com/dreille, William https://github.com/wbrittwage, Miles https://github.com/Miles818
1 parent 8a0a25b commit de69300

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

app/src/components/bottom/BottomTabs.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const BottomTabs = (props): JSX.Element => {
4646
Arrow.renderArrow(state.canvasFocus.childId);
4747

4848
return (
49-
<div className={classes.root} style={style}>
49+
<div className={`${classes.root} ${classes.rootLight}`} style={style}>
5050
<Box display="flex" justifyContent="space-between" alignItems="center" paddingBottom="10px" paddingRight="10px">
5151
<Tabs
5252
value={tab}
@@ -111,12 +111,14 @@ const BottomTabs = (props): JSX.Element => {
111111
const useStyles = makeStyles(theme => ({
112112
root: {
113113
flexGrow: 1,
114-
backgroundColor: '#003366',
115114
height: '100%',
116115
color: '#E8E8E8',
117116
boxShadow: '0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23)',
118117

119118
},
119+
rootLight: isThemeLight => ({
120+
backgroundColor: isThemeLight ? '#003366': 'rgb(33,34,45)'
121+
}),
120122
bottomHeader: {
121123
flex: 1,
122124
flexDirection: 'row',

app/src/components/bottom/CreationPanel.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ import React, { useContext } from 'react';
22
import ComponentPanel from '../right/ComponentPanel'
33
import StatePropsPanel from '../right/StatePropsPanel'
44
import HTMLPanel from '../left/HTMLPanel'
5+
import { styleContext } from '../../containers/AppContainer';
56

67
// Creation panel holds all of the creation functionality of the application. ComponentPanel, HTMLPanel, and StatePropsPanel are all hanged here.
78
// This allows users to create all aspects of this application in one place.
89
const CreationPanel = (props): JSX.Element => {
10+
const {style} = useContext(styleContext);
911
return (
10-
<div className="creation-panel" >
12+
<div className="creation-panel" style={style}>
1113
<ComponentPanel isThemeLight={props.isThemeLight}/>
1214
<HTMLPanel isThemeLight={props.isThemeLight}/>
1315
<StatePropsPanel isThemeLight={props.isThemeLight}/>

app/src/components/right/ComponentPanel.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ const ComponentPanel = ({isThemeLight}): JSX.Element => {
125125
}, []);
126126

127127
return (
128-
<div className={classes.panelWrapper}>
128+
<div className={`${classes.panelWrapper}`}>
129129
{/* Add a new component*/}
130130
<div className={classes.addComponentWrapper}>
131131
<h4
@@ -216,7 +216,6 @@ const useStyles = makeStyles({
216216
flexDirection:'column',
217217
alignItems:'center',
218218
flexGrow : 1,
219-
backgroundColor: '#F9F9F9',
220219
color: '#000000',
221220
},
222221
addComponentWrapper: {

app/src/public/styles/style.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ h4 {
3131
display: flex;
3232
flex-direction: row;
3333
height: 100%;
34+
background-color: #fff;
3435
}
3536

3637
.customization-section {
@@ -45,7 +46,6 @@ h4 {
4546
display: flex;
4647
flex-direction: row;
4748
justify-content: space-evenly;
48-
background-color: #F9F9F9;
4949
}
5050

5151
.state-prop-grid {
@@ -56,7 +56,6 @@ h4 {
5656

5757
.HTMLItemCreate {
5858
flex-grow: 1;
59-
background-color: #F9F9F9;
6059
justify-content: center;
6160
}
6261
/*

0 commit comments

Comments
 (0)