2 files changed, 24 insertions, 0 deletions
diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index c7fc6096a..ab0a8e49b 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -65,6 +65,18 @@
     overflow: hidden;
 }
 
+
+.mainView-settings {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    font-size: 8px;
+}
+
+.mainView-settings:hover {
+    transform: none !important;
+}
+
 .mainView-logout {
     position: absolute;
     right: 5;
@@ -72,6 +84,10 @@
     font-size: 8px;
 }
 
+.mainView-logout:hover {
+    transform: none !important;
+}
+
 .mainView-libraryFlyout {
     height: 100%;
     width:100%;
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 91c7f909b..05bfee95b 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -39,8 +39,12 @@ import MarqueeOptionsMenu from './collections/collectionFreeForm/MarqueeOptionsM
 import InkSelectDecorations from './InkSelectDecorations';
 import { Scripting } from '../util/Scripting';
 import { AudioBox } from './nodes/AudioBox';
+<<<<<<< HEAD
+import SettingsManager from '../util/SettingsManager';
+=======
 import { TraceMobx } from '../../new_fields/util';
 import RichTextMenu from '../util/RichTextMenu';
+>>>>>>> e410cde0e430553002d4e1a2f64364b57b65fdbc
 
 @observer
 export class MainView extends React.Component {
@@ -413,6 +417,9 @@ export class MainView extends React.Component {
                     zoomToScale={emptyFunction}
                     getScale={returnOne}>
                 </DocumentView>
+                <button className="mainView-settings" key="settings" onClick={() => SettingsManager.Instance.open()}>
+                    Settings
+                </button>
                 <button className="mainView-logout" key="logout" onClick={() => window.location.assign(Utils.prepend("/logout"))}>
                     {CurrentUserUtils.GuestWorkspace ? "Exit" : "Log Out"}
                 </button>
@@ -509,6 +516,7 @@ export class MainView extends React.Component {
         return (<div id="mainView-container">
             <DictationOverlay />
             <SharingManager />
+            <SettingsManager />
             <GoogleAuthenticationManager />
             <DocumentDecorations />
             <InkSelectDecorations />