Skip to content

Commit bc57cfa

Browse files
committed
final style commit
1 parent eda664c commit bc57cfa

File tree

3 files changed

+38
-4
lines changed

3 files changed

+38
-4
lines changed

src/client/components/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const App = () => {
4949
<HashRouter>
5050
{/* Navigation bar. Top of the application. */}
5151
<NavBarContainer />
52-
<Divider orientation="horizontal" sx={{ borderBottomWidth: 2, background: '#51819b' }}/>
52+
{/* <Divider orientation="horizontal" sx={{ borderBottomWidth: 2, background: '#51819b' }}/> */}
5353
<Box sx={{ height: '100%', display: 'flex' }}>
5454
{/* Workspace. Left side of the application. */}
5555
<HistoryOrWorkspaceContainer currentWorkspaceId={currentWorkspaceId} setWorkspace={setWorkspace} />

src/client/components/navbar/LoginStatus.tsx

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Avatar from '@mui/material/Avatar';
88
import Badge from '@mui/material/Badge';
99
import { styled } from '@mui/material/styles';
1010
import Tooltip, { TooltipProps, tooltipClasses } from '@mui/material/Tooltip';
11+
import ButtonUnstyled, { buttonUnstyledClasses } from '@mui/base/ButtonUnstyled';
1112

1213
const blue = {
1314
500: '#51819b',
@@ -19,6 +20,38 @@ const white = {
1920
500: '#f0f6fa',
2021
}
2122

23+
const CustomButton = styled(ButtonUnstyled)`
24+
font-family: IBM Plex Sans, sans-serif;
25+
font-weight: bold;
26+
font-size: 0.875rem;
27+
background-color: ${white[500]};
28+
padding: 10px 0px;
29+
border-radius: 3px;
30+
color: ${blue[500]};
31+
transition: all 150ms ease;
32+
cursor: pointer;
33+
border: none;
34+
width: 8vw;
35+
36+
&:hover {
37+
background-color: ${blue[500]};
38+
}
39+
40+
&.${buttonUnstyledClasses.active} {
41+
background-color: ${blue[500]};
42+
}
43+
44+
&.${buttonUnstyledClasses.focusVisible} {
45+
box-shadow: 0 4px 20px 0 rgba(61, 71, 82, 0.1), 0 0 0 5px rgba(0, 127, 255, 0.5);
46+
outline: none;
47+
}
48+
49+
&.${buttonUnstyledClasses.disabled} {
50+
opacity: 0.5;
51+
cursor: not-allowed;
52+
}
53+
`;
54+
2255
const LightTooltip = styled(({ className, ...props }: TooltipProps) => (
2356
<Tooltip {...props} classes={{ popper: className }} />
2457
))(({ theme }) => ({
@@ -96,10 +129,11 @@ export default function LoginContainer(props) {
96129
}}>
97130
<LightTooltip title="Logout">
98131
<Button
132+
color='secondary'
99133
sx={{ maxWidth: '24px', maxHeight: '24px', minWidth: '24px', minHeight: '24px' }}
100134
onClick={handleSignOut}
101135
>
102-
<LogoutRoundedIcon fontSize='small' color={white[500]} />
136+
<LogoutRoundedIcon fontSize='small' />
103137
</Button>
104138
</LightTooltip>
105139
<StyledBadge
@@ -120,7 +154,7 @@ export default function LoginContainer(props) {
120154
flexDirection: 'row',
121155
alignItems: 'center',
122156
}}>
123-
<Button variant="text" onClick={signInViaGitHub}>Sign In</Button>
157+
<Button color='secondary' variant="text" onClick={signInViaGitHub}>Sign In</Button>
124158
</Box>
125159
}
126160
</Box>

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const theme = createTheme({
2323
main: '#51819b',
2424
},
2525
secondary: {
26-
main: '#009688',
26+
main: '#f0f6fa',
2727
},
2828
},
2929
});

0 commit comments

Comments
 (0)