chore: Merge branch 'dev'

mydearxym · mydearxym · commit a9d179fe0e78 · 2019-06-18T21:24:41.000+08:00
diff --git a/components/ArticleActionsPanel/styles/index.js b/components/ArticleActionsPanel/styles/index.js
@@ -5,8 +5,8 @@ import Img from '@Img'
 
 export const Wrapper = styled.div`
   ${cs.flexColumn()};
-  padding: 10px;
-  padding-left: 15px;
+  padding: 5px;
+  padding-left: 10px;
   padding-bottom: 0;
 `
 export const Option = styled.div`
diff --git a/components/ArticleEditToolbar/styles/index.js b/components/ArticleEditToolbar/styles/index.js
@@ -1,6 +1,8 @@
 import styled from 'styled-components'
 
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
+
 // import Img from '@Img'
 import { cs, theme } from '@utils'
 
diff --git a/components/ContentFilter/styles/setting_menu.js b/components/ContentFilter/styles/setting_menu.js
@@ -7,9 +7,8 @@ export const Wrapper = styled.div`
   ${cs.flexColumn('align-start')};
 
   width: 110px;
-  padding: 15px;
+  padding: 10px;
   padding-right: 5px;
-  margin: 0 10px;
 `
 export const Title = styled.div`
   font-size: 0.9rem;
diff --git a/components/FormItem/styles/index.js b/components/FormItem/styles/index.js
@@ -1,5 +1,6 @@
 import styled from 'styled-components'
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 // import Img from '@Img'
 import { theme, cs } from '@utils'
diff --git a/components/Popover/styles/index.js b/components/Popover/styles/index.js
@@ -3,15 +3,12 @@ import { theme } from '@utils'
 
 // margin: -20px;
 export const ContentContainer = styled.div`
-  margin-top: -8px;
-  margin-left: -6px;
-  border-radius: 2px;
-  background: ${theme('popover.bg')};
-  border: 1px solid;
-  border-top: 2px solid;
-  border-color: ${theme('popover.borderColor')};
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.15);
-  position: relative;
+  // background: ${theme('popover.bg')};
+  // border: 1px solid;
+  // border-top: 2px solid;
+  // border-color: ${theme('popover.borderColor')};
+  // box-shadow: 0 1px 4px rgba(0, 0, 0, 0.15);
+  // position: relative;
 `
 
 export const holder = 1
diff --git a/containers/AccountEditor/SocialInputer.js b/containers/AccountEditor/SocialInputer.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import { ICON_CMD } from '@config'
 import { buildLog, nilOrEmpty, SOCIAL_LISTS } from '@utils'
diff --git a/containers/CommunitySetter/Message.js b/containers/CommunitySetter/Message.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import { Alert } from 'antd'
+import 'antd/lib/alert/style/index.css'
 
 const Message = () => (
   <Alert
diff --git a/containers/CommunitySetter/styles/search_bar.js b/containers/CommunitySetter/styles/search_bar.js
@@ -1,5 +1,6 @@
 import styled from 'styled-components'
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import Img from '@components/Img'
 import { cs, theme } from '@utils'
diff --git a/containers/FavoritesCats/Creator.js b/containers/FavoritesCats/Creator.js
@@ -1,5 +1,7 @@
 import React from 'react'
 import { Button, Input, Radio } from 'antd'
+import 'antd/lib/radio/style/index.css'
+import 'antd/lib/input/style/index.css'
 
 import { Space } from '@components/BaseStyled'
 import SectionLabel from '@components/SectionLabel'
diff --git a/containers/FavoritesCats/Updater.js b/containers/FavoritesCats/Updater.js
@@ -1,5 +1,7 @@
 import React from 'react'
 import { Button, Input, Radio } from 'antd'
+import 'antd/lib/radio/style/index.css'
+import 'antd/lib/input/style/index.css'
 
 import Popconfirm from '@components/Popconfirm'
 import { Space } from '@components/BaseStyled'
diff --git a/containers/GirlVerifier/index.js b/containers/GirlVerifier/index.js
@@ -6,6 +6,7 @@
 
 import React from 'react'
 import { Button, Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import { ICON_CMD } from '@config'
 import { connectStore, buildLog } from '@utils'
diff --git a/containers/Informer/Form.js b/containers/Informer/Form.js
@@ -1,6 +1,7 @@
 import React from 'react'
 
 import { Input, Button } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import { Space } from '@components/BaseStyled'
 import SectionLabel from '@components/SectionLabel'
diff --git a/containers/JobEditor/styles/editor.js b/containers/JobEditor/styles/editor.js
@@ -1,5 +1,6 @@
 import styled from 'styled-components'
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import { theme, cs } from '@utils'
 
diff --git a/containers/JobEditor/styles/index.js b/containers/JobEditor/styles/index.js
@@ -1,5 +1,6 @@
 import styled from 'styled-components'
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import { theme, cs } from '@utils'
 
diff --git a/containers/PostEditor/styles/editor.js b/containers/PostEditor/styles/editor.js
@@ -1,5 +1,6 @@
 import styled from 'styled-components'
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import { theme, cs } from '@utils'
 
diff --git a/containers/PostEditor/styles/index.js b/containers/PostEditor/styles/index.js
@@ -1,5 +1,6 @@
 import styled from 'styled-components'
 import { Input } from 'antd'
+import 'antd/lib/input/style/index.css'
 
 import { theme, cs } from '@utils'
 
diff --git a/containers/ThemeWrapper/AntUIOverWrite.js b/containers/ThemeWrapper/AntUIOverWrite.js
@@ -1,7 +1,7 @@
 import { createGlobalStyle } from 'styled-components'
 import { lighten } from 'polished'
 
-import { theme } from '@utils'
+import { theme, cs } from '@utils'
 
 // move ant style to seperate file
 const AntUIOverWrite = createGlobalStyle`
@@ -377,6 +377,24 @@ const AntUIOverWrite = createGlobalStyle`
     color: ${theme('table.text')};
     opacity: 0.6;
   }
+
+  .ant-popover {
+    z-index: ${cs.zIndex.popover};
+  }
+  .ant-popover-inner {
+    background-color: ${theme('popover.bg')} !important;
+    border: 1px solid;
+    border-color: ${theme('popover.borderColor')} !important;
+    z-index: ${cs.zIndex.popover};
+  }
+  .ant-popover-arrow {
+    background-color: ${theme('popover.borderColor')} !important;
+    border-radius: 3px;
+    z-index: ${cs.zIndex.popover - 1};
+  }
+  .ant-popover-inner-content {
+    padding: 5px;
+  }
 `
 
 export default AntUIOverWrite
diff --git a/containers/UserSettings/index.js b/containers/UserSettings/index.js
@@ -6,6 +6,7 @@
 
 import React from 'react'
 import { Radio } from 'antd'
+import 'antd/lib/radio/style/index.css'
 
 import { ICON_CMD, ISSUE_ADDR } from '@config'
 import { connectStore, buildLog, C11N } from '@utils'
diff --git a/containers/VideoEditor/AlertMessage.js b/containers/VideoEditor/AlertMessage.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import { Alert } from 'antd'
+import 'antd/lib/alert/style/index.css'
 
 import { Margin } from '@components/BaseStyled'
 import { ICON_CMD } from '@config'
diff --git a/package.json b/package.json
@@ -129,7 +129,7 @@
     "@babel/plugin-proposal-decorators": "^7.1.0",
     "@commitlint/cli": "^7.0.0",
     "@commitlint/config-conventional": "^8.0.0",
-    "babel-eslint": "9.0.0",
+    "babel-eslint": "10.0.2",
     "babel-jest": "^23.6.0",
     "babel-plugin-add-react-displayname": "^0.0.5",
     "babel-plugin-import": "1.9.1",
diff --git a/static/antd-3.8.4-mini.css b/static/antd-3.8.4-mini.css
diff --git a/yarn.lock b/yarn.lock
