refactor: wip

groupher · Aug 11, 2024 · 8af6216 · 8af6216
1 parent 0bca5cc
commit 8af6216
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 24 deletions.
diff --git a/src/widgets/Footer/index.tsx b/src/widgets/Footer/index.tsx
@@ -26,7 +26,7 @@ export default () => {
 
   return (
     <div className={s.wrapper}>
-      {layout !== FOOTER_LAYOUT.GROUP ? <GroupLayout /> : <SimpleLayout />}
+      {layout === FOOTER_LAYOUT.GROUP ? <GroupLayout /> : <SimpleLayout />}
       <PowerbyInfo />
     </div>
   )

diff --git a/src/widgets/GlobalLayout/salon/glow_background.ts b/src/widgets/GlobalLayout/salon/glow_background.ts
@@ -39,7 +39,7 @@ export default () => {
   `,
     wrapper: cn(
       'w-full -z-10',
-      isAbsolute ? 'h-1/5' : 'h-full',
+      isAbsolute ? 'h-1/5 right-0' : 'h-full',
       `opacity-${fmtOpacity(glowOpacity)}`,
       glowPosition,
     ),

diff --git a/src/widgets/ThemePalette/GlobalStyle.ts b/src/widgets/ThemePalette/GlobalStyle.ts
@@ -131,8 +131,8 @@ const GlobalStyle = createGlobalStyle<TColor>`
   .tippy-box {
     border: 1px solid;
     border-color: ${theme('popover.borderColor')};
-    background: white !important;
     border-radius: 4px;
+    background: ${theme('popover.bg')} !important;
     transition: all .2s ease-in-out !important;
   }
 

diff --git a/src/widgets/Tooltip/styles/index.ts b/src/widgets/Tooltip/styles/index.ts
@@ -1,6 +1,6 @@
 import Tippy from '@tippyjs/react'
 
-import styled, { css, theme, zIndex } from '~/css'
+import styled, { theme } from '~/css'
 
 export const StyledTippy = styled(Tippy)<{ wechatEnv?: boolean }>`
   position: relative;
@@ -36,22 +36,3 @@ export const ChildrenWrapper = styled.div<TContentWrapper>`
 export const ContentWrapper = styled.div<{ $hasMaxWidth: boolean }>`
   max-width: ${({ $hasMaxWidth }) => ($hasMaxWidth ? '180px' : 'auto')};
 `
-const Arrow = styled.div`
-  position: absolute;
-  ${css.circle(4)};
-  z-index: ${zIndex.popover};
-  background: #2d7eb1;
-  box-shadow: ${theme('popover.boxShadow')};
-`
-export const TopArrow = styled(Arrow)`
-  top: calc(100% + 4px);
-  left: calc(50% - 2px);
-`
-export const BottomArrow = styled(Arrow)`
-  bottom: calc(100% + 4px);
-  left: calc(50% - 2px);
-`
-export const LeftArrow = styled(Arrow)`
-  top: calc(50% - 2px);
-  left: calc(100% + 4px);
-`
diff --git a/utils/themes/skins/light.ts b/utils/themes/skins/light.ts
@@ -219,7 +219,7 @@ export default {
     hoverBg: '#eee',
   },
   popover: {
-    bg: '#f6f6f6', // '#fafafa', // '#fffffff2',
+    bg: '#fafafa', // '#f6f6f6', // '#fafafa', // '#fffffff2',
     borderColor: '#e9e9ea',
     boxShadow: '-3px 2px 20px 0px rgb(58 58 58 / 15%)',
     activeBorder: '#70707094',