Skip to content

Z
ZhongWeiXin
Commit 1f466c71 by 邓丽
Options

cccc

parent fc5758dd
Showing with 33 additions and 10 deletions
dist/assets/js/slickPort.js
......@@ -1487,17 +1487,34 @@
var mH=parseInt(windowW * bi);
var Top=parseInt((windowH - realHeight)/2);
//如果真实的宽度大于浏览器的宽度就按照100%显示
if (realWidth >= windowW && realWidth >= realHeight) {
if(mH>windowH){
image.attr('style','max-height:'+windowH+'px;width:auto');
$('.slick-prev,.slick-next').css({
'margin-top':Top,
'height':windowH
})
}else{
image.attr('style','margin-top:'+Top+'max-width:'+windowW+'px;height:auto');
$('.slick-prev,.slick-next').css({
'margin-top':Top,
'height':realHeight
})
}
}else if(realHeight >= windowH && realWidth < realHeight ){//如果小于浏览器的宽度按照原尺寸显示
image.attr('style','max-height:'+windowH+'px;width:auto;');
$('.slick-prev,.slick-next').css({
'margin-top':Top,
'height':windowH
})
}else{
image.attr('style','margin-top:'+Top+'px;width:auto; height:auto;');
$('.slick-prev,.slick-next').css({
'margin-top':Top,
'height':realHeight
})
}
}
};
......@@ -1575,7 +1592,6 @@
Slick.prototype.next = Slick.prototype.slickNext = function() {
var _ = this;
_.changeSlide({
data: {
message: 'next'
......
dist/css/style.css
......@@ -490,8 +490,8 @@ body {
.slick-next {
display: block;
width: 200px;
top: 150px;
height: 800px;
top: 0px;
height: 100%;
z-index: 8;
}
.slick-prev:before,
......@@ -875,6 +875,7 @@ a.cd-read-more:hover {
display: block;
position: fixed;
right: 0px;
z-index: 30;
}
.returnCon > span .prevBtn .icon-closeIco2,
.returnCon > span .prevBtn .icon-closeIco3 {
......@@ -1481,6 +1482,7 @@ a.cd-read-more:hover {
display: block;
position: fixed;
right: 0px;
z-index: 30;
}
.returnCon > span .prevBtn .icon-closeIco2,
.returnCon > span .prevBtn .icon-closeIco {
......@@ -1974,6 +1976,7 @@ a.cd-read-more:hover {
.returnCon > span .prevBtn {
display: block;
position: fixed;
z-index: 30;
right: 0px;
}
.returnCon > span .prevBtn .icon-closeIco3,
......
dist/html/index.html
......@@ -58,7 +58,7 @@
<div class="am-container">
<div class="am-slider am-slider-default mobileTop">
<div>
<div class="bgImg"></div>
<!-- <div class="bgImg"></div>-->
<div class="title">
<h2>ZHONG WEIXING</h2>
<P><a>中文</a> | <a>English</a></P>
......@@ -130,6 +130,7 @@ var _h = parseInt($(window).height());//获取浏览器的宽度
var pTop=parseInt((_h - titleP+50)/2);
$(".title h2").css("top",hTop);
$(".title p").css("top",pTop);
$(".title").css("height",_h);
$("#portfolioDel div").css({
"height":_h
})
......
dist/html/portfolioDetail.html
......@@ -50,7 +50,7 @@
s.parentNode.insertBefore(hm, s);
})();
</script>
<script src="../assets/js/slickPort.min.js"></script>
<script src="../assets/js/slickPort.js"></script>
</head>
<body>
<!--返回上一页-->
......
src/less/style.less
......@@ -133,8 +133,8 @@ body{
.slick-prev, .slick-next{
display: block;
width: 200px;
top: 150px;
height: 800px;
top:0px;
height:100%;
z-index: 8;
}
.slick-prev:before, .slick-next:before{
......@@ -520,7 +520,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
display: block;
position: fixed;
right: 0px;
z-index:30;
.icon-closeIco2,
.icon-closeIco3{
display: none;
......@@ -1144,6 +1144,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
display: block;
position: fixed;
right: 0px;
z-index:30;
.icon-closeIco2,
.icon-closeIco{
display: none;
......@@ -1654,6 +1655,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
.prevBtn{
display: block;
position: fixed;
z-index:30;
right: 0px;
.icon-closeIco3,
.icon-closeIco{
......
src/pages/index.ejs
......@@ -16,7 +16,7 @@
<div class="am-container">
<div class="am-slider am-slider-default mobileTop">
<div>
<div class="bgImg"></div>
<!-- <div class="bgImg"></div>-->
<div class="title">
<h2>ZHONG WEIXING</h2>
<P><a>中文</a> | <a>English</a></P>
......@@ -82,6 +82,7 @@ var _h = parseInt($(window).height());//获取浏览器的宽度
var pTop=parseInt((_h - titleP+50)/2);
$(".title h2").css("top",hTop);
$(".title p").css("top",pTop);
$(".title").css("height",_h);
$("#portfolioDel div").css({
"height":_h
})
......
src/pages/portfolioDetail.ejs
......@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title></title>
<% include ./components/publicHead.html %>
<script src="../assets/js/slickPort.min.js"></script>
<script src="../assets/js/slickPort.js"></script>
</head>
<body>
<!--返回上一页-->
......
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 to comment