Merge pull request #102 from ulu-telegram/master

fix
ulu-telegram · Nov 17, 2023 · b2aca0a · b2aca0a
2 parents 7ac56b6 + 54ce5a1
commit b2aca0a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/src/components/left/LeftColumn.scss b/src/components/left/LeftColumn.scss
@@ -52,9 +52,9 @@
     }
   }
 
-  body.is-electron.is-macos #Main:not(.is-fullscreen) &:not(#TopicListHeader) {
+  body.is-electron.is-macos #Main:not(.is-fullscreen) {
     justify-content: space-between;
-    padding: 0.5rem 0.5rem 0.5rem 4.5rem;
+    padding: 2rem 0.5rem 0.5rem 0.5rem;
 
     .SearchInput {
       margin-left: 0.5rem;

diff --git a/src/components/left/main/ForumPanel.module.scss b/src/components/left/main/ForumPanel.module.scss
@@ -104,3 +104,7 @@
     display: inline-block;
   }
 }
+
+.left-header {
+  margin-top: 2rem;
+}
diff --git a/src/components/left/main/LeftMainHeader.module.scss b/src/components/left/main/LeftMainHeader.module.scss
@@ -151,3 +151,7 @@
   width: 100%;
   height: 50px;
 }
+
+.left-header {
+  margin-top: 2rem;
+}
diff --git a/src/components/left/main/LeftMainHeader.tsx b/src/components/left/main/LeftMainHeader.tsx
@@ -24,7 +24,7 @@ import {
 import buildClassName from '../../../util/buildClassName';
 import captureEscKeyListener from '../../../util/captureEscKeyListener';
 import { formatDateToString } from '../../../util/dateFormat';
-import { IS_APP, IS_ELECTRON, IS_MAC_OS } from '../../../util/windowEnvironment';
+import { IS_APP, IS_MAC_OS } from '../../../util/windowEnvironment';
 
 import useAppLayout from '../../../hooks/useAppLayout';
 import useCommands from '../../../hooks/useCommands';
@@ -303,7 +303,7 @@ const LeftMainHeader: FC<OwnProps & StateProps> = ({
               forceOpen={isBotMenuOpen}
               positionX={shouldHideSearch && lang.isRtl ? 'right' : 'left'}
               /* transformOriginY={IS_ELECTRON && IS_MAC_OS && !isFullscreen ? 50 : undefined} */
-              transformMarginTop={IS_ELECTRON && IS_MAC_OS ? 2 : undefined}
+              /* transformMarginTop={IS_ELECTRON && IS_MAC_OS ? 2 : undefined} */
               onTransitionEnd={lang.isRtl ? handleDropdownMenuTransitionEnd : undefined}
             >
               <LeftSideMenuItems

diff --git a/src/components/ui/Menu.tsx b/src/components/ui/Menu.tsx
@@ -67,8 +67,8 @@ const Menu: FC<OwnProps> = ({
   bubbleStyle,
   ariaLabelledBy,
   children,
-  transformOriginX,
-  transformOriginY,
+  /*   transformOriginX,
+  transformOriginY, */
   transformMarginTop,
   positionX = 'left',
   positionY = 'top',
@@ -140,8 +140,8 @@ const Menu: FC<OwnProps> = ({
     shouldCloseFast && 'close-fast',
   );
 
-  const transformOriginYStyle = transformOriginY !== undefined ? `${transformOriginY}px` : undefined;
-  const transformOriginXStyle = transformOriginX !== undefined ? `${transformOriginX}px` : undefined;
+  /* const transformOriginYStyle = transformOriginY !== undefined ? `${transformOriginY}px` : undefined;
+  const transformOriginXStyle = transformOriginX !== undefined ? `${transformOriginX}px` : undefined; */
   const transformMarginTopStyle = transformMarginTop !== undefined ? `${transformMarginTop}rem` : undefined;
 
   const menu = (
@@ -174,7 +174,7 @@ const Menu: FC<OwnProps> = ({
         ref={menuRef}
         className={bubbleFullClassName}
         style={buildStyle(
-          `transform-origin: ${transformOriginXStyle || positionX} ${transformOriginYStyle || positionY}`,
+          /* `transform-origin: ${transformOriginXStyle || positionX} ${transformOriginYStyle || positionY}`, */
           `margin-top: ${transformMarginTopStyle}`,
           bubbleStyle,
         )}