Skip to content

Commit

Permalink
Merge pull request #1 from weijian1/master
Browse files Browse the repository at this point in the history
样式修改
  • Loading branch information
4DKelvin committed Jun 16, 2015
2 parents 6ae43a7 + f5e13f9 commit a047066
Show file tree
Hide file tree
Showing 12 changed files with 145 additions and 118 deletions.
122 changes: 83 additions & 39 deletions resources/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ a:hover {
}

.wrap {
width : 1000px;
width : 1128px;
margin : 0px auto;
}

Expand All @@ -91,7 +91,7 @@ a:hover {
/*nav*/
#nav {
width : 100%;
height : 100px;
height : 60px;
background : #FFFFFF;
border-bottom : 1px solid #E5E5E5;
position : fixed;
Expand All @@ -105,35 +105,68 @@ a:hover {
}

#nav .logo {
width : 52px;
height : 52px;
width : 158px;
height : 51px;
display : block;
margin : 25px 0 0 40px;
margin : 3px 0 0 40px;
background : url(../images/logo.png) 0 0 no-repeat;
_background : none;
_filter : progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=crop, src='images/logo.png');
background-size : 100%;
}

#nav ul {
#nav ul.menu-left {
width : 800px;
height : 40px;
line-height : 40px;
margin : 30px auto;
line-height : 57px;
margin : 0 auto;
text-align : center;
}

#nav ul li a {
#nav ul.menu-left li a {
width : 110px;
display : inline-block;
color : #999999;
}

#nav ul li a:hover, #nav ul li .cur {
color : #333333;
#nav ul.menu-left li a:hover, #nav ul li .cur {
color : #16bc00;
text-decoration : none;
}

#nav ul.menu-left li .cur {
border-bottom : solid #ffd600;
}

#nav ul.menu-right {
position: absolute;
top: 0;
right: 252px;
line-height: 60px;
}

#nav ul.menu-right .btn1 {
color: #3e3400;
text-decoration: none;
}
#nav ul.menu-right .btn2 {
width: 80px;
color: #3e3400;
background-color: #ffd600;
text-decoration: none;
border-radius: 15px;
-webkit-border-radius: 15px;
padding: 5px 24px;
}
#nav ul.menu-right .btn2:hover, #nav ul.menu-right .btn2:active, #nav ul.menu-right .btn2:focus, #nav ul.menu-right .btn2:visited {
background-color: #ffa200;
}
#nav ul.menu-right a {
margin-right: 15px;
}
#nav ul.menu-right a:after {
margin-right: 0;
}

/*foucsPic*/
#foucsPic {
position : relative;
Expand Down Expand Up @@ -685,15 +718,15 @@ a:hover {
}

#caseList .case, #products .case {
width : 500px;
width : 560px;
height : 500px;
overflow : hidden;
float : left;
position : relative;
}

#products .w1000 {
width : 1000px;
#products .w1120 {
width : 1120px;
}

.case a {
Expand Down Expand Up @@ -892,24 +925,23 @@ a:hover {
}

#footer .link {
padding : 50px 0;
position : relative;
padding : 70px 0;
position : relative;
text-align: center;
}

#footer .link ul {
width : 180px;
width : 96px;
font-size : 14px;
float : left;
margin : 0 auto;
}

#footer .link ul li {
font-size : 12px;
float : left;
width : 60px;
}

#footer .link .cpyright li {
float : none;
width : auto;
}

Expand All @@ -918,7 +950,17 @@ a:hover {
color : #333333;
width : auto;
display : block;
float : none;
}

#footer .link ul .tit span {
float: left;
}

#footer .link ul .tit:after {
content: '';
display: block;
height: 0;
clear: both;
}

#footer .link ul .logo {
Expand All @@ -931,8 +973,8 @@ a:hover {
height : 24px;
display : block;
background : url(../images/iconShare.png);
margin-right: 6px;
float : left;
margin-left : 35px;
}

#footer .link .sinaFloat {
Expand All @@ -950,16 +992,16 @@ a:hover {
height : 477px;
background : url(../images/weixinFloat.png);
position : absolute;
left : 10px;
left : 310px;
top : -408px;
z-index : 200;
display : none;
}

#footer .link .cpyright {
width : 300px;
float : right;
color : #999999;
margin-top: 65px;
}

/*侧边栏*/
Expand Down Expand Up @@ -999,8 +1041,6 @@ a:hover {
margin-left : auto;
margin-right : auto;
max-width : 1200px;
padding-left : 10px;
padding-right : 10px;
font-family : 'Microsoft Yahei', '宋体', segoe ui, Arial, sans-serif;
}

Expand Down Expand Up @@ -1033,6 +1073,11 @@ a:hover {
width : 90%;
}

.grid-100 {
float: left;
width: 100%;
}

.grid-50 {
float : left;
width : 50%;
Expand Down Expand Up @@ -1070,6 +1115,7 @@ a:hover {
.section-slogan {
font-size : 18px;
line-height : 140%;
text-align : left;
}

.about-box {
Expand Down Expand Up @@ -1103,7 +1149,8 @@ a:hover {
height : 60px;
text-align : center;
line-height : 60px;
margin-bottom : 20px;
margin-bottom : 40px;
margin-top : 16px;
background : #FFD600;
}

Expand Down Expand Up @@ -1147,7 +1194,7 @@ a:hover {
}

.case.wyx {
background : rgb(255, 105, 133);
background : #f3cf6f;
}

.case.wyx .layer2 {
Expand All @@ -1164,11 +1211,11 @@ a:hover {
.case.wzf .layer2,
.case.wzz .layer2 {
top : 40px;
left : 75px;
left : 45px;
}

.case.wfx {
background : #20201E;
background : #5d6e7c;
}

.case h2,
Expand Down Expand Up @@ -1207,10 +1254,6 @@ a:hover {
text-align : center;
}

#tips dl:hover dd {
border-color : rgb(59, 195, 145);
}

#tips dl {
display : inline-block;
margin : 20px 30px;
Expand All @@ -1225,7 +1268,6 @@ a:hover {
#tips dd {
display : block;
margin : 5px 0;
border-bottom : 1px solid #EAEAEA;
}

#caseMobile {
Expand Down Expand Up @@ -1256,7 +1298,7 @@ a:hover {
height : 128px;
border : 3px solid #EAEAEA;
border-radius : 3px;
margin : 50px 35px;
margin : 50px 15px 50px 45px;
}

.qr-code img {
Expand All @@ -1268,6 +1310,7 @@ a:hover {

figure.sev {
margin-left : 20px;
margin-right : 45px;
float : left;
height : 227px;
width : 128px;
Expand All @@ -1294,8 +1337,8 @@ figure.sev img {
position : absolute;
top : -15px;
right : -15px;
width : 100px;
height : 100px;
width : 220px;
height : 220px;
}

#activities {
Expand Down Expand Up @@ -1389,6 +1432,7 @@ figure.sev img {
}

.wfx .layer1 {
margin-left: 50px;
margin-top : 150px;
text-align : center;
}
Expand Down
Binary file removed resources/images/dd.jpg
Binary file not shown.
Binary file added resources/images/dd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/easy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/images/esay.png
Binary file not shown.
Binary file modified resources/images/free.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/images/in.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/images/muti.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/images/sev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a047066

Please sign in to comment.