bkui-vue 0.0.1-beta.47 → 0.0.1-beta.470

package/lib/button/button.less

@@ -1,32 +1,28 @@
 @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;
+@smallBtnFontSize: @font-size-base;
 
-@largeBtnMinWidth: 74px;
 @largeBtnHeight: 38px;
-@largeBtnPadding: 20px;
+@largeBtnPadding: 8px 20px;
+@largeBtnFontSize: @font-size-large;
 
 @themeSelectors: primary, warning, success, danger;
 @sizeSelectors: small, large;
 
 .@{bk-prefix}-button {
-  display: inline-block;
+  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,6 +31,8 @@
   box-sizing: border-box;
   transition: background-color ease .3s;
   appearance: none;
+  align-items: center;
+  justify-content: center;
   
   each(@themeSelectors, {
     @color: '@{value}-color';
@@ -56,10 +54,6 @@
         color: @white-color;
       }
 
-      &.is-disabled {
-        background-color: @disable-color;
-        border-color: @disable-color;
-      }
       &.is-outline {
         color: @@color;
         border-color: @@color;
@@ -74,12 +68,21 @@
 
       &.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-prefix}-button-hover-@{value} {
@@ -93,21 +96,31 @@
 
   
     each(@sizeSelectors, {
-    @sizeBtnMinWidth: '@{value}BtnMinWidth';
     @sizeBtnHeight: '@{value}BtnHeight';
     @sizeBtnPadding: '@{value}BtnPadding';
+    @sizeBtnFontSize: '@{value}BtnFontSize';
     &.@{bk-prefix}-button-@{value} {
-      min-width: @@sizeBtnMinWidth;
       height: @@sizeBtnHeight;
-      line-height: @@sizeBtnHeight;
-      padding: 0 @@sizeBtnPadding;
+      padding: @@sizeBtnPadding;
+      font-size: @@sizeBtnFontSize;
     }
-  })
-;
+  });
 
-  .@{bk-prefix}-button-loading {
-    &:not(:last-child) {
-      margin-right: @smallBtnPadding;
+  .@{bk-prefix}-button-text {
+    display: inline-flex;
+    align-items: center;
+    line-height: 1;
+  }
+
+  &.is-loading {
+    position: relative;
+    .@{bk-prefix}-button-loading {
+      &:not(:last-child) {
+        position: absolute;
+      }
+    }
+    .@{bk-prefix}-button-text {
+      visibility: hidden;
     }
   }
 
@@ -120,38 +133,45 @@
     border-color: @primary-color;
   }
 
-  &.is-disabled {
-    color: @disable-color;
-    cursor: auto;
-    border-color: @disable-color;
-  }
-
   &.is-text {
     height: auto;
-    font-size: @font-size-medium;
+    padding: 0;
     font-size: inherit;
-    line-height: 1;
     color: @default-color;
     text-decoration: none;
     cursor: pointer;
-    background: none;
+    background-color: transparent;
     border: none;
     outline: none;
-  }}
+  }
+
+  &.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';
+    @sizeBtnFontSize: '@{value}BtnFontSize';
     &.@{bk-prefix}-button-group-@{value} {
       .@{bk-prefix}-button {
-        min-width: @@sizeBtnMinWidth;
         height: @@sizeBtnHeight;
-        padding: 0 @@sizeBtnPadding;
+        padding: @@sizeBtnPadding;
+        font-size: @@sizeBtnFontSize;
       }
     }
   })
@@ -159,7 +179,6 @@
 
   .@{bk-prefix}-button {
     height: @btnHeight;
-    min-width: @btnMinWidth;
     margin: 0 0 0 -1px;
     border-radius: 0;
 
@@ -168,10 +187,13 @@
       background-color: @white-color;
       border-color: @light-gray;
     }
+
+    &.is-disabled {
+      color: @light-gray;
+    }
     
     &:first-child {
       border-radius: @btnBorderRadius 0 0 @btnBorderRadius;
-        
     }
 
     &:last-child {
@@ -191,5 +213,13 @@
       border-color: @primary-color;
     }
 
+    &.is-selected:not(.is-disabled) {
+      background-color: @button-selected-bg-color;
+    }
+
+    &.is-selected.is-disabled {
+      background-color: @button-disabled-selected-bg-color;
+    }
+
   }
 }

package/lib/button/button.variable.css

@@ -9,6 +9,7 @@
   --gray-color: #979ba5;
   --light-gray: #c4c6cc;
   --white-color: white;
+  --whitesmoke-color: #fafbfd;
   --disable-color: #dcdee5;
   --font-size-base: 12px;
   --font-size-medium: 14px;
@@ -18,10 +19,11 @@
   --line-height-large: 18px;
   --component-size-small: 26px;
   --component-size-base: 32px;
-  --component-size-large: 38px;
+  --component-size-large: 40px;
   --border-width-base: 1px;
   --border-style-base: solid;
   --border-radius-base: 2px;
+  --border-style-color: var(--light-gray);
   --input-disabled-bg: #fafbfd;
   --input-disabled-border: var(--disable-color);
   --input-height-base: var(--component-size-base);
@@ -31,8 +33,9 @@
   --input-broder-radius: 3px;
   --input-shadow-color: #a3c5fd;
   --input-horizontal-padding: 10px;
-  --input-block-color: #f4f6fa;
-  --input-icon-size: var(--font-size-large);
+  --input-block-color: #f5f7fa;
+  --input-block-hover-color: #eaebf0;
+  --input-icon-size: var(--font-size-medium);
   --input-maxlength-color: #979ba5;
   --button-primary-hover-color: #5594fa;
   --button-danger-hover-color: #ff5656;
@@ -43,6 +46,17 @@
   --button-danger-active-color: #db2626;
   --button-success-active-color: #1ab943;
   --button-warning-active-color: #eb9000;
+  --button-selected-bg-color: #e1ecff;
+  --button-disabled-selected-bg-color: #f0f1f5;
+  --radio-font-color: #63656e;
+  --radio-active-color: #5594fa;
+  --radio-hover-border-color: #979ba5;
+  --radio-disabled-border: #dcdee5;
+  --radio-disabled-font-color: #c4c6cc;
+  --radio-disabled-checked-bg: #a3c5fd;
+  --radio-button-checked-bg: #e1ecff;
+  --radio-button-disabled-checked-bg: #fafbfd;
+  --checkbox-disabled-checked-bg: #a3c5fd;
   --fixed-navbar-background: #fff;
   --fixed-navbar-boxshadow-color: rgba(0, 0, 0, 0.1);
   --switch-default-color: #fff;
@@ -63,12 +77,16 @@
   --message-color: var(--default-color);
   --message-primary-bg-color: #f0f8ff;
   --message-primary-border-color: #e1ecff;
+  --message-primary-shadow-color: #e1e8f4;
   --message-warning-bg-color: #fff4e2;
   --message-warning-border-color: #ffe8c3;
+  --message-warning-shadow-color: #ede6db;
   --message-success-bg-color: #f2fff4;
   --message-success-border-color: #dcffe2;
+  --message-success-shadow-color: #cef0d7;
   --message-danger-bg-color: #ffeded;
   --message-danger-border-color: #ffdddd;
+  --message-danger-shadow-color: #f6dada;
   --slider-default-bg: #dcdee5;
   --slider-disable-bar-bg: #979ba5;
   --menu-bg-color: #182132;
@@ -88,21 +106,28 @@
   --table-border-color: #dcdee5;
   --table-head-bg-color: #fafbfd;
   --table-head-font-color: #313238;
-  --table-body-font-color: #575961;
+  --table-body-font-color: #63656E;
   --table-row-hover-bg-color: #f5f7fa;
   --table-row-active-bg-color: #f0f1f5;
+  --cascader-panel-border-color: #dcdee5;
+  --cascader-panel-hover: #f5f7fa;
+  --cascader-panel-active: #e1ecff;
+  --cascader-panel-disabled-bg: #fff;
+  --search-select-focus-border-color: var(--primary-color);
+  --search-select-focus-color: #3c96ff;
+  --search-select-font-color: var(--default-color);
+  --search-select-placeholder-color: var(--light-gray);
+  --search-select-message-color: var(--danger-color);
+  --search-select-menu-border-color: var(--disable-color);
 }
 .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);
@@ -111,6 +136,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);
@@ -126,10 +153,6 @@
   border-color: var(--button-primary-active-color);
   color: var(--white-color);
 }
-.bk-button.bk-button-primary.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
-}
 .bk-button.bk-button-primary.is-outline {
   color: var(--primary-color);
   border-color: var(--primary-color);
@@ -142,12 +165,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);
@@ -167,10 +199,6 @@
   border-color: var(--button-warning-active-color);
   color: var(--white-color);
 }
-.bk-button.bk-button-warning.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
-}
 .bk-button.bk-button-warning.is-outline {
   color: var(--warning-color);
   border-color: var(--warning-color);
@@ -183,12 +211,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);
@@ -208,10 +245,6 @@
   border-color: var(--button-success-active-color);
   color: var(--white-color);
 }
-.bk-button.bk-button-success.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
-}
 .bk-button.bk-button-success.is-outline {
   color: var(--success-color);
   border-color: var(--success-color);
@@ -224,12 +257,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);
@@ -249,10 +291,6 @@
   border-color: var(--button-danger-active-color);
   color: var(--white-color);
 }
-.bk-button.bk-button-danger.is-disabled {
-  background-color: var(--disable-color);
-  border-color: var(--disable-color);
-}
 .bk-button.bk-button-danger.is-outline {
   color: var(--danger-color);
   border-color: var(--danger-color);
@@ -265,31 +303,49 @@
 }
 .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;
-  line-height: 26px;
-  padding: 0 12px;
+  padding: 3px 12px;
+  font-size: var(--font-size-base);
 }
 .bk-button.bk-button-large {
-  min-width: 74px;
   height: 38px;
-  line-height: 38px;
-  padding: 0 20px;
+  padding: 8px 20px;
+  font-size: var(--font-size-large);
+}
+.bk-button .bk-button-text {
+  display: inline-flex;
+  align-items: center;
+  line-height: 1;
+}
+.bk-button.is-loading {
+  position: relative;
+}
+.bk-button.is-loading .bk-button-loading:not(:last-child) {
+  position: absolute;
 }
-.bk-button .bk-button-loading:not(:last-child) {
-  margin-right: 12px;
+.bk-button.is-loading .bk-button-text {
+  visibility: hidden;
 }
 .bk-button:hover {
   border-color: var(--button-default-hover-border-color);
@@ -298,40 +354,38 @@
   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;
-  font-size: var(--font-size-medium);
+  padding: 0;
   font-size: inherit;
-  line-height: 1;
   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;
+  font-size: var(--font-size-base);
 }
 .bk-button-group.bk-button-group-large .bk-button {
-  min-width: 74px;
   height: 38px;
-  padding: 0 20px;
+  padding: 8px 20px;
+  font-size: var(--font-size-large);
 }
 .bk-button-group .bk-button {
   height: 32px;
-  min-width: 64px;
   margin: 0 0 0 -1px;
   border-radius: 0;
 }
@@ -340,6 +394,9 @@
   background-color: var(--white-color);
   border-color: var(--light-gray);
 }
+.bk-button-group .bk-button.is-disabled {
+  color: var(--light-gray);
+}
 .bk-button-group .bk-button:first-child {
   border-radius: 2px 0 0 2px;
 }
@@ -357,3 +414,9 @@
   background-color: var(--white-color);
   border-color: var(--primary-color);
 }
+.bk-button-group .bk-button.is-selected:not(.is-disabled) {
+  background-color: var(--button-selected-bg-color);
+}
+.bk-button-group .bk-button.is-selected.is-disabled {
+  background-color: var(--button-disabled-selected-bg-color);
+}