Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
acca3b99 by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents 4a5f8e20 bf8559de
Inline Side-by-side
Showing 3 changed files with 28 additions and 15 deletions
......@@ -139,7 +139,7 @@ input[type="number"] {
}
::-webkit-scrollbar-thumb {
background: rgba(69, 138, 207, .3);
background: rgba(69, 138, 207, .6);
background-clip: padding-box;
min-height: 28px;
-webkit-border-radius: 6px;
......@@ -148,14 +148,11 @@ input[type="number"] {
}
::-webkit-scrollbar-thumb:hover {
background: rgba(69, 138, 207, .3);
background: rgba(69, 138, 207, .6);
}
// 滚动条位置
.el-scrollbar__wrap {
// margin-bottom: 0px!important;
margin-right: 0px !important;
}
// element 样式补丁
.el-menu--horizontal {
......
......@@ -351,7 +351,7 @@ aside {
color: #02D9FD;
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
}
......@@ -362,6 +362,13 @@ aside {
border-radius: 16px;
color: #0097FF;
}
.successColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #0097FF;
}
.configurationbtnColor {
width: 64px;
height: 28px;
......@@ -369,6 +376,13 @@ aside {
border-radius: 16px;
color: #b0e4dd;
}
.configurationbtnColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #b0e4dd;
}
.resetbtnColor {
width: 64px;
height: 28px;
......@@ -376,20 +390,25 @@ aside {
border-radius: 16px;
color: #A5CBDA;
}
.movebtnColor {
.resetbtnColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #0097FF;
color: #A5CBDA;
}
.successColor:hover {
.movebtnColor {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
border-radius: 16px;
color: #0097FF;
}
.movebtnColor:hover {
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #0097FF;
}
.delColor {
width: 64px;
......@@ -402,7 +421,7 @@ aside {
.delColor:hover {
width: 64px;
height: 28px;
background: rgba(255, 255, 255, 0.1);
background: rgba(255, 255, 255, 0.2);
border-radius: 16px;
color: #B06974;
}
......
......@@ -178,7 +178,6 @@
type="text"
size="mini"
class="configurationbtnColor"
icon="el-icon-video-pause"
onClick={() => {
this.getList(scope.row);
}}
......@@ -200,7 +199,6 @@
type="text"
size="mini"
class='successColor'
icon="el-icon-edit"
onClick={() => {
this.handleAddEdit(scope.row);
}}
......@@ -222,7 +220,6 @@
disabled={scope.row.category === 1}
size="mini"
class='delColor'
icon="el-icon-delete"
// style="color:#F56C6C"
onClick={() => {
this.handleDelete(scope.row.id, scope.row.name);
......