diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss index 465f5d00a..7e9144173 100644 --- a/src/assets/scss/buttonstyle.scss +++ b/src/assets/scss/buttonstyle.scss @@ -2,8 +2,65 @@ //紫色 .diy-button--purple { - background: linear-gradient(0deg, #7A58D1 0%, #8C91FF 100%); - border-radius: 3px; + background: linear-gradient(0deg, #7A58D1 0%, #8C91FF 100%) !important; + // border-radius: 3px !important; + color: #fff !important; + // font-size: 14px !important; + border-color: #8C91FF !important; + // width: 83px !important; + // height: 29px !important; + // line-height: 19px !important; +} + +//绿色 +.diy-button--green { + background: linear-gradient(0deg, #33A8A6 0%, #29D2CE 100%) !important; + border-radius: 3px !important; + color: #fff !important; + font-size: 14px !important; + border-color: #29D2CE !important; +} + +//蓝色 +.diy-button--blue { + background: linear-gradient(0deg, #0062BB 0%, #0081EC 100%) !important; + border-radius: 3px !important; + color: #fff !important; + font-size: 14px !important; + border-color: #0081EC !important; +} + +//黄色 +.diy-button--yellow { + background: linear-gradient(0deg, #FAA700 0%, #FFBF28 100%) !important; + border-radius: 3px !important; + color: #fff !important; + font-size: 14px !important; + border-color: #FFBF28 !important; +} +//橙色 +.diy-button--orange { + background: linear-gradient(0deg, #EE6436 1%, #FC8C6B 100%) !important; + border-radius: 3px !important; + color: #fff !important; + font-size: 14px !important; + border-color: #FC8C6B !important; +} +//红色 +.diy-button--red { + background: linear-gradient(0deg, #DB3B3B 1%, #FF8080 100%) !important; + border-radius: 3px !important; + color: #fff !important; + font-size: 14px !important; + border-color: #FF8080 !important; +} +//白色 +.diy-button--white { + background: linear-gradient(0deg, #A6C3D0, #FFFFFF) !important; + border-radius: 3px !important; + color: #002765 !important; + font-size: 14px !important; + border-color: #FFFFFF !important; } //旧版--------弃用 diff --git a/src/main.js b/src/main.js index a5f04b0b1..f5f3634b1 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ import Vue from "vue"; import Element from "element-ui"; -import Mint from "mint-ui"; -import "mint-ui/lib/style.css"; +// import Mint from "mint-ui"; +// import "mint-ui/lib/style.css"; import App from "@/App"; import i18n from "@/i18n"; @@ -60,7 +60,7 @@ Vue.config.productionTip = false; // Vue.use(renProcessRunning); // Vue.use(renProcessDetail); // Vue.use(Element); -Vue.use(Mint); +// Vue.use(Mint); Vue.use(Element, { size: "default",