Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide non mobile optimized menu items #468

Merged
merged 4 commits into from
Aug 11, 2020
Merged

Hide non mobile optimized menu items #468

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a11ef2
removed transform: scale from radio button styling which was causing …
kyle-mcr Aug 8, 2020
2ace12f
adds id tags to all of the menu items and hides those not optimized f…
ibeckermayer Aug 10, 2020
1d5c26a
Merge branch 'dev' into hide-non-mobile-optimized-menu-items
ibeckermayer Aug 11, 2020
3f6de7a
updating snapshots
ibeckermayer Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions frontend/client/src/components/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,28 @@ const NavBarBase = observer((props) => {
open={open}
onClose={handleClose}
>
<MenuItem className="menu-link" style={{ marginTop: 22 }} onClick={() => onClickMenuItem(0)}>
<MenuItem
id="diagnosis-verification-codes"
className="menu-link"
style={{ marginTop: 22 }}
ibeckermayer marked this conversation as resolved.
Show resolved Hide resolved
onClick={() => onClickMenuItem(0)}
>
Diagnosis Verification Codes
</MenuItem>
{props.store.data.user.isAdmin && (
<MenuItem className="menu-link" onClick={() => onClickMenuItem(1)}>
<MenuItem id="manage-members" className="menu-link" onClick={() => onClickMenuItem(1)}>
Manage Members
</MenuItem>
)}
{props.store.data.user.isAdmin && (
<MenuItem className="menu-link" onClick={() => onClickMenuItem(2)}>
<MenuItem id="mobile-app-settings" className="menu-link" onClick={() => onClickMenuItem(2)}>
Mobile App Settings
</MenuItem>
)}
<MenuItem className="menu-link" onClick={() => onClickMenuItem(3)}>
<MenuItem id="my-settings" className="menu-link" onClick={() => onClickMenuItem(3)}>
My Settings
</MenuItem>
<MenuItem className="menu-link" style={{ marginBottom: 22 }} onClick={() => onClickMenuItem(4)}>
<MenuItem id="logout" className="menu-link" style={{ marginBottom: 22 }} onClick={() => onClickMenuItem(4)}>
ibeckermayer marked this conversation as resolved.
Show resolved Hide resolved
Logout
</MenuItem>
</Menu>
Expand Down
6 changes: 6 additions & 0 deletions frontend/client/styles/components/navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
padding-right: 30px;
color: #2c58b1;
}

@include media('<=phone') {
#manage-members, #mobile-app-settings, #my-settings {
display: none;
}
}
}

#logged-in-icons-container {
Expand Down
6 changes: 3 additions & 3 deletions frontend/client/styles/screens/code_validations.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
flex-direction: column;

.radio-input {
max-width: 16px;
max-height: 16px;
transform: scale(1.23);
max-width: 20px;
max-height: 20px;
margin-left: 0px;
margin-right: 20px;
}

Expand Down