Skip to content

肖康 / cloudSystem

Go to a project
Commit 0964b87d by 肖康
Options

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

# Conflicts:
#	src/assets/css/public/common.less
#	src/assets/css/public/common.min.css
parents 505d632a 7157504e
Inline Side-by-side
Showing with 252 additions and 9 deletions
src/assets/css/login/index.less
...@@ -73,7 +73,37 @@ html, body, #app { ...@@ -73,7 +73,37 @@ html, body, #app {
font-size: 20px; font-size: 20px;
color: #333333; color: #333333;
text-align: center; text-align: center;
margin: 25px 0; margin: 25px 0;
}
.bar {
width: 342px;
margin: 0 auto;
.input-box {
width: 340px;
height: 43px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #BEC9DF;
margin-bottom: 20px;
.iconfont {
font-size: 17px;
color: #a1acc1;
}
.inp {
height: 34px;
font-size: 14px;
background: transparent;
border-left: 1px solid #BEC9DF;
&::-webkit-input-placeholder {
color: #333333;
}
}
}
} }
} }
} }
......
src/assets/css/login/index.min.css
...@@ -67,4 +67,29 @@ body, ...@@ -67,4 +67,29 @@ body,
text-align: center; text-align: center;
margin: 25px 0; margin: 25px 0;
} }
.user-box .section .section-wrap .login-box .bar {
width: 342px;
margin: 0 auto;
}
.user-box .section .section-wrap .login-box .bar .input-box {
width: 340px;
height: 43px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #BEC9DF;
margin-bottom: 20px;
}
.user-box .section .section-wrap .login-box .bar .input-box .iconfont {
font-size: 17px;
color: #a1acc1;
}
.user-box .section .section-wrap .login-box .bar .input-box .inp {
height: 34px;
font-size: 14px;
background: transparent;
border-left: 1px solid #BEC9DF;
}
.user-box .section .section-wrap .login-box .bar .input-box .inp::-webkit-input-placeholder {
color: #333333;
}
/*# sourceMappingURL=index.min.css.map */ /*# sourceMappingURL=index.min.css.map */
\ No newline at end of file
src/assets/css/login/index.min.css.map
{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;AAAM;AAAM;EACV,YAAA;;AAGF;EACE,YAAA;;AADF,SAGE;EACE,YAAA;EACA,mBAAA;;AALJ,SAGE,UAIE;EACE,aAAA;EACA,YAAA;EACA,cAAA;;AAVN,SAGE,UAIE,WAKE;EACE,WAAA;EACA,YAAA;;AAdR,SAGE,UAIE,WAKE,MAIE;EACE,WAAA;EACA,YAAA;;AAlBV,SAGE,UAIE,WAeE;EACE,UAAA;EACA,YAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;;AA3BR,SAGE,UAIE,WAuBE,MACE;EACE,eAAA;EACA,cAAA;EACA,iBAAA;EACA,kBAAA;;AAnCV,SAGE,UAIE,WAuBE,MAQE;EACE,eAAA;EACA,cAAA;;AAxCV,SA8CE;EACE,WAAA;EACA,QAAQ,iBAAR;EACA,gBAAgB,uCAAhB;EACA,sBAAA;;AAlDJ,SA8CE,SAME;EACE,kBAAA;EACA,aAAA;EACA,YAAA;EACA,cAAA;;AAxDN,SA8CE,SAME,cAME;EACE,kBAAA;EACA,QAAA;EACA,UAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,kBAAA;;AAjER,SA8CE,SAME,cAME,WASE;EACE,eAAA;EACA,cAAA;EACA,kBAAA;EACA,cAAA","file":"index.min.css"} {"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;AAAM;AAAM;EACV,YAAA;;AAGF;EACE,YAAA;;AADF,SAGE;EACE,YAAA;EACA,mBAAA;;AALJ,SAGE,UAIE;EACE,aAAA;EACA,YAAA;EACA,cAAA;;AAVN,SAGE,UAIE,WAKE;EACE,WAAA;EACA,YAAA;;AAdR,SAGE,UAIE,WAKE,MAIE;EACE,WAAA;EACA,YAAA;;AAlBV,SAGE,UAIE,WAeE;EACE,UAAA;EACA,YAAA;EACA,cAAA;EACA,mBAAA;EACA,qBAAA;;AA3BR,SAGE,UAIE,WAuBE,MACE;EACE,eAAA;EACA,cAAA;EACA,iBAAA;EACA,kBAAA;;AAnCV,SAGE,UAIE,WAuBE,MAQE;EACE,eAAA;EACA,cAAA;;AAxCV,SA8CE;EACE,WAAA;EACA,QAAQ,iBAAR;EACA,gBAAgB,uCAAhB;EACA,sBAAA;;AAlDJ,SA8CE,SAME;EACE,kBAAA;EACA,aAAA;EACA,YAAA;EACA,cAAA;;AAxDN,SA8CE,SAME,cAME;EACE,kBAAA;EACA,QAAA;EACA,UAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,kBAAA;;AAjER,SA8CE,SAME,cAME,WASE;EACE,eAAA;EACA,cAAA;EACA,kBAAA;EACA,cAAA;;AAvEV,SA8CE,SAME,cAME,WAgBE;EACE,YAAA;EACA,cAAA;;AA5EV,SA8CE,SAME,cAME,WAgBE,KAIE;EACE,YAAA;EACA,YAAA;EACA,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,mBAAA;;AApFZ,SA8CE,SAME,cAME,WAgBE,KAIE,WAQE;EACE,eAAA;EACA,cAAA;;AAxFd,SA8CE,SAME,cAME,WAgBE,KAIE,WAaE;EACE,YAAA;EACA,eAAA;EACA,uBAAA;EACA,8BAAA;;AAEA,SAnDZ,SAME,cAME,WAgBE,KAIE,WAaE,KAMG;EACC,cAAA","file":"index.min.css"}
\ No newline at end of file \ No newline at end of file
src/assets/css/public/common.less
...@@ -10,12 +10,10 @@ html * { ...@@ -10,12 +10,10 @@ html * {
} }
html, body { html, body {
font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif; font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
background: #F1F4FA;
} }
body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, menu, nav, section { body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, menu, nav, section {
...@@ -108,6 +106,14 @@ img { ...@@ -108,6 +106,14 @@ img {
*word-spacing: -1px !important; *word-spacing: -1px !important;
} }
.emptys {
margin-left: -1px;
width: 1px;
height: 100%;
font-size: 0;
vertical-align: middle;
}
.boxsiz { .boxsiz {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
......
src/assets/css/public/common.min.css
html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:rgba(0,0,0,0) !important}html,body{font-family:PingFangSC-Regular,PingFang SC,'Microsoft Yahei',sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background:#F1F4FA}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden}.el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important}.el-message--info .el-icon-info{display:none}.el-message--info .el-message__content{color:#fff !important} html {
\ No newline at end of file -webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
html * {
outline: 0;
-webkit-text-size-adjust: none !important;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
}
html,
body {
font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
body,
div,
dl,
dt,
dd,
ul,
ol,
li,
h1,
h2,
h3,
h4,
h5,
h6,
pre,
code,
form,
fieldset,
legend,
input,
textarea,
p,
blockquote,
th,
td,
hr,
button,
article,
aside,
details,
figcaption,
figure,
footer,
header,
menu,
nav,
section {
margin: 0;
padding: 0;
}
button,
input,
select,
textarea {
font-size: 100%;
border: none;
-webkit-appearance: none;
}
input[type=button],
input[type=file],
input[type=submit] {
cursor: pointer;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
ol,
ul,
dl {
list-style: none;
}
h1,
h2,
h3,
h4,
h5,
h6 {
font-size: 100%;
font-weight: 500;
}
em,
b,
i {
font-style: normal;
}
a {
text-decoration: none;
}
img {
border: none;
}
.clr {
*zoom: 1;
clear: both;
}
.clr:after {
content: ".";
clear: both;
height: 0;
visibility: hidden;
display: block;
}
.fl {
float: left;
_display: inline;
}
.fr {
float: right;
_display: inline;
}
.va-t {
vertical-align: top;
}
.va-m {
vertical-align: middle;
}
.va-b {
vertical-align: bottom;
}
.lineBlock {
display: inline-block;
*display: inline;
zoom: 1;
letter-spacing: normal;
word-spacing: normal;
}
.lbBox {
font-size: 0 !important;
*word-spacing: -1px !important;
}
.emptys {
margin-left: -1px;
width: 1px;
height: 100%;
font-size: 0;
vertical-align: middle;
}
.boxsiz {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
html,
body {
width: 100%;
height: 100%;
-webkit-overflow-scrolling: touch;
}
body {
overflow-x: hidden;
}
/**element-ui 样式重写**/
.el-message--info {
min-width: auto !important;
border: 0px !important;
background: rgba(0, 0, 0, 0.4) !important;
}
.el-message--info .el-icon-info {
display: none;
}
.el-message--info .el-message__content {
color: #fff !important;
}
/*# sourceMappingURL=common.min.css.map */
\ No newline at end of file
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;AAAM;EAEJ,8CAA8C,6BAA9C;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;EACA,mBAAA;;AAGF;AAAM;AAAK;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAK;AAAM;AAAM;AAAU;AAAQ;AAAO;AAAU;AAAG;AAAY;AAAI;AAAI;AAAI;AAAQ;AAAS;AAAO;AAAS;AAAY;AAAQ;AAAQ;AAAQ;AAAM;AAAK;EACxN,SAAA;EACA,UAAA;;AAGF;AAAQ;AAAO;AAAQ;EACrB,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AAAe,KAAK;AAAa,KAAK;EACzC,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AAAI;AAAI;EACN,gBAAA;;AAGF;AAAI;AAAI;AAAI;AAAI;AAAI;EAClB,eAAA;EACA,gBAAA;;AAGF;AAAI;AAAG;EACL,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,8BAAA;EACA,sBAAA;;AAGF;AAAM;EACJ,WAAA;EACA,YAAA;EACA,iCAAA;;AAGF;EACE,kBAAA;;;AAIF;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;;AAHF,iBAKE;EACE,aAAA;;AANJ,iBASE;EACE,WAAA","file":"common.min.css"} {"version":3,"sources":["common.less"],"names":[],"mappings":"AAAA;EACE,8BAAA;EACA,0BAAA;;AAGF,IAAK;EACH,UAAA;EACA,yCAAA;EACA,6CAAA;;AAGF;AAAM;EACJ,8CAA8C,6BAA9C;EACA,kBAAA;EACA,mCAAA;EACA,kCAAA;;AAGF;AAAM;AAAK;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAI;AAAK;AAAM;AAAM;AAAU;AAAQ;AAAO;AAAU;AAAG;AAAY;AAAI;AAAI;AAAI;AAAQ;AAAS;AAAO;AAAS;AAAY;AAAQ;AAAQ;AAAQ;AAAM;AAAK;EACxN,SAAA;EACA,UAAA;;AAGF;AAAQ;AAAO;AAAQ;EACrB,eAAA;EACA,YAAA;EACA,wBAAA;;AAGF,KAAK;AAAe,KAAK;AAAa,KAAK;EACzC,eAAA;;AAGF;EACE,yBAAA;EACA,iBAAA;;AAGF;AAAI;AAAI;EACN,gBAAA;;AAGF;AAAI;AAAI;AAAI;AAAI;AAAI;EAClB,eAAA;EACA,gBAAA;;AAGF;AAAI;AAAG;EACL,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;AAAM;EACJ,WAAA;EACA,YAAA;EACA,iCAAA;;AAGF;EACE,kBAAA;;;AAIF;EACE,0BAAA;EACA,sBAAA;EACA,8BAAA;;AAHF,iBAKE;EACE,aAAA;;AANJ,iBASE;EACE,WAAA","file":"common.min.css"}
\ No newline at end of file \ No newline at end of file
src/views/User/login.vue
...@@ -17,6 +17,18 @@ ...@@ -17,6 +17,18 @@
<div class="section-wrap"> <div class="section-wrap">
<div class="login-box"> <div class="login-box">
<p class="tit">欢迎登录云芯系统</p> <p class="tit">欢迎登录云芯系统</p>
<div class="bar">
<div class="input-box">
<i class="iconfont iconuser va-m"></i>
<input type="text" placeholder="请输入手机号" class="inp va-m"/>
<b class="lineBlock emptys"></b>
</div>
<div class="input-box">
<i class="iconfont iconuser va-m"></i>
<input type="text" placeholder="请输入手机号" class="inp va-m"/>
<b class="lineBlock emptys"></b>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
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