fix: Picker margin-bottom

soluvas · Dec 31, 2019 · e766380 · e766380
1 parent 0903e39
commit e766380
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/components/date-picker/style/index.less b/components/date-picker/style/index.less
@@ -209,6 +209,7 @@
     line-height: @picker-text-height - 2 * @border-width-base - @padding-xs / 2;
     text-align: left;
     list-style: none;
+    margin-bottom: 0;
 
     > li {
       display: inline-block;

diff --git a/components/style/themes/dark.less b/components/style/themes/dark.less
@@ -254,7 +254,7 @@
 @input-bg: transparent;
 @input-placeholder-color: fade(@white, 30%);
 @input-number-handler-bg: transparent;
-@input-number-handler-active-bg: @popover-background;
+@input-number-handler-active-bg: @item-hover-bg;
 @input-icon-hover-color: fade(@white, 85%);
 
 // Select

diff --git a/components/tag/demo/colorful.md b/components/tag/demo/colorful.md
@@ -49,3 +49,9 @@ ReactDOM.render(
   margin-bottom: 8px;
 }
 ```
+
+<style>
+.code-box-demo .ant-tag {
+  margin-bottom: 8px;
+}
+<style>
diff --git a/package.json b/package.json
@@ -157,7 +157,7 @@
     "@types/warning": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^2.0.0",
     "@typescript-eslint/parser": "^2.10.0",
-    "antd-pro-merge-less": "^2.0.26",
+    "antd-pro-merge-less": "^2.0.28",
     "antd-theme-generator": "^1.1.6",
     "babel-eslint": "^10.0.1",
     "babel-plugin-add-react-displayname": "^0.0.5",

diff --git a/site/theme/static/common.less b/site/theme/static/common.less
@@ -182,6 +182,11 @@ a {
   bottom: 102px;
   z-index: 2147483640;
   cursor: pointer;
+  &-tooltip {
+    .ant-tooltip-inner {
+      min-width: 100px;
+    }
+  }
   & > div {
     display: block;
   }

diff --git a/site/theme/template/Content/MainContent.jsx b/site/theme/template/Content/MainContent.jsx
@@ -369,7 +369,11 @@ class MainContent extends Component {
             </section>
             {componentPage && (
               <div className="fixed-widgets">
-                <Tooltip title={formatMessage({ id: `app.theme.switch.${theme}` })}>
+                <Tooltip
+                  getPopupContainer={node => node.parentNode}
+                  title={formatMessage({ id: `app.theme.switch.${theme}` })}
+                  overlayClassName="fixed-widgets-tooltip"
+                >
                   <Avatar
                     className={classNames('fixed-widgets-avatar', `fixed-widgets-avatar-${theme}`)}
                     size={44}