Browse Source

tabs样式调整

zhuth 6 years ago
parent
commit
b6805bccd7

+ 26 - 1
src/components/admin/admin.less

@@ -1,4 +1,4 @@
-.admin-tabs {
+.ant-tabs.admin-tabs {
     height: 100%;
     padding: 12px;
     display: flex;
@@ -9,21 +9,46 @@
         border: none;
         margin: 0 0 12px 0;
         &> .ant-tabs-nav-container {
+            height: 32px;
             .ant-tabs-nav-wrap {
                 .ant-tabs-tab {
+                    height: 32px;
+                    line-height: 32px;
                     color: @tab-color;
                     background: @tab-background;
                     border-color: @tab-background-active;
                     border-radius: 0;
+                    border-left-width: 0;
                     border-right-width: 0;
                     margin: 0;
                     text-align: center;
+                    &:after {
+                        content: ' ';
+                        width: 1px;
+                        height: 50%;
+                        position: absolute;
+                        border-right: 1px solid #2C82BE;
+                        margin-left: 16px;
+                        margin-top: 10%;
+                        z-index: 1;
+                    }
                     &.ant-tabs-tab-active {
                         color: @tab-color-active;
                         background: @tab-background-active;
+                        &:after {
+                            content: none;
+                        }
+                    }
+                    &:first-child {
+                        border-radius: @border-radius-base 0 0 @border-radius-base;
+                        border-left-width: 1px;
                     }
                     &:last-child {
+                        border-radius: 0 @border-radius-base @border-radius-base 0;
                         border-right-width: 1px;
+                        &:after {
+                            content: none;
+                        }
                     }
                 }
             }

+ 25 - 0
src/components/authority/index.less

@@ -12,21 +12,46 @@
                 border: none;
                 margin: 0 0 12px 0;
                 &> .ant-tabs-nav-container {
+                    height: 32px;
                     .ant-tabs-nav-wrap {
                         .ant-tabs-tab {
+                            height: 32px;
+                            line-height: 32px;
                             color: @tab-color;
                             background: @tab-background;
                             border-color: @tab-background-active;
                             border-radius: 0;
+                            border-left-width: 0;
                             border-right-width: 0;
                             margin: 0;
                             text-align: center;
+                            &:after {
+                                content: ' ';
+                                width: 1px;
+                                height: 50%;
+                                position: absolute;
+                                border-right: 1px solid #2C82BE;
+                                margin-left: 16px;
+                                margin-top: 10%;
+                                z-index: 1;
+                            }
                             &.ant-tabs-tab-active {
                                 color: @tab-color-active;
                                 background: @tab-background-active;
+                                &:after {
+                                    content: none;
+                                }
+                            }
+                            &:first-child {
+                                border-radius: @border-radius-base 0 0 @border-radius-base;
+                                border-left-width: 1px;
                             }
                             &:last-child {
+                                border-radius: 0 @border-radius-base @border-radius-base 0;
                                 border-right-width: 1px;
+                                &:after {
+                                    content: none;
+                                }
                             }
                         }
                     }

+ 7 - 4
src/components/dataSourceDetail/content.less

@@ -5,14 +5,17 @@
         background: @content-background-color;
         &>.ant-tabs {
             height: 100%;
-            padding-top: 40px;
+            padding-top: 32px;
             overflow: visible;
             &> .ant-tabs-bar {
                 border: none;
-                margin: -40px 0 12px 0;
+                margin: -32px 0 12px 0;
                 &> .ant-tabs-nav-container {
+                    height: 32px;
                     .ant-tabs-nav-wrap {
                         .ant-tabs-tab {
+                            height: 32px;
+                            line-height: 32px;
                             color: @tab-color;
                             background: @tab-background;
                             border-color: @tab-background-active;
@@ -39,11 +42,11 @@
                                 }
                             }
                             &:first-child {
-                                border-radius: 2px 0 0 2px;
+                                border-radius: @border-radius-base 0 0 @border-radius-base;
                                 border-left-width: 1px;
                             }
                             &:last-child {
-                                border-radius: 0 2px 2px 0;
+                                border-radius: 0 @border-radius-base @border-radius-base 0;
                                 border-right-width: 1px;
                                 &:after {
                                     content: none;

+ 1 - 1
src/constants/url.js

@@ -1,6 +1,6 @@
 // const BASE_URL = 'http://10.1.1.168:8081/BI/';
 // const BASE_URL = 'http://10.1.81.2:24000/BI_DEV/';
-// const BASE_URL = 'http://10.1.80.78:8012/BI_DEV/';
+// const BASE_URL = 'http://10.1.80.78:8011/BI/';
 const BASE_URL = ''
 
 /**后台接口地址 */