Commit e5678ff63f5ffcea914c1cfecbea37984634a891
Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main
Showing
2 changed files
with
50 additions
and
27 deletions
src/default.less
| ... | ... | @@ -737,34 +737,36 @@ tbody { |
| 737 | 737 | // end |
| 738 | 738 | // tab样式与老版本统一 |
| 739 | 739 | .ant-tabs-content-holder { |
| 740 | - .ant-tabs-nav-wrap { | |
| 741 | - background: #fff; | |
| 742 | - | |
| 743 | - .ant-tabs-nav-list { | |
| 740 | + .ant-tabs:not(.noXlyTabs) { | |
| 741 | + .ant-tabs-nav-wrap { | |
| 744 | 742 | background: #fff; |
| 745 | - | |
| 746 | - .ant-tabs-tab { | |
| 747 | - border: 1px solid #d9d9d9; | |
| 748 | - border-right: 0; | |
| 749 | - padding: 0 18px; | |
| 750 | - height: 30px; | |
| 751 | - line-height: 30px; | |
| 752 | - margin-left: 0; | |
| 753 | - background: #fafafa; | |
| 754 | - | |
| 755 | - &:nth-last-child(2) { | |
| 756 | - border-right: 1px solid #d9d9d9; | |
| 757 | - } | |
| 758 | - } | |
| 759 | - | |
| 760 | - .ant-tabs-tab-active { | |
| 761 | - border-bottom: 1px solid transparent; | |
| 743 | + | |
| 744 | + .ant-tabs-nav-list { | |
| 762 | 745 | background: #fff; |
| 763 | - } | |
| 764 | - | |
| 765 | - .ant-tabs-ink-bar { | |
| 766 | - top: 0; | |
| 767 | - bottom: unset; | |
| 746 | + | |
| 747 | + .ant-tabs-tab { | |
| 748 | + border: 1px solid #d9d9d9; | |
| 749 | + border-right: 0; | |
| 750 | + padding: 0 18px; | |
| 751 | + height: 30px; | |
| 752 | + line-height: 30px; | |
| 753 | + margin-left: 0; | |
| 754 | + background: #fafafa; | |
| 755 | + | |
| 756 | + &:nth-last-of-type(2) { | |
| 757 | + border-right: 1px solid #d9d9d9; | |
| 758 | + } | |
| 759 | + } | |
| 760 | + | |
| 761 | + .ant-tabs-tab-active { | |
| 762 | + border-bottom: 1px solid transparent; | |
| 763 | + background: #fff; | |
| 764 | + } | |
| 765 | + | |
| 766 | + .ant-tabs-ink-bar { | |
| 767 | + top: 0; | |
| 768 | + bottom: unset; | |
| 769 | + } | |
| 768 | 770 | } |
| 769 | 771 | } |
| 770 | 772 | } | ... | ... |
src/global.less
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | border-bottom: 1px solid #d9d9d9; |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | -.ant-table .ant-table-thead>tr>th { | |
| 10 | +#kpiTable .ant-table-thead>tr>th { | |
| 11 | 11 | background: #e6e6e6; |
| 12 | 12 | } |
| 13 | 13 | |
| ... | ... | @@ -31,4 +31,25 @@ |
| 31 | 31 | |
| 32 | 32 | .ant-table.ant-table-bordered>.ant-table-container>.ant-table-body>table>tbody>tr>td { |
| 33 | 33 | border-right: 1px solid #d9d9d9 !important; |
| 34 | +} | |
| 35 | + | |
| 36 | +.ant-tabs-card:not(.noXlyTabs)>.ant-tabs-nav .ant-tabs-ink-bar { | |
| 37 | + visibility: visible; | |
| 38 | +} | |
| 39 | + | |
| 40 | +.ant-tabs-card:not(.noXlyTabs).ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab { | |
| 41 | + margin-left: 0; | |
| 42 | +} | |
| 43 | + | |
| 44 | +.ant-tabs-card>.ant-tabs-nav .ant-tabs-tab, | |
| 45 | +.ant-tabs>.ant-tabs-nav .ant-tabs-nav-add, | |
| 46 | +.ant-tabs>div>.ant-tabs-nav .ant-tabs-nav-add, | |
| 47 | +.ant-tabs-top>.ant-tabs-nav::before { | |
| 48 | + border-color: #d9d9d9; | |
| 49 | +} | |
| 50 | + | |
| 51 | +.operate-bar>a>span[role="img"] { | |
| 52 | + display: block; | |
| 53 | + width: 100%; | |
| 54 | + height: 100%; | |
| 34 | 55 | } |
| 35 | 56 | \ No newline at end of file | ... | ... |