From 6f52267465d2ce8e08ae0fd61bbe7f69b366a2c4 Mon Sep 17 00:00:00 2001 From: 徐旺旺 <11530253@qq.com> Date: 星期四, 08 四月 2021 14:51:11 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/assets/css/map/map-panel-style.less | 52 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less index 3a72b11..161c604 100644 --- a/src/assets/css/map/map-panel-style.less +++ b/src/assets/css/map/map-panel-style.less @@ -1,5 +1,9 @@ @import "_map-variable"; - +.leaflet-container, +html,body{ + // font-family: 'Microsoft YaHei'; + font: 12px/1.5 "Microsoft YaHei", Arial, Helvetica, sans-serif; +} /*鍏ㄥ眬璁剧疆***********/ h1, h2, h3, h4, h5, h6, ul, li, p { padding: 0; @@ -53,6 +57,7 @@ .select-down { border: none !important; background-color: @background-color; + margin: 0; //.el-scrollbar{ // @@ -242,13 +247,35 @@ /***************Company 鍥惧眰 鎮诞妗嗘牱寮忋��*********************************/ .company-bindTooltip { + //background: @background-color-split; background: none; border: none; color: red; font-size: 16px; - font-weight: 900 !important; - text-shadow: 0 0 5px #fff; box-shadow: none; + //text-shadow: 0 0 5px #fff; + //filter:Dropshadow(offx=1,offy=0,color=white) + //Dropshadow(offx=0,offy=1,color=white) + //Dropshadow(offx=0,offy=-1,color=white) + //Dropshadow(offx=-1,offy=0,color=white); + //box-shadow: none; + //-webkit-text-stroke: .5px #fff; + ul{ + position: relative; + li:not(:first-child){ + position: absolute; + top:0; + left:0; + width: 100%; + font-weight: 900; + } + li{ + text-shadow: 0 0 4px #fff; + } + } +} +.company-bindTooltip:before{ + display: none; } .company-bindTooltip-hover h3 { @@ -262,15 +289,15 @@ list-style: none; margin: 0; padding: 0; - width: 260px; - display: flex; + //width: 260px; + //display: flex; flex-wrap: wrap; } .company-bindTooltip-hover ul li { margin: 0; padding: 3px 0; - width: 50%; + //width: 50%; } /*************** PublicTable 琛ㄦ牸鏍峰紡銆�*********************************/ @@ -293,6 +320,7 @@ } .el-table td, .el-table th.is-leaf { border: none; + font-size: 0.08rem; } .el-table .warning-row { background: #28304d; @@ -338,6 +366,18 @@ .icon{ width: 20px; margin: 0 auto; + font-size: 20px; } } +.panel-title{ + color: @color-title; + font-size: 18px; + padding: 10px; + text-align: center; + border-bottom: 1px solid @background-color-split; +} + +.el-tabs__header .is-top { + +} -- Gitblit v1.8.0