Skip to content

Commit

Permalink
use rem instead of px
Browse files Browse the repository at this point in the history
  • Loading branch information
scarlettperry committed Nov 19, 2020
1 parent 3d9bf5e commit b2fdd69
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
5 changes: 2 additions & 3 deletions frontend/packages/core/src/AppLayout/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ const MenuButton = styled(IconButton)`
`;

const Title = styled(Typography)`
margin-right: 25px;
margin-right: 1.6rem;
font-weight: bold;
font-size: 20px;
line-height: 24px;
font-size: 1.25rem;
color: #ffffff;
opacity: 0.87;
`;
Expand Down
6 changes: 3 additions & 3 deletions frontend/packages/core/src/AppLayout/logo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const rotate = keyframes`
`;

const StyledSvg = styled.svg`
height: 32px;
width: 32px;
margin-right: 16px;
height: 2rem;
width: 2rem;
margin-right: 1rem;
&:hover {
animation: ${rotate} 5s linear;
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/packages/core/src/AppLayout/notifcations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import NotificationsIcon from "@material-ui/icons/Notifications";
const StyledNotificationsIcon = styled(Icon)`
color: #ffffff;
opacity: 0.87;
margin-right: 1rem;
`;

const Notifications: React.FC = () => {
Expand All @@ -16,4 +17,4 @@ const Notifications: React.FC = () => {
);
};

export default Notifications;
export default Notifications;
8 changes: 4 additions & 4 deletions frontend/packages/core/src/AppLayout/user.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import Cookies from "js-cookie";
import jwtDecode from "jwt-decode";

const UserPhoto = styled(IconButton)`
padding: 1px 0 4px 12px;
margin-right: 4px;
padding: 0.06rem 0rem 0.25rem 0.75rem;
margin-right: 0.25rem;
`;

const Avatar = styled(MuiAvatar)`
background-color: #d7dadb;
height: 32px;
width: 32px;
height: 2rem;
width: 2rem;
`;

const Initials = styled(Typography)`
Expand Down

0 comments on commit b2fdd69

Please sign in to comment.