Merge branch 'dev' into cleaning

shabados · Oct 26, 2020 · e22d5e4 · e22d5e4
2 parents e431071 + 40f3cb2
commit e22d5e4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/app/frontend/src/Controller/History.js b/app/frontend/src/Controller/History.js
@@ -65,14 +65,14 @@ const History = ( { register, focused } ) => {
         <ListItemIcon className="meta icon">
           <FontAwesomeIcon icon={faDownload} />
         </ListItemIcon>
-      Export
+        Export
       </ListItem>
 
       <ListItem onClick={controller.clearHistory}>
         <ListItemIcon className="meta icon">
           <FontAwesomeIcon icon={faTrash} />
         </ListItemIcon>
-      Clear History
+        Clear History
       </ListItem>
     </List>
   ), [ register, focused, transitionHistory, latestLines ] )

diff --git a/app/frontend/src/Settings/OverlaySettings.js b/app/frontend/src/Settings/OverlaySettings.js
@@ -33,11 +33,11 @@ const OverlaySettings = () => {
           </Typography>
           <br />
           <Typography>
-              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.
+            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.
           </Typography>
         </Grid>
       </OptionGrid>
@@ -47,10 +47,10 @@ const OverlaySettings = () => {
 
           <Grid container justify="space-around">
             <TutorialButton className="tutorial-button" href="https://tutorials.shabados.com/tutorials/1.0.0/overlay/overlay.html">
-            Learn More
+              Learn More
             </TutorialButton>
             <TutorialButton className="theme-tool" href="https://themes.shabados.com">
-            Theme Tool
+              Theme Tool
             </TutorialButton>
           </Grid>
 

diff --git a/app/frontend/src/shared/ErrorFallback.js b/app/frontend/src/shared/ErrorFallback.js
@@ -40,11 +40,11 @@ const ErrorFallback = ( { error, autoReset } ) => {
             it seems we&apos;ve never broken it quite like this.
           </span>
           <span>
-          Usage Analytics (if enabled in System Options), will send us a report.
-          A prompt investigation into what, why, and how this happened will ensue.
+            Usage Analytics (if enabled in System Options), will send us a report.
+            A prompt investigation into what, why, and how this happened will ensue.
           </span>
           <span>
-          If you wish to help, please send an email to [email protected]
+            If you wish to help, please send an email to [email protected]
           </span>
         </Typography>
       </Typography>