gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: 处理冲突

Browse Source
This commit is contained in:
chenjinsong
2021-11-29 16:46:53 +08:00
parent 339e437a6e
commit 28e9e55c0e
3 changed files with 10 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/assets/css/components/common/popBox/selectPanel.scss
View File

@@ -14,6 +14,12 @@
cursor: pointer; cursor: pointer;
} }
} }
.el-dropdown-menu__item {
padding: 0;
div {
padding: 0 20px;
}
}
} }
.tree--node > span:last-of-type > span > i { .tree--node > span:last-of-type > span > i {
font-weight: normal !important; font-weight: normal !important;

4
nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss
View File

@@ -62,6 +62,10 @@
.query-row .metric-selector-input-box { .query-row .metric-selector-input-box {
width: calc(100% - 120px); width: calc(100% - 120px);
} }
.el-input-number--small {
width: 100%;
}
} }
.severity-item{ .severity-item{
color: $--color-text-secondary; color: $--color-text-secondary;

86
nezha-fronted/src/components/page/dashboard/overview/overview2.vue
View File

@@ -1566,89 +1566,3 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
@import "./overview2.scss";
.leaflet-control-zoom{
border: 1px solid #E7EAED !important;
box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77) !important;
.leaflet-control-zoom-out,.leaflet-control-zoom-in{
opacity: .7;
background: #FFF;
}
}
.leaflet-control-attribution{
background-color: unset !important;
color: rgba(178, 178, 178, 0.77);
}
@keyframes error-animation{
0% {fill-opacity:.5}
50% {fill-opacity:0.75}
100% {fill-opacity:1}
}
.error-item{
color: #FADED7 ;
animation: error-animation 1s infinite ease-in-out;
animation-direction:normal;
}
.real-marker{
pointer-events: none;
}
.error-color{
}
.my-pane {
position: fixed;
width: 1px;
z-index: 99999;
height: 1px;
background-color: transparent;
}
.leaflet-bottom{
z-index: 409;
}
.el-carousel--horizontal{
height: 100%;
}
.el-carousel__container{
height: calc(100% - 36px);
}
.el-carousel__item .project-name {
font-size: 18px;
margin: 0;
position: absolute;
z-index: 1;
}
.el-carousel__item:nth-child(2n) {
/*background-color: #99a9bf;*/
}
.el-carousel__item:nth-child(2n+1) {
/*background-color: #d3dce6;*/
}
</style>
<style scoped>
.maskLayer{
width: 100%;
height: 100%;
opacity: 0;
position: absolute;
top: 0;
left: 0;
z-index: 10;
cursor: pointer;
}
/deep/ .el-carousel__indicator--horizontal .el-carousel__button{
background-color: #C0C4CC;
opacity: .24;
height: 10px;
width: 10px;
border-radius: 50%;
}
/deep/ .el-carousel__indicator--horizontal.is-active .el-carousel__button{
opacity: 1;
}
</style>