Skip to content

Commit f722890

Browse files
committed
cleaned up code for merging with dev branch,
Co-authored-by: Philip Hua <[email protected]> Co-authored-by: Miles Wright <[email protected]> Co-authored-by: William Rittwage <[email protected]> Co-authored-by: Daniel Reilley <[email protected]>
1 parent 801421c commit f722890

File tree

5 files changed

+9
-25
lines changed

5 files changed

+9
-25
lines changed

app/src/components/login/SignUp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ const SignUp: React.FC<LoginInt & RouteComponentProps> = props => {
281281
onClick={e => handleSignUp(e)}
282282
>
283283
Sign Up
284-
</Button>+
284+
</Button>
285285
<Grid container justify="flex-end">
286286
<Grid item>
287287
<RouteLink to={`/login`} className="nav_link">

app/src/components/right/ComponentPanelItem.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ const ComponentPanelItem: React.FC<{
6767
payload: { componentId: id, childId: null }
6868
});
6969
};
70-
console.log('isThemeLight 3:',isThemeLight)
7170
return (
7271
<Grid
7372
item

app/src/components/right/StatePropsPanel.tsx

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -329,28 +329,23 @@ const useStyles = makeStyles((theme: Theme) =>
329329
}
330330
},
331331
underlineDark: {
332-
borderBottom: '1px solid white'
333-
332+
borderBottom: '1px solid white'
334333
},
335334
rootUnderlineDark: {
336335
'& .MuiSelect-icon': {
337336
color: '#fff',
338337
},
339-
// '& .MuiInput-underline': {
340-
'&::before': {
341-
borderBottom: '1px solid #fff'
342-
}
343-
// }
338+
'&::before': {
339+
borderBottom: '1px solid #fff'
340+
}
344341
},
345-
rootUnderlineLight: {
342+
rootUnderlineLight: {
346343
'& .MuiSelect-icon': {
347344
color: 'rgba(0,0,0,0.54)',
348345
},
349-
// '& .MuiInput-underline': {
350-
'&::before': {
351-
borderBottom: '1px solid rgba(0,0,0,0.54)'
352-
}
353-
// }
346+
'&::before': {
347+
borderBottom: '1px solid rgba(0,0,0,0.54)'
348+
}
354349
},
355350
inputTextDark: {
356351
'& .MuiInputBase-input': {

app/src/containers/CustomizationPanel.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -735,15 +735,6 @@ const useStyles = makeStyles({
735735
border: isThemeLight ? '1px solid #808080' : '1px solid #ECECEA'
736736
}
737737
}),
738-
// buttonRow: {
739-
// textAlign: 'center',
740-
// marginTop: '25px',
741-
// '& .MuiButton-textSecondary': {
742-
// color: '#808080', // color for delete page
743-
// border: '1px solid #808080'
744-
// }
745-
// },
746-
747738
button: {
748739
fontSize: '1rem',
749740
paddingLeft: '20px',

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
"dotenv": "^8.2.0",
135135
"electron-debug": "^3.1.0",
136136
"electron-devtools-installer": "^2.2.4",
137-
"electron-oauth2": "^3.0.0",
138137
"electron-splashscreen": "^1.0.0",
139138
"electron-window-manager": "^1.0.6",
140139
"enzyme": "^3.4.1",

0 commit comments

Comments
 (0)