Merge branches 'gva_gormv2_dev' and 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

2020-11-28 10:10:48 +08:00
parent f936029d59 cc295fad32
commit 9098eaf22e
131 changed files with 9264 additions and 222 deletions
@@ -1188,8 +1188,8 @@ li {
    font-size: 13px;
 }

-.table-button {
-    margin-right: 8px !important;
+.table-button+span {
+    margin-left: 10px !important;
 }

 $headerHigh: 52px;
@@ -1521,4 +1521,4 @@ $mainHight: 100vh;

 ::-webkit-scrollbar-thumb:hover {
    background-color: #bbb;
-}
+}