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

alerts: address mobile alerts controls bottom margin #3

Merged
merged 3 commits into from
Jun 4, 2019
Merged

alerts: address mobile alerts controls bottom margin #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4384e7
increase toolbar margin on smaller screens
Forfold Jun 4, 2019
0e4caca
adjust whitespace width to the left of the alerts checkbox controls
Forfold Jun 4, 2019
6c3ba6a
slightly reduce alerts checkbox controls bottom margin on desktop
Forfold Jun 4, 2019
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
14 changes: 5 additions & 9 deletions web/src/app/alerts/components/CheckedAlertsFormControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ const escalateAlerts = gql`
const stickyBase = {
backgroundColor: 'lightgrey', // same color as background
boxShadow: '0px 0px 0px 3px rgba(211,211,211, 1)', // shadow to overlap list shadow
marginBottom: '0.75em', // push list down below box shadow
marginTop: -48, // height between checkbox and toolbar
paddingTop: '0.5em', // from sidebar.js wrapper padding
position: 'sticky', // stop moving while scrolling
Expand All @@ -69,24 +68,24 @@ const styles = theme => ({
opacity: 1,
},
whitespace: {
width: 27,
},
whitespaceXs: {
width: 19,
width: 11,
},
hidden: {
visibility: 'hidden',
},
stickySmall: {
...stickyBase,
marginBottom: '2.5em', // push list down below box shadow
top: 56, // toolbar height on small devices
},
stickyMedium: {
...stickyBase,
marginBottom: '2.5em', // push list down below box shadow
top: 64, // toolbar height on medium devices
},
stickyLarge: {
...stickyBase,
marginBottom: '0.5em', // push list down below box shadow
marginTop: '-1em',
top: 64,
},
Expand Down Expand Up @@ -362,10 +361,7 @@ export default class CheckedAlertsFormControl extends Component {
updateMessage={updateMessage}
/>,
<Grid key='form-control' item container className={containerClass}>
<Grid
item
className={width === 'xs' ? classes.whitespaceXs : classes.whitespace}
/>
<Grid item className={classes.whitespace} />
<Grid item>
<Checkbox
checked={!this.areNoneChecked()}
Expand Down