Skip to content

Commit 00ac6ed

Browse files
committed
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into Miko
2 parents e928fe8 + 57ad211 commit 00ac6ed

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

app/src/components/main/AddLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function AddLink({ id, onClickHandler, linkDisplayed }) {
4141

4242

4343
const pagesItems = state.components.filter(comp => state.rootComponents.includes(comp.id));
44-
const dropDown = [<MenuItem style={{ color: isThemeLight? '#000' : '#fff'}} disabled hidden selected>Pages</MenuItem>].concat(pagesItems.map(comp => <MenuItem style={{ color: isThemeLight? '#000' : '#fff'}} value={comp.name}>{comp.name}</MenuItem>));
44+
const dropDown = [<MenuItem style={{ color: '#000' }} disabled hidden selected>Pages</MenuItem>].concat(pagesItems.map(comp => <MenuItem style={{ color: '#000' }} value={comp.name}>{comp.name}</MenuItem>));
4545

4646

4747
return (

app/src/components/top/NavBar.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,21 +247,18 @@ const NavBar = (props) => {
247247
<StyledMenuItem
248248
className={classes.manageProject}
249249
onClick={handleClose}
250-
style = { { color: props.isThemeLight ? 'black' : 'white' } }
251250
>
252251
<SaveProjectButton />
253252
</StyledMenuItem>
254253
<StyledMenuItem
255254
className={classes.manageProject}
256255
onClick={handleClose}
257-
style = { { color: props.isThemeLight ? 'black' : 'white' } }
258256
>
259257
<ProjectsFolder />
260258
</StyledMenuItem>
261259
<StyledMenuItem
262260
className={classes.manageProject}
263261
onClick={handleClose}
264-
style = { { color: props.isThemeLight ? 'black' : 'white' } }
265262
>
266263
<DeleteProjects />
267264
</StyledMenuItem>

0 commit comments

Comments
 (0)