Merge branch 'refs/heads/develop'

# Conflicts:
#	auto-solution-rule/src/main/java/com/solution/rule/service/FireRuleService.java
#	modeler/src/style.less

modeler/src/style.less

@@ -1204,7 +1204,7 @@
   .ant-tabs-content {
     //padding: 15px;
     padding: 4px;
-    background: #041832;
+    background: #041b36db;
   }
 
   &.settings-tab,
@@ -1641,190 +1641,4 @@
     color: #b5b39d;
     cursor: pointer;
   }
-}
-
-.ant-input-group-addon {
-  .anticon{
-    color: #eeeeee;
-  }
-}
-
-
-.ant-switch {
-  background: rgb(8 30 59);
-}
-
-
-.ks-algorithm-card {
-  .ant-card-head-title {
-    span.text {
-      display: block;
-      line-height: 30px;
-    }
-  }
-}
-
-.ks-sidebar-header {
-  line-height: 40px;
-  background: #081d36;
-  min-height: 40px;
-  background: url(@/assets/icons/card-head.png) left / 180% 100%;
-  padding: 0 10px;
-
-  .ks-sidebar-title {
-    color: #7ae8fc;
-    font-size: 16px;
-    .icon {
-      background: url(@/assets/icons/list.png) center / 100% 100%;
-      width: 25px;
-      height: 25px;
-      display: block;
-      margin-top: 7px;
-    }
-    .text{
-      margin-left: 40px;
-      font-size: 16px;
-      color: #eee;
-    }
-  }
-
-  .ks-sidebar-add {
-    position: absolute;
-    right: 7px;
-    top: 8px;
-    font-size: 12px;
-
-    .anticon {
-      display: block;
-      float: left;
-      line-height: 16px;
-    }
-  }
-}
-
-.ant-list {
-  &.ks-sidebar-list {
-    .ant-list-item {
-      cursor: pointer;
-      transition: all 0.5s;
-      border-left: 2px solid transparent;
-      position: relative;
-
-      &.selected,
-      &:hover {
-        background: #0a1b3c;
-        border-left: 2px solid #11377e;
-      }
-    }
-
-    .ks-sidebar-list-type {
-      position: absolute;
-      right: 10px;
-
-      .ant-badge {
-        .ant-badge-count {
-          color: #c3c2c2;
-          background: #333f7d;
-          box-shadow: 0 0 0 1px #325478;
-        }
-      }
-    }
-
-    .ant-list-item-meta {
-      .ant-list-item-meta-title {
-        color: #7ae8fc;
-      }
-
-      .ant-list-item-meta-description {
-        color: #4d8c98;
-        font-size: 13px;
-      }
-    }
-  }
-}
-
-.ks-sidebar-list-param-list {
-  padding: 15px;
-  border: 1px solid #475f71;
-  border-radius: 2px;
-
-  .ks-sidebar-list-param-item {
-    margin-bottom: 15px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-}
-
-
-.ks-sidebar-list-param-actions {
-  .anticon {
-    color: #7ae8fc;
-    font-size: 20px;
-    display: block;
-    line-height: 26px;
-    cursor: pointer;
-  }
-}
-
-
-
-.ant-collapse {
-  .ant-list-sm {
-    .ant-list-item {
-      padding: 4px 15px;
-      cursor: pointer;
-      color: rgb(130 196 233);
-      position: relative;
-
-      .ks-tree-actions {
-        position: absolute;
-        right: 10px;
-        display: none;
-      }
-
-      &:hover {
-        background: #0d2d4e;
-
-        .ks-tree-actions {
-          display: block;
-        }
-      }
-
-    }
-  }
-
-  &.ks-trees-collapse {
-
-    .ant-collapse-content-box {
-      padding: 0;
-      height: 40vh;
-      position: relative;
-    }
-  }
-}
-
-.create-tree-icon {
-  cursor: pointer;
-}
-
-.ant-list-item {
-  padding: 3px 5px;
-  cursor: pointer;
-  color: rgb(130 196 233);
-
-  &:hover {
-    background: #0d2d4e;
-  }
-}
-
-.ks-model-builder-body .ks-model-builder-left .ant-collapse {
-  &.platform-collapse{
-    .ant-collapse-content-box{
-      max-height: 45.5vh;
-    }
-  }
-
 }