From 811fc5e4e89c9a5222e895587bfa1c2e9fcc08f4 Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期一, 15 三月 2021 19:37:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/assets/css/map/map-panel-style.less | 219 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 137 insertions(+), 82 deletions(-) diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less index 5faaab9..7827c9f 100644 --- a/src/assets/css/map/map-panel-style.less +++ b/src/assets/css/map/map-panel-style.less @@ -1,120 +1,146 @@ @import "_map-variable"; -.el-button--primary{ - color: @color; - background-color: @background-color; - border-color: @color; + +.el-button--primary { + color: @color; + background-color: @background-color; + border-color: @color; } -.el-tabs{ - .el-tabs__item{ - padding: 0 10px; - text-align: center; - height: 20px; - line-height: 20px; +.el-tabs { + .el-tabs__item { + padding: 0 10px; + text-align: center; + height: 20px; + line-height: 20px; - color: #00fff6; - cursor: pointer; - -ms-flex-negative: 0; - flex-shrink: 0; + color: @color; + cursor: pointer; + -ms-flex-negative: 0; + flex-shrink: 0; } } -.el-tabs__header{ + +.el-tabs__header { font-size: .08333rem; line-height: .10938rem; - background: rgba(0,255,246,.14); + + background: rgba(0, 255, 246, .14); + + // background: rgba(0,255,246,.14); } -.el-dialog{ + +.el-dialog { border: 0.00521rem solid @color; box-shadow: 0 0 0.03rem @color; background: rgba(0, 16, 30, 0.8); border-radius: 0.05208rem; - .el-dialog__title{ + .el-dialog__title { padding: .03125rem .08333rem; color: @color; cursor: pointer; flex-shrink: 0; } } + .select-down { - border: none !important; - background-color: @background-color ; + border: none !important; + background-color: @background-color; - //.el-scrollbar{ - // - // background-color: @background-color !important; - // } - // .el-scrollbar__view .el-select-dropdown__list{ - // background-color: @background-color !important; - // } - .el-select-dropdown__item.hover{ - background-color: @background-color-light; - } - .el-select-dropdown__item { - color: @color; - //background-color: @background-color; - } - // .el-select-dropdown{ - // border: none !important; - // background-color: @background-color !important; - // } - // .el-select-dropdown__empty{ - // color: @color; - // background-color: @background-color; - // } - .popper__arrow::after{ - border-bottom-color: @color ; - } -} + //.el-scrollbar{ + // + // background-color: @background-color !important; + // } + // .el-scrollbar__view .el-select-dropdown__list{ + // background-color: @background-color !important; + // } + .el-select-dropdown__item.hover { + background-color: @background-color-light; + } -.el-table{ - color: #00fff6; -} -.el-table th, .el-table tr{ - background: transparent; -} -.el-table thead { - color: #ffffff; - font-weight: 500; -} -.el-table, .el-table__expanded-cell { - background-color: transparent; -} -.el-table thead.is-group th{ - background-color: transparent; -} -.map-input{ - input{ - border-radius: 0; - background-color: @background-color-light ; - border: solid 1px @color ; + .el-select-dropdown__item { + color: @color; + //background-color: @background-color; + } + + // .el-select-dropdown{ + // border: none !important; + // background-color: @background-color !important; + // } + // .el-select-dropdown__empty{ + // color: @color; + // background-color: @background-color; + // } + .popper__arrow::after { + border-bottom-color: @color; } } -.map-tooltip.is-dark{ - font-size: .08333rem ; - color: @color-highlight ; - background: @background-color ; +.el-tabs { + .el-tabs__item { + height: 40px; + line-height: 40px; + } +} + +.el-table th, .el-table tr { + background-color: transparent; +} + +.el-table { + color: @color; + background: transparent; + + thead { + color: #ffffff; + font-weight: 500; + } + + thead.is-group th { + background: transparent; + } + + .el-table__expanded-cell { + background: transparent; + } +} + +.map-input { + input { + border-radius: 0; + background-color: @background-color-light; + border: solid 1px @color; + } +} + +.map-tooltip.is-dark { + font-size: .08333rem; + color: @color-highlight; + background: @background-color; border-radius: .03rem; - padding: .05rem ; + padding: .05rem; } -.map-btn-unactive{ - color: @color ; - border: .00521rem solid @color ; - box-shadow: 0 0 .03rem @color ; + +.map-btn-unactive { + color: @color; + border: .00521rem solid @color; + box-shadow: 0 0 .03rem @color; } -.map-btn-active{ - color: @color-highlight ; - border: .00521rem solid @color-highlight ; - box-shadow: 0 0 .03rem @color-highlight ; + +.map-btn-active { + color: @color-highlight; + border: .00521rem solid @color-highlight; + box-shadow: 0 0 .03rem @color-highlight; } -.map-btn-background{ + +.map-btn-background { background: @background-color; //border: .00521rem solid @color; //box-shadow: 0 0 .03rem @color; //border-radius: .05208rem; } -.map-background{ + +.map-background { //color: @color; border: .00521rem solid @color; box-shadow: 0 0 .03rem @color; @@ -122,9 +148,38 @@ //padding: .05rem !important; border-radius: .05208rem; } + .map-under-line { height: 1px; background: @background-color-split; margin-block-start: 0; margin-block-end: 0; } + +.tools-panel-content { + border: 1px solid @background-color-tools; + background: @background-color-tools; + padding: 0; + //width: 90px; + display: flex; + flex-wrap: wrap; + justify-content: space-evenly; + + .el-button { + padding: 0; + margin: 5px; + width: 30px; + height: 30px; + background: @background-color-tools; + vertical-align: middle !important; + + img { + width: 16px; + height: 16px; + } + } +} + +.el-popper[x-placement^=bottom] .popper__arrow::after { + border-bottom-color: @background-color-tools; +} -- Gitblit v1.8.0