diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index 50b393135..11deb373c 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -81,6 +81,12 @@ html { -webkit-appearance: none; white-space: nowrap; } +.nz-btn.nz-btn-size-normal {} /* size默认normal,是normal时这个class可不写*/ +.nz-btn.nz-btn-size-small { + font-size: 12px; + line-height: 18px; + padding: 2px 12px; +} .nz-btn.nz-btn-style-normal { background-color: #16b; background-image: linear-gradient(#2d8cec, #16b); @@ -89,11 +95,37 @@ html { color: #fff; text-shadow: 0 1px 1px rgba(0,0,0,.75); } +.nz-btn.nz-btn-style-light { + background-color: #dedede; + background-image: linear-gradient(white,#dedede); + border: 1px solid #b8b8b8; + border-top-color: #dedede; + color: #444; + text-shadow: 0 1px 1px rgba(255,255,255,.75); +} +.nz-btn.nz-btn-style-light:hover:not(.nz-btn-disabled) { + background-image: linear-gradient(#dedede,#c5c5c5); +} .nz-btn.nz-btn-style-normal:hover:not(.nz-btn-disabled) { background-image: linear-gradient(#16b, #0d4d8c); } .nz-btn:focus { outline: 0; +} +.nz-btn.nz-btn-disabled { + background-image: none; + background-color: #666; + color: white; + text-shadow: none; + border-color: #999; +} +.nz-btn-group .nz-btn:first-child:not(:last-child) { + border-bottom-right-radius: 0; + border-top-right-radius: 0; +} +.nz-btn-group .nz-btn:last-child:not(:first-child) { + border-bottom-left-radius: 0; + border-top-left-radius: 0; } /* end--按钮组件*/ /* end--通用*/ @@ -144,49 +176,40 @@ html { .top-tools { padding: 22px 0 13px 0; } -.top-tools .el-button--mini { - padding-top: 6px; - padding-bottom: 6px; -} -.top-tools .top-tool { - float: left; -} -.top-tools .top-tool-right { - float: right; -} .top-tools .top-tool-search { width: 320px; -} -.top-tools .el-button-group { - float: left; -} -.top-tools .top-tool-btn { - border-radius: 5px; - width: 100px; -} -.top-tools .top-tool-btn:focus, .top-tools .top-tool-btn:hover { - color: #606266; - background-color: white; -} -.top-tools .top-tool-btn-active { - color: white; - border: 1px solid #656565; - background-color: #656565; -} -.top-tools .top-tool-btn-active:focus, .top-tools .top-tool-btn-active:hover { - color: white; - background-color: #656565; - border: 1px solid #656565; -} -.top-tools .top-tool-btn-txt { - font-size: 14px; } /* end--顶部工具栏*/ /* start--内容*/ .content-right>.el-table{ - border-radius: 4px; - border: 1px solid #D7D7D7; + border: 1px solid #d4d4d4; + border-left: none; + border-right: none; margin-top: 30px; + border-bottom: none; +} +.content-right .el-table::before { + height: 0; +} +.content-right .el-table--border::after, .el-table--group::after { + width: 0; +} +.content-right .el-table__header { + line-height: 40px; + text-shadow: 1px 1px white; +} +.content-right .el-table .el-table__header th { + background-image: linear-gradient(#eee,#e0e0e0); + color: #444444; + border-right: 1px solid #d4d4d4; + border-left: 1px solid white; + border-bottom: 1px solid #d4d4d4;; +} +.content-right .el-table--border td, .el-table--border th, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed { + border-right: none; +} +.content-right .el-table td { + padding: 4px 0; } /* end--内容*/ /* start--分页*/ diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index fff7fb778..d37a91dfe 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -2,7 +2,7 @@