diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index b3fd86a56..6d820e1cd 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -130,7 +130,7 @@ li{ font-size: 12px; } .nz-btn-size-large { - padding: 7px 15px; + padding: 6px 15px; } .nz-btn.nz-btn-size-normal.nz-btn-size-alien { //弹框顶部异形按钮 height: 40px; @@ -185,6 +185,10 @@ li{ border-color: #e5e5e5 ; cursor: default; } +.nz-btn-group { + border-radius: 4px; + display: inline-block; +} .nz-btn-group .nz-btn:first-child:not(:last-child) { border-bottom-right-radius: 0; border-top-right-radius: 0; @@ -193,6 +197,19 @@ li{ border-bottom-left-radius: 0; border-top-left-radius: 0; } +.nz-btn-group .nz-btn:not(:first-child):not(:last-child) { + border-radius: 0; +} +.nz-btn-group .nz-btn { + box-shadow: none; + vertical-align: top; +} +.nz-btn-group .nz-btn:not(:last-of-type) { + border-right: 1px solid rgba(162,162,162,0.50); +} +.nz-btn-group.nz-btn-group-light { + box-shadow: $btn-normal-shadow; +} /* end--按钮组件*/ /*table提示样式*/ diff --git a/nezha-fronted/src/components/charts/chart-table.scss b/nezha-fronted/src/components/charts/chart-table.scss index fd26aa1a5..63946151d 100644 --- a/nezha-fronted/src/components/charts/chart-table.scss +++ b/nezha-fronted/src/components/charts/chart-table.scss @@ -27,11 +27,11 @@ clear: both; } .edit { - // position: absolute; - // right: 40px; - // top: 5px; - // z-index: 10; - background: $btn-light-background-color; + position: absolute; + right: 20px; + top: 17px; + z-index: 10; + /*background: $btn-light-background-color; border-radius: 6px;; border: 1px solid #ccc; .set-icon { @@ -61,7 +61,7 @@ cursor: pointer; float: right; font-size: 14px; - } + }*/ } .chart-select { position: absolute; diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index a1c98e893..92a9c3bd4 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -4,12 +4,17 @@