Skip to content

Commit

Permalink
feat(frontend/settings): organize overlay buttons next to each other (#…
Browse files Browse the repository at this point in the history
…616)

Co-authored-by: Harjot Singh <harjot@harkul.com>
  • Loading branch information
bhajneet and Harjot1Singh committed Oct 29, 2020
1 parent d2b1721 commit 71f6622
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 130 deletions.
121 changes: 19 additions & 102 deletions app/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions app/frontend/src/Settings/OverlaySettings.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
flex-direction: column;
}

.overlay-settings .tutorial-button {
margin: 18px 0;
.overlay-settings .buttons {
margin: 30px 0;
}

.overlay-settings .folder-button {
margin-top: 18px;
}
.overlay-settings .buttons + .buttons {
margin-top: 0px;
}
33 changes: 13 additions & 20 deletions app/frontend/src/Settings/OverlaySettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,24 @@ const OverlaySettings = () => {
When a line is activated in the controller and seen on the presenter,
the same information is used to generate the overlay.
Choose what to display and how to display it with the options below.
You can choose from a variety of pre-configured overlays or
create your own using the theme tool.
For added customization, create an overlay with the theme tool.
</Typography>
</Grid>
</OptionGrid>

<OptionGrid container align="center">
<Grid item {...slotSizes.single}>

<Grid container justify="space-around">
<TutorialButton className="tutorial-button" href="https://tutorials.shabados.com/tutorials/1.0.0/overlay/overlay.html">
Learn More
</TutorialButton>
<TutorialButton className="theme-tool" href="https://themes.shabados.com">
Theme Tool
</TutorialButton>
</Grid>

<Grid item {...slotSizes.single} className="buttons">
<TutorialButton className="tutorial-button" href="https://tutorials.shabados.com/tutorials/1.0.0/overlay/overlay.html">
Learn More
</TutorialButton>
</Grid>
<Grid item {...slotSizes.single} className="buttons">
<TutorialButton className="theme-tool" href="https://themes.shabados.com">
Theme Tool
</TutorialButton>
</Grid>
<Grid item {...slotSizes.single} className="buttons">
<Button className="folder-button" disabled={!isElectron} variant="contained" onClick={() => controller.action( 'open-overlay-folder' )}>Open Overlay Folder</Button>
</Grid>
</OptionGrid>

Expand All @@ -68,13 +68,6 @@ const OverlaySettings = () => {
</OptionGrid>

<DynamicOptions device="global" group="overlay" />

<OptionGrid container align="center">
<Grid item {...slotSizes.single}>
<Button className="folder-button" disabled={!isElectron} variant="contained" onClick={() => controller.action( 'open-overlay-folder' )}>Open Overlay Folder</Button>
</Grid>
</OptionGrid>

</div>
)
}
Expand Down
4 changes: 1 addition & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 71f6622

Please sign in to comment.