Revert "Merge branch 'alpha' of https://github.com/MrMartinR/parse-da…

…shboard into alpha" This reverts commit f5e2012, reversing changes made to 062002e.
MrMartinR · Jul 4, 2022 · a8ad924 · a8ad924
1 parent f5e2012
commit a8ad924
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/components/Sidebar/FooterMenu.react.js b/src/components/Sidebar/FooterMenu.react.js
@@ -26,7 +26,7 @@ export default class FooterMenu extends React.Component {
 
   toggle() {
     let pos = Position.inWindow(this.moreRef.current);
-    pos.x += 24;
+    pos.x += 95;
     this.setState({
       show: true,
       position: pos
@@ -50,7 +50,7 @@ export default class FooterMenu extends React.Component {
           position={this.state.position}
           onExternalClick={() => this.setState({ show: false })}>
           <div className={styles.popup}>
-            <a href={`${mountPath}logout`}>Log Out</a>
+            <a href={`${mountPath}logout`}>➡️ Log out</a>
           </div>
         </Popover>
       );

diff --git a/src/components/Sidebar/Sidebar.react.js b/src/components/Sidebar/Sidebar.react.js
@@ -18,7 +18,6 @@ import SidebarSubItem from 'components/Sidebar/SidebarSubItem.react';
 import styles         from 'components/Sidebar/Sidebar.scss';
 import { CurrentApp } from 'context/currentApp';
 
-
 const Sidebar = ({
   prefix,
   action,
@@ -180,7 +179,7 @@ const Sidebar = ({
       <SidebarHeader isCollapsed={!appsMenuOpen && collapsed} />
       {sidebarContent}
       <div className={styles.footer}>
-         <FooterMenu isCollapsed={!appsMenuOpen && collapsed} />
+        <FooterMenu isCollapsed={!appsMenuOpen && collapsed} />
       </div>
     </div>
   );

diff --git a/src/components/Sidebar/Sidebar.scss b/src/components/Sidebar/Sidebar.scss
@@ -352,43 +352,41 @@ a.subitem {
 
 .popup {
   position: absolute;
-  bottom: 12px;
-  left: -64px;
+  bottom: 4px;
+  left: -183px;
   background: white;
-  width: 100px;
+  width: 200px;
   border-radius: 5px;
 
   &:after {
     @include arrow('down', 12px, 6px, #ffffff);
     content: '';
     position: absolute;
     bottom: -6px;
-    right: 42px;
+    right: 94px;
   }
 
   a {
     @include NotoSansFont;
     display: block;
-    height: 30px;
-    line-height: 31px;
+    height: 40px;
+    line-height: 41px;
     font-size: 13px;
     text-align: center;
     border-bottom: 1px solid #e0e0ea;
     color: $mainTextColor;
+    padding-right: 8px;
     &:hover{
       background-color: darken(white,4%)
     }
 
-
     &:first-child {
-      border-radius: 5px;
-      // border-radius: 5px 5px 0 0;
+      border-radius: 5px 5px 5px 5px;
     }
 
     &:last-child {
-      border-radius: 5px;
-      // border-bottom: 0;
-      // border-radius: 0 0 5px 5px;
+      border-bottom: 0;
+      border-radius: 5px 5px 5px 5px;
     }
 
     .emoji{
@@ -416,4 +414,4 @@ a.subitem {
       fill: white;
     }
   }
-}
+}