bri-components 1.1.5 → 1.1.6

package/src/styles/components/small/BriButton.less

@@ -100,11 +100,15 @@
  }
 .ivu-btn-linkText {
     color: @themeColor;
+    padding: 0px;
+    height: @textHeight;
     &:hover {
         background-color: transparent;
+        color: @theme-hover;
     }
     &:active {
         background-color: transparent;
+        color: @theme-active;
     }
     &[disabled] {
         color: @theme-disabled;
@@ -152,6 +156,7 @@
         }
     }
 }
+
 .ivu-btn-default, .ivu-btn-dashed {
     color: @textColor;
     border-color: @btnCancelBg;
@@ -176,6 +181,33 @@
         }
     }
 }
+
+.ivu-btn-primaryLine {
+    color: @themeColor;
+    border-color: @themeColor;
+    background-color: #fff;
+    &:hover {
+        background-color: #fff;
+        border-color: @btnBgclick;
+        color: @btnBgHover;
+    }
+    &:active {
+        background-color: #fff;
+        border-color: @btnBgclick;
+        color: @btnBgclick;
+    }
+    &[disabled] {
+        background-color: #fff;
+        border-color: @btnBgDisabled;
+        color: @btnBgDisabled;
+        &:hover, &:active {
+            background-color: #fff;
+            border-color: @btnBgDisabled;
+            color: @btnBgDisabled;
+        }
+    }
+}
+
 .ivu-btn-errorLine {
     color: @btnWarningBg;
     border-color: @btnWarningBg;
@@ -190,11 +222,11 @@
         color: @btnWarningBgClick;
     }
     &[disabled] {
-        background-color: @btnCancelBg;
+        background-color: #fff;
         border-color: @btnWarningBgDisabled;
         color: @btnWarningBgDisabled;
         &:hover, &:active {
-            background-color: @btnCancelBg;
+            background-color: #fff;
             border-color: @btnWarningBgDisabled;
             color: @btnWarningBgDisabled;
         }

package/src/styles/components/unit/DshFormItem.less

@@ -20,11 +20,10 @@
     }
 
     &-label {
-        padding: 5px 0px 5px;
         min-width: 0px;
+        padding: 5px 0px 5px;
         line-height: 20px;
         font-size: @smallSize;
-        margin-bottom: 3px;
         display: flex;
         align-items: center;
 

package/src/styles/components/controls/DshCascader.less

@@ -1,95 +0,0 @@
-.DshCascader {
-    width: 100%;
-
-    #input-content () {
-        .hasdata {
-            width: 100%;
-            height: 100%;
-            padding: 2px 8px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            .bri-scrollbar3();
-            overflow-y: hidden;
-
-            .DshTags {
-                display: flex;
-                white-space: nowrap;
-            }
-        }
-
-        &-nodata {
-            display: inline-block;
-            padding: 2px 8px;
-            color: @placeholderColor;
-        }
-    }
-
-    &-multiple {
-        width: 100%;
-
-        &-input {
-            #input-content();
-        }
-    }
-
-    &-custom {
-        &-input {
-            #input-content();            
-                
-            .hasdata {
-                &-text {
-                    .dsh-ellipsis();
-                }
-                
-                &-clear {
-                    margin-left: 5px;
-                }
-            }
-        }
-    }
-    
-    &-single {
-        width: 100%;
-    }
-    
-    &-show {
-        #input-content();
-
-        .hasdata {
-            &-multiple {}
-            
-            &-single {
-                .dsh-ellipsis();
-            }
-        }
-    }
-
-    &-multiplerow {
-        height: 70px;
-
-        .hasdata {
-            overflow-y: auto;
-
-            .DshTags {
-                flex-wrap: wrap;
-            }
-        }
-    }
-}
-
-.ivu-cascader {
-    &-label {
-        padding-right: 24px;
-    }
-
-    &-transfer {
-        max-height: 400px !important;
-
-        .ivu-cascader-menu {
-            max-height: 400px;
-            height: auto;
-            max-width: 300px;
-        }
-    }
-}