fix(module:theme:style): fix dropdown + button spacing when closed pr…

…eserve (#292) * fix(module:theme:style): fix dropdown + button spacing when closed preserve * fix: text-hover
ng-alain · Nov 25, 2018 · d330e5e · d330e5e
1 parent a882507
commit d330e5e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/theme/styles/app/ng/preserve-white-spaces.less b/packages/theme/styles/app/ng/preserve-white-spaces.less
@@ -4,12 +4,22 @@
     margin-top: @preserve-sf-and-st-spaces;
   }
 
+  // button + button
   .ant-btn + .ant-btn,
+  // button + popconfirm
   .ant-btn + nz-popconfirm,
   nz-popconfirm + .ant-btn,
+  // popconfirm + popconfirm
   nz-popconfirm + nz-popconfirm,
+  // button + button group
   .ant-btn + nz-button-group,
-  nz-popconfirm + nz-button-group {
+  nz-button-group + .ant-btn,
+  // dropdown + button
+  .ant-btn + nz-dropdown,
+  nz-dropdown +.ant-btn,
+  // popconfirm + button group
+  nz-popconfirm + nz-button-group,
+  nz-button-group + nz-popconfirm {
     margin-left: @preserve-buttons-spaces;
   }
   .ant-btn-group {

diff --git a/packages/theme/styles/app/utils/color.less b/packages/theme/styles/app/utils/color.less
@@ -2,7 +2,10 @@
 .bg-white         { background-color: #fff !important; }
 .bg-transparent   { background-color: transparent !important; }
 .text-white       { color: #fff !important; }
-.text-hover:hover { color: @primary-color !important; }
+.text-hover {
+  cursor: pointer;
+  &:hover { color: @primary-color !important; }
+}
 
 .for-each(@colors, {
   .bg-@{adKey}-light       { background-color: extract(@adItem, @color-light-position) !important; }