Skip to content

肖康 / cloudSystem

Go to a project
Commit a56c339b by 肖康
Options

Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem 

# Conflicts:
#	src/assets/css/public/common.less
parents 0bf8127b 13f6c32c
Inline Side-by-side
Showing with 143 additions and 116 deletions
src/assets/css/public/common.less
......@@ -386,20 +386,25 @@ body {
}
//js跟随提示框
.el-tooltip__popper {
border-radius: 0px!important;
box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5);
border: 1px solid #387FFF!important;
.boxxrth2021 {
width : 150px;
background : #fff;
font-size : 12px;
color : #333;
p {
height : 28px;
line-height: 28px;
//js跟随提示框
.el-tooltip__popper {
box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5);
border: 1px solid #387FFF !important;
border-radius: 0px !important;
.boxxrth2021 {
width: 150px;
background: #fff;
font-size: 12px;
color: #333;
p {
height: 28px;
line-height: 28px;
}
}
}
//js跟随提示框
.el-tooltip__popper {
......@@ -422,101 +427,107 @@ body {
}
}
.el-tooltip__popper[x-placement="top"] .popper__arrow{ border-top-color:#387FFF!important;}
.el-tooltip__popper[x-placement="bottom"] .popper__arrow{ border-bottom-color:#387FFF!important;}
//弹窗公共样式
.el-dialog__body {
padding: 20px !important;
}
.el-tooltip__popper[x-placement="top"] .popper__arrow {
border-top-color: #387FFF !important;
}
.el-dialog__title {
font-size: 14px;
color: #333;
font-weight: bold;
position: relative;
&::after {
content: "";
position: absolute;
width: 5px;
height: 22px;
background: #1969F9;
left: -20px;
top: 2px;
.el-tooltip__popper[x-placement="bottom"] .popper__arrow {
border-bottom-color: #387FFF !important;
}
}
.el-icon-close {
font-size: 24px;
&:hover,
&:focus {
color: #1969F9 !important;
//弹窗公共样式
.el-dialog__body {
padding: 20px !important;
}
.el-dialog__title {
font-size: 14px;
color: #333;
font-weight: bold;
position: relative;
&::after {
content: "";
position: absolute;
width: 5px;
height: 22px;
background: #1969F9;
left: -20px;
top: 2px;
}
}
}
.el-icon-close {
font-size: 24px;
.el-message-box__container {
text-align: center;
padding: 15px 0px;
}
&:hover,
&:focus {
color: #1969F9 !important;
}
.el-message-box__message {
display: inline-block;
}
.el-message-box__message p {
color: #333;
font-size: 16px;
}
}
.el-message-box__status.el-icon-error {
color: #FC1F00 !important;
font-size: 25px !important;
}
.el-message-box__container {
text-align: center;
padding: 15px 0px;
}
.el-message-box__close:before {
content: "\E609";
}
.el-message-box__message {
display: inline-block;
}
.el-message-box__btns,
.dialog-footer {
.el-message-box__message p {
color: #333;
font-size: 16px;
}
.el-button {
width: 76px;
height: 34px;
text-align: center;
line-height: 34px;
background: #E8ECF4;
border: 1px solid #E8ECF4;
border-radius: 2px;
color: #8391AD;
font-size: 14px;
padding: 0px;
.el-message-box__status.el-icon-error {
color: #FC1F00 !important;
font-size: 25px !important;
}
&:hover,
&:focus {
color: #8391AD;
background: #E8ECF4;
border: 1px solid #E8ECF4
}
.el-message-box__close:before {
content: "\E609";
}
&.el-button--primary {
border: 1px solid #1969F9;
color: #fff;
background: #1969F9;
.el-message-box__btns,
.dialog-footer {
.el-button {
width: 76px;
height: 34px;
text-align: center;
line-height: 34px;
background: #E8ECF4;
border: 1px solid #E8ECF4;
border-radius: 2px;
color: #8391AD;
font-size: 14px;
padding: 0px;
&:hover,
&:focus {
color: #8391AD;
background: #E8ECF4;
border: 1px solid #E8ECF4
}
&.el-button--primary {
border: 1px solid #1969F9;
color: #fff;
background: #1969F9;
border: 1px solid #1969F9
&:hover,
&:focus {
color: #fff;
background: #1969F9;
border: 1px solid #1969F9
}
}
}
}
}
}
\ No newline at end of file
src/assets/css/public/common.min.css
......@@ -292,6 +292,21 @@ body {
background: #D2D9E7;
}
.el-tooltip__popper {
box-shadow: 1px 2px 10px 0px rgba(119, 135, 145, 0.5);
border: 1px solid #387FFF !important;
border-radius: 0px !important;
}
.el-tooltip__popper .boxxrth2021 {
width: 150px;
background: #fff;
font-size: 12px;
color: #333;
}
.el-tooltip__popper .boxxrth2021 p {
height: 28px;
line-height: 28px;
}
.el-tooltip__popper {
border: 0px !important;
box-shadow: 0px 0px 10px #ccc;
}
......@@ -308,22 +323,22 @@ body {
.el-tooltip__popper .boxxrth2021 p span {
width: 50%;
}
.el-tooltip__popper[x-placement="top"] .popper__arrow {
border-top-color: #fff !important;
.el-tooltip__popper .el-tooltip__popper[x-placement="top"] .popper__arrow {
border-top-color: #387FFF !important;
}
.el-tooltip__popper[x-placement="bottom"] .popper__arrow {
border-bottom-color: #fff !important;
.el-tooltip__popper .el-tooltip__popper[x-placement="bottom"] .popper__arrow {
border-bottom-color: #387FFF !important;
}
.el-dialog__body {
.el-tooltip__popper .el-dialog__body {
padding: 20px !important;
}
.el-dialog__title {
.el-tooltip__popper .el-dialog__title {
font-size: 14px;
color: #333;
font-weight: bold;
position: relative;
}
.el-dialog__title::after {
.el-tooltip__popper .el-dialog__title::after {
content: "";
position: absolute;
width: 5px;
......@@ -332,33 +347,33 @@ body {
left: -20px;
top: 2px;
}
.el-icon-close {
.el-tooltip__popper .el-icon-close {
font-size: 24px;
}
.el-icon-close:hover,
.el-icon-close:focus {
.el-tooltip__popper .el-icon-close:hover,
.el-tooltip__popper .el-icon-close:focus {
color: #1969F9 !important;
}
.el-message-box__container {
.el-tooltip__popper .el-message-box__container {
text-align: center;
padding: 15px 0px;
}
.el-message-box__message {
.el-tooltip__popper .el-message-box__message {
display: inline-block;
}
.el-message-box__message p {
.el-tooltip__popper .el-message-box__message p {
color: #333;
font-size: 16px;
}
.el-message-box__status.el-icon-error {
.el-tooltip__popper .el-message-box__status.el-icon-error {
color: #FC1F00 !important;
font-size: 25px !important;
}
.el-message-box__close:before {
.el-tooltip__popper .el-message-box__close:before {
content: "\E609";
}
.el-message-box__btns .el-button,
.dialog-footer .el-button {
.el-tooltip__popper .el-message-box__btns .el-button,
.el-tooltip__popper .dialog-footer .el-button {
width: 76px;
height: 34px;
text-align: center;
......@@ -370,24 +385,24 @@ body {
font-size: 14px;
padding: 0px;
}
.el-message-box__btns .el-button:hover,
.dialog-footer .el-button:hover,
.el-message-box__btns .el-button:focus,
.dialog-footer .el-button:focus {
.el-tooltip__popper .el-message-box__btns .el-button:hover,
.el-tooltip__popper .dialog-footer .el-button:hover,
.el-tooltip__popper .el-message-box__btns .el-button:focus,
.el-tooltip__popper .dialog-footer .el-button:focus {
color: #8391AD;
background: #E8ECF4;
border: 1px solid #E8ECF4;
}
.el-message-box__btns .el-button.el-button--primary,
.dialog-footer .el-button.el-button--primary {
.el-tooltip__popper .el-message-box__btns .el-button.el-button--primary,
.el-tooltip__popper .dialog-footer .el-button.el-button--primary {
border: 1px solid #1969F9;
color: #fff;
background: #1969F9;
}
.el-message-box__btns .el-button.el-button--primary:hover,
.dialog-footer .el-button.el-button--primary:hover,
.el-message-box__btns .el-button.el-button--primary:focus,
.dialog-footer .el-button.el-button--primary:focus {
.el-tooltip__popper .el-message-box__btns .el-button.el-button--primary:hover,
.el-tooltip__popper .dialog-footer .el-button.el-button--primary:hover,
.el-tooltip__popper .el-message-box__btns .el-button.el-button--primary:focus,
.el-tooltip__popper .dialog-footer .el-button.el-button--primary:focus {
color: #fff;
background: #1969F9;
border: 1px solid #1969F9;
......
src/assets/css/public/common.min.css.map
{"version":3,"sources":["common.less"],"names":[],"mappings":"AAAA;EACE,8BAAA;EACA,0BAAA;;AAGF,IAAK;EACH,UAAA;EACA,yCAAA;EACA,6CAAA;;AAGF;AACA;EACE,8CAA8C,6BAA9C;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;EACA,eAAA;EACA,cAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,SAAA;EACA,UAAA;;AAGF;AACA;AACA;AACA;EACE,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AACL,KAAK;AACL,KAAK;EACH,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AACA;AACA;EACE,gBAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;EACE,eAAA;EACA,gBAAA;;AAGF;AACA;AACA;EACE,kBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,YAAA;;AAGF;EACE,QAAA;EACA,WAAA;;AAGF,IAAI;EACF,SAAS,GAAT;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;;AAGF;EACE,WAAA;EACA,gBAAA;;AAGF;EACE,YAAA;EACA,gBAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,sBAAA;;AAGF;EACE,sBAAA;;AAIF;EACE,qBAAA;EACA,gBAAA;EACA,OAAA;EACA,sBAAA;EACA,oBAAA;;AAGF;EACE,uBAAA;EACA,mBAAA;;AAGF;EACE,iBAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,sBAAA;;AAGF;EACE,8BAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,mBAAA;;;AAIF;EACE,8BAAA;;;AAIF;EACE,6BAAA;;;AAIF;EACE,uBAAA;;;AAIF;EACE,mBAAA;;AAGF;EACE,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;EACA,OAAA;;AAGF;AACA;EACE,WAAA;EACA,YAAA;EACA,iCAAA;;AAGF;EACE,kBAAA;EACA,mBAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;AAGF;EACE,cAAA;;;AAIF;EACE,iBAAA;EACA,gBAAA;;AAGF;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;EACA,qBAAA;;AAJF,iBAME;EACE,aAAA;;AAPJ,iBAUE;EACE,WAAA;;AAIJ;EACE,aAAA;;AADF,MAIE;EACE,YAAA;EACA,kBAAA;EACA,yBAAA;EACA,eAAA;;AAEA,MANF,iBAMG;EACC,yBAAA;;AAXN,MAeE;EACE,WAAA;;AAhBJ,MAmBE,iBAAgB;EACd,YAAA;;AApBJ,MAuBE,WAAW,UAAS,SAAU;AAvBhC,MAwBE,iBAAgB;AAxBlB,MAyBE,iBAAgB,UAAU;EACxB,qBAAA;;AA1BJ,MA6BE;EACE,YAAA;;AA9BJ,MAiCE,iBAAiB;EACf,kBAAA;;AAlCJ,MAqCE;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;;AAxCJ,MAqCE,kBAKE;EACE,aAAA;;AA3CN,MAqCE,kBASE;EACE,WAAA;;AA/CN,MAqDE;EACE,cAAA;;AAtDJ,MAyDE,oBAAmB,WAAY;AAzDjC,MA0DE,oBAAmB,iBAAkB;EACnC,yBAAA;EACA,qBAAA;;AA5DJ,MA+DE,kBACE;EACE,mBAAA;;AAjEN,MA+DE,kBAKE,gBAAgB,GAAE,UAAW;EAC3B,yBAAA;;AArEN,MA2EE,QACE,kBACE;EACE,yBAAA;;AA9ER,MAmFE,iBACE,kBACE;EACE,yBAAA;;AAtFR,MA6GE,wBAAuB;EACrB,WAAA;;AA9GJ,MAiHE,wBAAuB;EACrB,kBAAA;EACA,gBAAA;EACA,WAAA;EACA,oDAAA;;AArHJ,MAwHE,wBAAuB;EACrB,gBAAA;EACA,mBAAA;;AAOJ;EACE,sBAAA;EACA,6BAAA;;AAFF,mBAIE;EACE,YAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;;AARJ,mBAIE,aAME;EACE,YAAA;EACA,iBAAA;;AAZN,mBAIE,aAME,EAIE;EACE,UAAA;;AAOR,mBAAmB,mBAAoB;EACrC,sBAAA;;AAGF,mBAAmB,sBAAuB;EACxC,yBAAA;;AAKF;EACE,wBAAA;;AAGF;EACE,eAAA;EACA,WAAA;EACA,iBAAA;EACA,kBAAA;;AAEA,iBAAC;EACC,SAAS,EAAT;EACA,kBAAA;EACA,UAAA;EACA,YAAA;EACA,mBAAA;EACA,WAAA;EACA,QAAA;;AAIJ;EACE,eAAA;;AAEA,cAAC;AACD,cAAC;EACC,cAAA;;AAMJ;EACE,kBAAA;EACA,iBAAA;;AAGF;EACE,qBAAA;;AAGF,wBAAyB;EACvB,WAAA;EACA,eAAA;;AAGF,uBAAuB;EACrB,cAAA;EACA,0BAAA;;AAGF,sBAAsB;EACpB,SAAS,OAAT;;AAGF,qBAGE;AAFF,cAEE;EACE,WAAA;EACA,YAAA;EACA,kBAAA;EACA,iBAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;EACA,cAAA;EACA,eAAA;EACA,YAAA;;AAEA,qBAZF,WAYG;AAAD,cAZF,WAYG;AACD,qBAbF,WAaG;AAAD,cAbF,WAaG;EACC,cAAA;EACA,mBAAA;EACA,yBAAA;;AAGF,qBAnBF,WAmBG;AAAD,cAnBF,WAmBG;EACC,yBAAA;EACA,WAAA;EACA,mBAAA;;AAEA,qBAxBJ,WAmBG,mBAKE;AAAD,cAxBJ,WAmBG,mBAKE;AACD,qBAzBJ,WAmBG,mBAME;AAAD,cAzBJ,WAmBG,mBAME;EACC,WAAA;EACA,mBAAA;EACA,yBAAA","file":"common.min.css"}
\ No newline at end of file
{"version":3,"sources":["common.less"],"names":[],"mappings":"AAAA;EACE,8BAAA;EACA,0BAAA;;AAGF,IAAK;EACH,UAAA;EACA,yCAAA;EACA,6CAAA;;AAGF;AACA;EACE,8CAA8C,6BAA9C;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;EACA,eAAA;EACA,cAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,SAAA;EACA,UAAA;;AAGF;AACA;AACA;AACA;EACE,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AACL,KAAK;AACL,KAAK;EACH,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AACA;AACA;EACE,gBAAA;;AAGF;AACA;AACA;AACA;AACA;AACA;EACE,eAAA;EACA,gBAAA;;AAGF;AACA;AACA;EACE,kBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,YAAA;;AAGF;EACE,QAAA;EACA,WAAA;;AAGF,IAAI;EACF,SAAS,GAAT;EACA,WAAA;EACA,SAAA;EACA,kBAAA;EACA,cAAA;;AAGF;EACE,WAAA;EACA,gBAAA;;AAGF;EACE,YAAA;EACA,gBAAA;;AAGF;EACE,mBAAA;;AAGF;EACE,sBAAA;;AAGF;EACE,sBAAA;;AAIF;EACE,qBAAA;EACA,gBAAA;EACA,OAAA;EACA,sBAAA;EACA,oBAAA;;AAGF;EACE,uBAAA;EACA,mBAAA;;AAGF;EACE,iBAAA;EACA,UAAA;EACA,YAAA;EACA,YAAA;EACA,sBAAA;;AAGF;EACE,8BAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,sBAAA;;AAGF;EACE,aAAA;EACA,mBAAA;;;AAIF;EACE,8BAAA;;;AAIF;EACE,6BAAA;;;AAIF;EACE,uBAAA;;;AAIF;EACE,mBAAA;;AAGF;EACE,mBAAA;EACA,gBAAA;EACA,eAAA;EACA,WAAA;EACA,OAAA;;AAGF;AACA;EACE,WAAA;EACA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","file":"common.min.css"}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment