bkui-vue 0.0.1-beta.8 → 0.0.1-beta.82

package/lib/button/button.less

@@ -1,32 +1,26 @@
 @import '../styles/themes/themes.less';
 
-@btnMinWidth: 64px;
 @btnHeight: 32px;
-@btnPadding: 15px;
+@btnPadding: 5px 12px;
 @btnBorderRadius: 2px;
 
-@smallBtnMinWidth: 48px;
 @smallBtnHeight: 26px;
-@smallBtnPadding: 12px;
+@smallBtnPadding: 3px 12px;
 
-@largeBtnMinWidth: 74px;
 @largeBtnHeight: 38px;
-@largeBtnPadding: 20px;
+@largeBtnPadding: 8px 20px;
 
 @themeSelectors: primary, warning, success, danger;
 @sizeSelectors: small, large;
 
-.bk-button {
-  display: inline-block;
+.@{bk-prefix}-button {
+  display: inline-flex;
   height: @btnHeight;
-  min-width: @btnMinWidth;
-  padding: 0 @btnPadding;
+  padding: @btnPadding;
   font-size: @font-size-medium;
   color: @default-color;
-  text-align: center;
   text-decoration: none;
   white-space: nowrap;
-  vertical-align: middle;
   cursor: pointer;
   background-color: @white-color;
   border: 1px solid @light-gray;
@@ -35,13 +29,14 @@
   box-sizing: border-box;
   transition: background-color ease .3s;
   appearance: none;
-
+  align-items: center;
+  justify-content: center;
   
   each(@themeSelectors, {
     @color: '@{value}-color';
     @hoverColor: 'button-@{value}-hover-color';
     @activeColor: 'button-@{value}-active-color';
-    &.bk-button-@{value} {
+    &.@{bk-prefix}-button-@{value} {
       background-color: @@color;
       color: @white-color;
       border-color: @@color;
@@ -54,12 +49,9 @@
       &:active {
         background-color: @@activeColor;
         border-color: @@activeColor;
+        color: @white-color;
       }
 
-      &.is-disabled {
-        background-color: @disable-color;
-        border-color: @disable-color;
-      }
       &.is-outline {
         color: @@color;
         border-color: @@color;
@@ -74,15 +66,24 @@
 
       &.is-text {
         color: @@color;
-        background: none;
+        background-color: transparent;
         border: none;
-        &:hover {
+        &:not(.is-disabled):hover {
           color: @@hoverColor;
         }
       }
+      &.is-disabled {
+        &:not(.is-text) {
+          background-color: @disable-color;
+          color: @white-color;
+          border-color: @disable-color;
+        }
+        color: @disable-color;
+        cursor: not-allowed;
+      }
     }
 
-    &.bk-button-hover-@{value} {
+    &.@{bk-prefix}-button-hover-@{value} {
       &:hover {
         background-color: @@hoverColor;
         border-color: @@hoverColor;
@@ -93,16 +94,27 @@
 
   
     each(@sizeSelectors, {
-    @sizeBtnMinWidth: '@{value}BtnMinWidth';
     @sizeBtnHeight: '@{value}BtnHeight';
     @sizeBtnPadding: '@{value}BtnPadding';
-    &.bk-button-@{value} {
-      min-width: @@sizeBtnMinWidth;
+    &.@{bk-prefix}-button-@{value} {
       height: @@sizeBtnHeight;
-      padding: 0 @@sizeBtnPadding;
+      padding: @@sizeBtnPadding;
     }
-  })
-;
+  });
+
+  .@{bk-prefix}-button-text {
+    display: inline-flex;
+    align-items: center;
+    line-height: 1;
+  }
+
+  &:not(.is-text) {
+    .@{bk-prefix}-button-loading {
+      &:not(:last-child) {
+        margin-right: 6px;
+      }
+    }
+  }
 
   &:hover {
     border-color: @button-default-hover-border-color;
@@ -113,43 +125,51 @@
     border-color: @primary-color;
   }
 
-  &.is-disabled {
-    color: @disable-color;
-    cursor: auto;
-    border-color: @disable-color;
-  }
-
   &.is-text {
+    height: auto;
+    padding: 0;
     font-size: @font-size-medium;
+    font-size: inherit;
     color: @default-color;
     text-decoration: none;
     cursor: pointer;
-    background: none;
+    background-color: transparent;
     border: none;
     outline: none;
-  }}
+  }
 
-.bk-button-group {
+  &.is-disabled {
+    color: @disable-color;
+    cursor: not-allowed;
+    border-color: @disable-color;
+  }
+
+  // &.is-circle {
+  //   padding: 8px;
+  //   line-height: 1;
+  //   border-radius: 50%;
+  // }
+}
+
+
+.@{bk-prefix}-button-group {
   display: inline-block;
   font-size: 0;
 
   each(@sizeSelectors, {
-    @sizeBtnMinWidth: '@{value}BtnMinWidth';
     @sizeBtnHeight: '@{value}BtnHeight';
     @sizeBtnPadding: '@{value}BtnPadding';
-    &.bk-button-group-@{value} {
-        .bk-button {
-          min-width: @@sizeBtnMinWidth;
-          height: @@sizeBtnHeight;
-          padding: 0 @@sizeBtnPadding;
-        }
+    &.@{bk-prefix}-button-group-@{value} {
+      .@{bk-prefix}-button {
+        height: @@sizeBtnHeight;
+        padding: @@sizeBtnPadding;
       }
-    })
+    }
+  })
 ;
 
-  .bk-button {
+  .@{bk-prefix}-button {
     height: @btnHeight;
-    min-width: @btnMinWidth;
     margin: 0 0 0 -1px;
     border-radius: 0;
 
@@ -181,4 +201,5 @@
       border-color: @primary-color;
     }
 
-  }}
+  }
+}

package/lib/button/button.variable.css

@@ -1,12 +1,15 @@
 :root {
   --bk-prefix: bk;
+  --popover-max-height: 216px;
   --primary-color: #3a84ff;
   --success-color: #2dcb56;
   --warning-color: #ff9c01;
   --danger-color: #ea3636;
   --default-color: #63656e;
+  --gray-color: #979ba5;
   --light-gray: #c4c6cc;
   --white-color: white;
+  --whitesmoke-color: #fafbfd;
   --disable-color: #dcdee5;
   --font-size-base: 12px;
   --font-size-medium: 14px;
@@ -67,18 +70,41 @@
   --message-success-border-color: #dcffe2;
   --message-danger-bg-color: #ffeded;
   --message-danger-border-color: #ffdddd;
+  --slider-default-bg: #dcdee5;
+  --slider-disable-bar-bg: #979ba5;
+  --menu-bg-color: #182132;
+  --submenu-bg-color: #151d2c;
+  --menu-active-bg-color: linear-gradient(90deg, #3f87ff 0%, #3a84ff 100%);
+  --menu-color: #96a2b9;
+  --menu-group-color: var(--default-color);
+  --menu-width: 260px;
+  --menu-collapse-width: 60px;
+  --menu-active-color: white;
+  --nav-header-bg-color: #182132;
+  --nav-bg-color: #182132;
+  --date-picker-disabled-bg: #fafbfd;
+  --date-picker-dropdown-mb: 4px;
+  --date-picker-dropdown-bg: #fff;
+  --table-bg-color: var(--white-color);
+  --table-border-color: #dcdee5;
+  --table-head-bg-color: #fafbfd;
+  --table-head-font-color: #313238;
+  --table-body-font-color: #575961;
+  --table-row-hover-bg-color: #f5f7fa;
+  --table-row-active-bg-color: #f0f1f5;
+  --cascader-panel-border-color: #dcdee5;
+  --cascader-panel-hover: #eaf3ff;
+  --cascader-panel-active: #f4f6fa;
+  --cascader-panel-disabled-bg: #fff;
 }
 .bk-button {
-  display: inline-block;
+  display: inline-flex;
   height: 32px;
-  min-width: 64px;
-  padding: 0 15px;
+  padding: 5px 12px;
   font-size: var(--font-size-medium);
   color: var(--default-color);
-  text-align: center;
   text-decoration: none;
   white-space: nowrap;
-  vertical-align: middle;
   cursor: pointer;
   background-color: var(--white-color);
   border: 1px solid var(--light-gray);
@@ -87,6 +113,8 @@
   box-sizing: border-box;
   transition: background-color ease 0.3s;
   appearance: none;
+  align-items: center;
+  justify-content: center;
 }
 .bk-button.bk-button-primary {
   background-color: var(--primary-color);
@@ -100,10 +128,7 @@
 .bk-button.bk-button-primary:active {
   background-color: var(--button-primary-active-color);
   border-color: var(--button-primary-active-color);
-}
-.bk-button.bk-button-primary.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
+  color: var(--white-color);
 }
 .bk-button.bk-button-primary.is-outline {
   color: var(--primary-color);
@@ -117,12 +142,21 @@
 }
 .bk-button.bk-button-primary.is-text {
   color: var(--primary-color);
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-primary.is-text:hover {
+.bk-button.bk-button-primary.is-text:not(.is-disabled):hover {
   color: var(--button-primary-hover-color);
 }
+.bk-button.bk-button-primary.is-disabled {
+  color: var(--disable-color);
+  cursor: not-allowed;
+}
+.bk-button.bk-button-primary.is-disabled:not(.is-text) {
+  background-color: var(--disable-color);
+  color: var(--white-color);
+  border-color: var(--disable-color);
+}
 .bk-button.bk-button-hover-primary:hover {
   background-color: var(--button-primary-hover-color);
   border-color: var(--button-primary-hover-color);
@@ -140,10 +174,7 @@
 .bk-button.bk-button-warning:active {
   background-color: var(--button-warning-active-color);
   border-color: var(--button-warning-active-color);
-}
-.bk-button.bk-button-warning.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
+  color: var(--white-color);
 }
 .bk-button.bk-button-warning.is-outline {
   color: var(--warning-color);
@@ -157,12 +188,21 @@
 }
 .bk-button.bk-button-warning.is-text {
   color: var(--warning-color);
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-warning.is-text:hover {
+.bk-button.bk-button-warning.is-text:not(.is-disabled):hover {
   color: var(--button-warning-hover-color);
 }
+.bk-button.bk-button-warning.is-disabled {
+  color: var(--disable-color);
+  cursor: not-allowed;
+}
+.bk-button.bk-button-warning.is-disabled:not(.is-text) {
+  background-color: var(--disable-color);
+  color: var(--white-color);
+  border-color: var(--disable-color);
+}
 .bk-button.bk-button-hover-warning:hover {
   background-color: var(--button-warning-hover-color);
   border-color: var(--button-warning-hover-color);
@@ -180,10 +220,7 @@
 .bk-button.bk-button-success:active {
   background-color: var(--button-success-active-color);
   border-color: var(--button-success-active-color);
-}
-.bk-button.bk-button-success.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
+  color: var(--white-color);
 }
 .bk-button.bk-button-success.is-outline {
   color: var(--success-color);
@@ -197,12 +234,21 @@
 }
 .bk-button.bk-button-success.is-text {
   color: var(--success-color);
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-success.is-text:hover {
+.bk-button.bk-button-success.is-text:not(.is-disabled):hover {
   color: var(--button-success-hover-color);
 }
+.bk-button.bk-button-success.is-disabled {
+  color: var(--disable-color);
+  cursor: not-allowed;
+}
+.bk-button.bk-button-success.is-disabled:not(.is-text) {
+  background-color: var(--disable-color);
+  color: var(--white-color);
+  border-color: var(--disable-color);
+}
 .bk-button.bk-button-hover-success:hover {
   background-color: var(--button-success-hover-color);
   border-color: var(--button-success-hover-color);
@@ -220,10 +266,7 @@
 .bk-button.bk-button-danger:active {
   background-color: var(--button-danger-active-color);
   border-color: var(--button-danger-active-color);
-}
-.bk-button.bk-button-danger.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
+  color: var(--white-color);
 }
 .bk-button.bk-button-danger.is-outline {
   color: var(--danger-color);
@@ -237,26 +280,41 @@
 }
 .bk-button.bk-button-danger.is-text {
   color: var(--danger-color);
-  background: none;
+  background-color: transparent;
   border: none;
 }
-.bk-button.bk-button-danger.is-text:hover {
+.bk-button.bk-button-danger.is-text:not(.is-disabled):hover {
   color: var(--button-danger-hover-color);
 }
+.bk-button.bk-button-danger.is-disabled {
+  color: var(--disable-color);
+  cursor: not-allowed;
+}
+.bk-button.bk-button-danger.is-disabled:not(.is-text) {
+  background-color: var(--disable-color);
+  color: var(--white-color);
+  border-color: var(--disable-color);
+}
 .bk-button.bk-button-hover-danger:hover {
   background-color: var(--button-danger-hover-color);
   border-color: var(--button-danger-hover-color);
   color: var(--white-color);
 }
 .bk-button.bk-button-small {
-  min-width: 48px;
   height: 26px;
-  padding: 0 12px;
+  padding: 3px 12px;
 }
 .bk-button.bk-button-large {
-  min-width: 74px;
   height: 38px;
-  padding: 0 20px;
+  padding: 8px 20px;
+}
+.bk-button .bk-button-text {
+  display: inline-flex;
+  align-items: center;
+  line-height: 1;
+}
+.bk-button:not(.is-text) .bk-button-loading:not(:last-child) {
+  margin-right: 6px;
 }
 .bk-button:hover {
   border-color: var(--button-default-hover-border-color);
@@ -265,37 +323,37 @@
   color: var(--primary-color);
   border-color: var(--primary-color);
 }
-.bk-button.is-disabled {
-  color: var(--disable-color);
-  cursor: auto;
-  border-color: var(--disable-color);
-}
 .bk-button.is-text {
+  height: auto;
+  padding: 0;
   font-size: var(--font-size-medium);
+  font-size: inherit;
   color: var(--default-color);
   text-decoration: none;
   cursor: pointer;
-  background: none;
+  background-color: transparent;
   border: none;
   outline: none;
 }
+.bk-button.is-disabled {
+  color: var(--disable-color);
+  cursor: not-allowed;
+  border-color: var(--disable-color);
+}
 .bk-button-group {
   display: inline-block;
   font-size: 0;
 }
 .bk-button-group.bk-button-group-small .bk-button {
-  min-width: 48px;
   height: 26px;
-  padding: 0 12px;
+  padding: 3px 12px;
 }
 .bk-button-group.bk-button-group-large .bk-button {
-  min-width: 74px;
   height: 38px;
-  padding: 0 20px;
+  padding: 8px 20px;
 }
 .bk-button-group .bk-button {
   height: 32px;
-  min-width: 64px;
   margin: 0 0 0 -1px;
   border-radius: 0;
 }