Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yuping
2023-03-03 15:50:54 +08:00
2 changed files with 27 additions and 47 deletions

View File

@@ -1829,7 +1829,7 @@ export default {
.btn { .btn {
padding: 0px 26px 0px 26px; padding: 0px 26px 0px 26px;
height: 38px; height: 38px;
background: rgba(64, 158, 255, 0); background: #4ea6ff;
border-radius: 8px; border-radius: 8px;
border: 1px solid rgba(64, 158, 255, 1); border: 1px solid rgba(64, 158, 255, 1);
display: flex; display: flex;
@@ -1846,7 +1846,7 @@ export default {
.btnText { .btnText {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: rgba(64, 158, 255, 1); color: #fff;
line-height: 36px; line-height: 36px;
margin-left: 5px; margin-left: 5px;
} }
@@ -1890,32 +1890,32 @@ export default {
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
} }
.btn1:hover { // .btn1:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
.search { // .search {
background-image: url("../../assets/images/courseManage/search0.png"); // background-image: url("../../assets/images/courseManage/search0.png");
} // }
.btnText { // .btnText {
color: #ffffff; // color: #ffffff;
} // }
} // }
.btn1:active { .btn1:active {
background: #0982ff; background: #0982ff;
} }
.btn2:hover { // .btn2:hover {
background: rgba(64, 158, 255, 0.1); // background: rgba(64, 158, 255, 0.1);
} // }
.btn2:active { .btn2:active {
background: rgba(64, 158, 255, 0.2); background: #0982ff;
} }
} }
@@ -1958,9 +1958,9 @@ export default {
} }
} }
.btn3:hover { // .btn3:hover {
background: rgba(64, 158, 255, 0.76); // background: rgba(64, 158, 255, 0.76);
} // }
.btn3:active { .btn3:active {
background: #0982ff; background: #0982ff;

View File

@@ -368,10 +368,15 @@ export default defineComponent({
} }
.btnText2 { .btnText2 {
color: rgba(64, 158, 255, 1); color: rgb(255, 255, 255);
} }
} }
.btn1:active {
background: #0982ff;
}
.btn2:active {
background: #0982ff;
}
.btn1 { .btn1 {
background: #4ea6ff; background: #4ea6ff;
@@ -383,39 +388,14 @@ export default defineComponent({
} }
.btn2 { .btn2 {
background: #ffffff; background: #4ea6ff;
border: 1px solid #4ea6ff; border: 1px solid #4ea6ff;
.search { .search {
width: 16px; width: 16px;
height: 18px; height: 18px;
background-image: url("../../assets/images/courseManage/reset1.png");
}
}
.btn1:hover {
background: rgb(255, 255, 255);
border: 1px solid #4ea6ff;
.search {
background-image: url("../../assets/images/courseManage/search1.png");
}
.btnText {
color: rgba(64, 158, 255, 1);
}
}
.btn2:hover {
background: rgba(64, 158, 255, 1);
.search {
background-image: url("../../assets/images/courseManage/reset0.png"); background-image: url("../../assets/images/courseManage/reset0.png");
} }
.btnText {
color: #ffffff;
}
} }
} }
} }