Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit b34bfe6

Browse files
committed
fix(popover): use theme color make it same with other cmp
1 parent cd05bd1 commit b34bfe6

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

components/ArticleActionsPanel/styles/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import Img from '@Img'
55

66
export const Wrapper = styled.div`
77
${cs.flexColumn()};
8-
padding: 10px;
9-
padding-left: 15px;
8+
padding: 5px;
9+
padding-left: 10px;
1010
padding-bottom: 0;
1111
`
1212
export const Option = styled.div`

components/ContentFilter/styles/setting_menu.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ export const Wrapper = styled.div`
77
${cs.flexColumn('align-start')};
88
99
width: 110px;
10-
padding: 15px;
10+
padding: 10px;
1111
padding-right: 5px;
12-
margin: 0 10px;
1312
`
1413
export const Title = styled.div`
1514
font-size: 0.9rem;

components/Popover/styles/index.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@ import { theme } from '@utils'
33

44
// margin: -20px;
55
export const ContentContainer = styled.div`
6-
margin-top: -8px;
7-
margin-left: -6px;
8-
border-radius: 2px;
9-
background: ${theme('popover.bg')};
10-
border: 1px solid;
11-
border-top: 2px solid;
12-
border-color: ${theme('popover.borderColor')};
13-
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.15);
14-
position: relative;
6+
// background: ${theme('popover.bg')};
7+
// border: 1px solid;
8+
// border-top: 2px solid;
9+
// border-color: ${theme('popover.borderColor')};
10+
// box-shadow: 0 1px 4px rgba(0, 0, 0, 0.15);
11+
// position: relative;
1512
`
1613

1714
export const holder = 1

containers/ThemeWrapper/AntUIOverWrite.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createGlobalStyle } from 'styled-components'
22
import { lighten } from 'polished'
33

4-
import { theme } from '@utils'
4+
import { theme, cs } from '@utils'
55

66
// move ant style to seperate file
77
const AntUIOverWrite = createGlobalStyle`
@@ -377,6 +377,24 @@ const AntUIOverWrite = createGlobalStyle`
377377
color: ${theme('table.text')};
378378
opacity: 0.6;
379379
}
380+
381+
.ant-popover {
382+
z-index: ${cs.zIndex.popover};
383+
}
384+
.ant-popover-inner {
385+
background-color: ${theme('popover.bg')} !important;
386+
border: 1px solid;
387+
border-color: ${theme('popover.borderColor')} !important;
388+
z-index: ${cs.zIndex.popover};
389+
}
390+
.ant-popover-arrow {
391+
background-color: ${theme('popover.borderColor')} !important;
392+
border-radius: 3px;
393+
z-index: ${cs.zIndex.popover - 1};
394+
}
395+
.ant-popover-inner-content {
396+
padding: 5px;
397+
}
380398
`
381399

382400
export default AntUIOverWrite

0 commit comments

Comments
 (0)