Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/core/chart/ChartBase.scss

@@ -20,7 +20,7 @@
                     width: 5px;
                     height: 16px;
                     border-radius: 4px;
-                    background: #2c82be;
+                    background: #33B4EE;
                     left: 4px;
                     top: 1px;
                 }

frontend/saas-web/app/view/home/charts/KeyData.scss

@@ -12,43 +12,48 @@
             width: calc(50% - 9px);
             background: #fff;
             cursor: pointer;
-            transition: all 0.4s ease;
+            transition: all 0.3s ease;
             outline: none !important;
 
+            // &:hover {
+            //     box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+            //     transform: translate3d(0, -2px, 0);
+            // }
+
             &:nth-child(1) {
                 margin: 0 8px 8px 0;
 
-                // &:hover {
-                //     margin: 2px 8px 14px 0;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(2px, 2px, 0);
+                }
             }
 
             &:nth-child(2) {
                 margin: 0 0 8px 8px;
 
-                // &:hover {
-                //     margin: 2px 0 14px 8px;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(-2px, 2px, 0);
+                }
             }
 
             &:nth-child(3) {
                 margin: 8px 8px 0 0;
 
-                // &:hover {
-                //     margin: 2px 8px 14px 0;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(2px, -2px, 0);
+                }
             }
 
             &:nth-child(4) {
                 margin: 8px 0 0 8px;
 
-                // &:hover {
-                //     margin: 2px 0 14px 8px;
-                //     box-shadow: 0 2px 2px 2px rgba(0, 0, 0, 0.12);
-                // }
+                &:hover {
+                    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+                    transform: translate3d(-2px, -2px, 0);
+                }
             }
 
             .x-box-content {
@@ -68,6 +73,7 @@
                 .x-contain {
                     border-style: solid;
                     border-width: 0 1px 1px 1px;
+                    border-radius: 0 0 4px 4px;
                     height: 100%;
 
                     .x-icon {

frontend/saas-web/app/view/main/Navigation.scss

@@ -107,7 +107,7 @@ $menu-body-background-color: #65678C;
 
 .x-nav-menu {
     border: none;
-    border-radius: 0 4px 4px 0;
+    border-radius: 0 2px 2px 0;
 }
 
 .x-navitem-menu {
@@ -143,14 +143,6 @@ $menu-body-background-color: #65678C;
                 }
                 .menu-content {
                     border-left: 1px solid #A4ABBC;
-                    // &:before {
-                    //     content: '';
-                    //     position: absolute;
-                    //     width: 2px;
-                    //     height: 22px;
-                    //     margin-left: -2px;
-                    //     background: $menu-body-background-color;
-                    // }
                     &:after {
                         content: '';
                         position: absolute;
@@ -202,11 +194,11 @@ $menu-body-background-color: #65678C;
 
                     .item-icon {
                         cursor: pointer;
-                        background: #64b448;
+                        background: #33B4EE;
                         color: #fff;
                         display: none;
                         padding: 3px 6px;
-                        // border-radius: 3px;
+                        border-radius: 2px;
                         margin-right: 5px;
                         height: 24px;
                         margin-top: 5px;
@@ -217,17 +209,17 @@ $menu-body-background-color: #65678C;
                     }
 
                     &:hover {
-                        // border-radius: 4px;
+                        border-radius: 2px;
                         background-color: #595B7E;
 
-                        &:before {
-                            content: ' ';
-                            position: absolute;
-                            width: 6px;
-                            height: 34px;
-                            background: #34baf6;
-                            margin-left: -25px;
-                        }
+                        // &:before {
+                        //     content: ' ';
+                        //     position: absolute;
+                        //     width: 6px;
+                        //     height: 34px;
+                        //     background: #34baf6;
+                        //     margin-left: -25px;
+                        // }
 
                         .item-icon {
                             display: block;