merge

web-react/src/assets/style/lib/anchor.less

@@ -9,3 +9,6 @@
   border-radius: 0;
   background-color: @primary-color;
 }
+.ant-anchor-link-active {
+  background: linear-gradient(90deg, #fff, transparent);
+}

web-react/src/assets/style/lib/disabled.less

@@ -21,6 +21,29 @@
   box-shadow: @btn-primary-shadow;
   text-shadow: @btn-text-shadow;
 }
+.ant-btn-danger-disabled,
+.ant-btn-danger.disabled,
+.ant-btn-danger[disabled],
+.ant-btn-danger-disabled:hover,
+.ant-btn-danger.disabled:hover,
+.ant-btn-danger[disabled]:hover,
+.ant-btn-danger-disabled:focus,
+.ant-btn-danger.disabled:focus,
+.ant-btn-danger[disabled]:focus,
+.ant-btn-danger-disabled:active,
+.ant-btn-danger.disabled:active,
+.ant-btn-danger[disabled]:active,
+.ant-btn-danger-disabled.active,
+.ant-btn-danger.disabled.active,
+.ant-btn-danger[disabled].active {
+  opacity: .5;
+  color: @btn-danger-color;
+  border-color: @btn-danger-border;
+  background-color: @btn-danger-bg;
+  box-shadow: @btn-primary-shadow;
+  text-shadow: @btn-text-shadow;
+}
+.ant-radio-button-wrapper-disabled,
 .ant-radio-button-wrapper-disabled:first-child,
 .ant-radio-button-wrapper-disabled:hover {
   opacity: .5;

web-react/src/assets/style/lib/form-page.less

@@ -12,8 +12,9 @@
     height: 100%;
 
     >.ant-tabs {
-      >.ant-tabs-bar {
+      >.ant-tabs-nav {
         margin-bottom: 0;
+        padding: 0 @padding-md;
 
         background-color: @white;
 

web-react/src/assets/style/lib/form.less

@@ -333,6 +333,9 @@
       margin-bottom: @padding-xs;
 
       border-left: @border-width-base @border-style-base @normal-color;
+      &.ant-radio-button-wrapper-checked {
+        border-left-color: @primary-color;
+      }
       &:not(:first-child) {
         &::before {
           content: none;

web-react/src/assets/style/lib/table.less

@@ -1,7 +1,12 @@
 @import (reference) '../extend.less';
 
 .yo-query-bar {
-    margin-bottom: @padding-md;
+  margin-bottom: @padding-xs;
+  .ant-form-inline {
+    .ant-form-item {
+      margin-bottom: @padding-xs;
+    }
+  }
 }
 
 .yo-action-bar {
@@ -69,6 +74,10 @@
     }
 }
 
+.ant-table-sticky-scroll {
+  display: none;
+}
+
 .yo-table {
     .ant-table {
         margin: 0 !important;
@@ -146,11 +155,15 @@
         }
     }
 
-    .ant-table-bordered {
-        > .ant-table-container {
-            border-top: @border-width-base @border-style-base @table-border-color;
-        }
+  .ant-table-bordered {
+    >.ant-table-container {
+      border-top: @border-width-base @border-style-base @table-border-color;
     }
+  }
+
+  &--row-no {
+    background-color: @table-header-bg;
+  }
 }
 
 .yo-table-actions {

web-react/src/assets/style/lib/width-height.less

@@ -3,13 +3,30 @@
 .width-height (@i) when (@i <=20) {
 
   @n : @i * 50;
+  @px : @n * 1px;
 
   .w-@{n} {
-    width: @n * 1px !important;
+    width: @px !important;
+  }
+
+  .w-@{n}-min {
+    min-width: @px !important;
+  }
+
+  .w-@{n}-max {
+    max-width: @px !important;
   }
 
   .h-@{n} {
-    height: @n * 1px !important;
+    height: @px !important;
+  }
+
+  .h-@{n}-min {
+    min-height: @px !important;
+  }
+
+  .h-@{n}-max {
+    max-height: @px !important;
   }
 
   .w-@{n}-p {

web-react/src/assets/style/main.less

@@ -17,14 +17,73 @@
 
     width: 100%;
     height: 100%;
+
+    background-color: @layout-header-background;
     >.ant-spin-nested-loading {
       height: 100%;
       >div>.ant-spin {
         max-height: none;
+        @-webkit-keyframes borderScale {
+          0% {
+            border: 5px solid white;
+          }
+          50% {
+            border: 25px solid transparent;
+          }
+          100% {
+            border: 5px solid white;
+          }
+        }
+        @keyframes borderScale {
+          0% {
+            border: 5px solid white;
+          }
+          50% {
+            border: 25px solid transparent;
+          }
+          100% {
+            border: 5px solid white;
+          }
+        }
+        .loader-container {
+          position: absolute;
+          top: 50%;
+          left: 50%;
+
+          box-sizing: content-box;
+          width: 200px;
+          height: 200px;
+          margin: 0 auto;
+          margin-right: -50%;
+
+          transform: translate(-50%, -50%);
+          -webkit-animation: borderScale 1s infinite ease-in-out;
+                  animation: borderScale 1s infinite ease-in-out;
+
+          color: white;
+          border: 5px solid transparent;
+          border-radius: 50%;
+          >p {
+            font-family: 'Raleway', sans-serif;
+            font-size: 2em;
+            font-weight: bold;
+
+            position: absolute;
+            top: 50%;
+            left: 50%;
+
+            margin-right: -50%;
+
+            transform: translate(-50%, -50%);
+          }
+        }
       }
       >.ant-spin-container {
         width: 100%;
         height: 100%;
+        &.ant-spin-blur {
+          opacity: 0;
+        }
       }
     }
   }
@@ -104,49 +163,6 @@
         &--avatar {
           box-shadow: 0 0 0 2px @white;
         }
-        &--name {
-          font-weight: bolder;
-
-          position: absolute;
-          left: 32px + @padding-sm * 2;
-
-          transition: @animation-duration-slow;
-
-          opacity: 0;
-        }
-        &--dropdown {
-          width: 200px;
-
-          transition: @animation-duration-base;
-          transform: scaleY(0);
-          transform-origin: top;
-
-          opacity: 0;
-          .ant-dropdown-menu {
-            box-shadow: none;
-          }
-        }
-      }
-      &.open {
-        width: 200px;
-        .user-container-inner {
-          background-color: @white;
-          box-shadow: @box-shadow-base;
-        }
-        .user {
-          &--name {
-            opacity: 1;
-          }
-        }
-      }
-      &.drop {
-        .user {
-          &--dropdown {
-            transform: scaleY(1);
-
-            opacity: 1;
-          }
-        }
       }
     }
   }
@@ -485,7 +501,6 @@
     flex-direction: column;
 
     width: 100%;
-    min-width: @container-width;
     height: 100%;
 
     @layout-header-height: 54px;
@@ -593,3 +608,13 @@
     }
   }
 }
+.yo-user-popover {
+  width: 280px;
+  padding-top: 0;
+  .ant-popover-arrow {
+    display: none;
+  }
+  .ant-popover-inner-content {
+    padding: 0;
+  }
+}