Authored by 毕凯

Merge branch 'feature/newHome' into 'release/6.1'

样式修改,底部格式修改



See merge request !914
... ... @@ -216,6 +216,7 @@ $.extend({
$op.prepend(
'<span>Hi,</span>' +
'<a class="user-name" href="/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +
'<span class="sep-line">|</span>' +
'<a href="/passport/signout/index">退出</a>'
);
}
... ...
... ... @@ -198,7 +198,7 @@
width: 750px;
height: 88px;
line-height: 88px;
padding: 0 30px;
padding: 0 0 0 30px;
div {
float: left;
... ... @@ -213,7 +213,7 @@
}
.body {
width: 630px;
width: 660px;
border-bottom: solid 1px #e0e0e0;
.main {
... ... @@ -230,6 +230,7 @@
font-size: 24px;
width: 30px;
text-align: right;
margin-right: 30px;
}
}
... ... @@ -251,7 +252,7 @@
}
.body {
width: 690px;
width: 720px;
border-bottom: 0;
.main {
... ... @@ -275,7 +276,7 @@
.service-item {
float: left;
padding: 20px 75px;
padding: 20px 65px;
width: 250px;
text-align: center;
color: #444;
... ...
... ... @@ -10,7 +10,6 @@
line-height: 140px;
.user-name {
margin-right: 1.17em;
margin-left: 0.35em;
max-width: 234px;
}
... ... @@ -20,7 +19,8 @@
}
.sep-line {
margin: 0 0.35em;
color: #e0e0e0;
margin: 0 30px;
}
}
... ... @@ -67,11 +67,6 @@
text-decoration: none;
text-overflow: ellipsis;
white-space: nowrap;
border-right: solid 1px #e0e0e0;
margin: 45px 1em 45px 0.3em;
padding-right: 30px;
height: 30px;
line-height: 30px;
}
.back-to-top {
... ... @@ -80,7 +75,8 @@
}
.sep-line {
margin: 0 0.3em;
color: #e0e0e0;
margin: 0 30px;
}
}
... ...
... ... @@ -185,7 +185,7 @@
.width750 {
.homebuttom {
height: 355px;
top: 105px;
top: 93px;
}
}
... ... @@ -193,7 +193,7 @@
width: 280px;
height: 355px;
position: absolute;
top: 90px;
top: 80px;
right: 12px;
z-index: 2;
overflow: hidden;
... ...
... ... @@ -14,7 +14,10 @@
font-size: 32px;
color: #444;
padding-left: 20px;
border-left: solid 4px #444;
border-left: solid 5px #444;
line-height: 28px;
margin-top: 4px;
font-weight: 500;
}
}
... ...