Skip to content

Z
ZhongWeiXin
Commit 35764e9d by 邓丽
Options

fixbug

parent d40dd07d
Showing with 256 additions and 252 deletions
dist/assets/js/slickPort.js
......@@ -1479,6 +1479,7 @@
/*图片宽高自适应展示*/
var windowW = parseInt($(window).width());//获取浏览器的宽度
var windowH = parseInt($(window).height());//获取浏览器的宽度
var winW=windowW-1;
var realWidth = imageToLoad.width;
var realHeight = imageToLoad.height;
var Top=0;
......@@ -1493,7 +1494,7 @@
image.attr('style','max-height:'+windowH+'px;width:auto');
}else{
var marginTop=parseInt((windowH - mH)/2);
image.attr('style','margin-top:'+marginTop+'px;max-width:'+windowW+'px;height:auto');
image.attr('style','margin-top:'+marginTop+'px;max-width:'+winW+'px;height:auto');
}
}else if(realHeight >= windowH && realWidth < realHeight ){//如果小于浏览器的宽度按照原尺寸显示
image.attr('style','max-height:'+windowH+'px;width:auto;');
......
dist/css/sprite.css
......@@ -18,49 +18,49 @@ To change `display` (e.g. `display: inline-block;`), we suggest using a common C
*/
.icon-closeIco {
background-image: url(sprite.png);
background-position: 0px 0px;
background-position: -78px 0px;
width: 52px;
height: 52px;
}
.icon-closeIco2 {
background-image: url(sprite.png);
background-position: -97px -28px;
width: 26px;
height: 26px;
background-position: 0px 0px;
width: 78px;
height: 78px;
}
.icon-closeIco3 {
background-image: url(sprite.png);
background-position: -52px 0px;
width: 45px;
height: 45px;
background-position: -92px -78px;
width: 26px;
height: 26px;
}
.icon-closeSmall {
background-image: url(sprite.png);
background-position: -97px -54px;
background-position: -110px -52px;
width: 19px;
height: 20px;
}
.icon-facebook {
background-image: url(sprite.png);
background-position: -97px 0px;
background-position: -64px -78px;
width: 28px;
height: 28px;
}
.icon-instagram {
background-image: url(sprite.png);
background-position: 0px -52px;
background-position: 0px -78px;
width: 32px;
height: 32px;
}
.icon-pinterest {
background-image: url(sprite.png);
background-position: -32px -52px;
background-position: -32px -78px;
width: 32px;
height: 32px;
}
.icon-tuite {
background-image: url(sprite.png);
background-position: -64px -52px;
background-position: -78px -52px;
width: 32px;
height: 26px;
}
dist/css/sprite.png
dist/css/sprite.png

4.97 KB | W: | H:

dist/css/sprite.png

4.14 KB | W: | H:

dist/css/sprite.png
dist/css/sprite.png
dist/css/sprite.png
dist/css/sprite.png
  • 2-up
  • Swipe
  • Onion skin
dist/html/biography.html
......@@ -22,8 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -93,8 +93,7 @@
<a href="javascript: void(0)" class="am-close am-close-spin" data-am-modal-close onclick="activeStyle()" >&times;</a>
</div>
<div class="am-modal-bd">
<p>Mobile: <b>+86(0)18982079737</b></p>
<p>TEL: <b>+86（028）85170675</b></p>
<p><span>Mobile: <b>+86(0)18982079737</b></span> <span>TEL: <b>+86（028）85170675</b></span></p>
<p>Email: <b class="blue">zhongwxim@outlook.com</b></p>
<div class="icon">
<a href="https://twitter.com/zhongweixing/" title="Zhong WeiXing Twitter"><i class="icon-tuite"></i></a>
......
dist/html/exhibition.html
......@@ -23,8 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -90,8 +90,7 @@
<a href="javascript: void(0)" class="am-close am-close-spin" data-am-modal-close onclick="activeStyle()" >&times;</a>
</div>
<div class="am-modal-bd">
<p>Mobile: <b>+86(0)18982079737</b></p>
<p>TEL: <b>+86（028）85170675</b></p>
<p><span>Mobile: <b>+86(0)18982079737</b></span> <span>TEL: <b>+86（028）85170675</b></span></p>
<p>Email: <b class="blue">zhongwxim@outlook.com</b></p>
<div class="icon">
<a href="https://twitter.com/zhongweixing/" title="Zhong WeiXing Twitter"><i class="icon-tuite"></i></a>
......@@ -119,9 +118,9 @@
</li>
<li>
<div class="am-gallery-item">
<a href="./publicationsDetail.html"">
<a href="./publicationsDetail.html">
<img class="lazy" data-original="../images/testImg2.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">portfolioportfolioportfolioportfolioportfolioportfolioportfoliportfolioportfolioportfolioportfolioportfolioo</h3>
</a>
</div>
</li>
......@@ -129,7 +128,7 @@
<div class="am-gallery-item">
<a href="./publicationsDetail.html">
<img class="lazy" data-original="../images/testImg3.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">《斯里兰卡影像日记·化相重合的瞬间》</h3>
</a>
</div>
</li>
......@@ -137,7 +136,7 @@
<div class="am-gallery-item">
<a href="./publicationsDetail.html">
<img class="lazy" data-original="../images/testImg2.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">《斯里兰卡影像日记·化相重合的瞬间化相重合的瞬间·化相重合的瞬间》</h3>
</a>
</div>
</li>
......
dist/html/index.html
......@@ -23,8 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -107,7 +107,8 @@
autoplaySpeed: 5000,
pauseOnHover: false,
speed: 500,
arrows: false
arrows: false,
fade: true
});
</script>
......
dist/html/news.html
......@@ -22,8 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -92,8 +92,7 @@
<a href="javascript: void(0)" class="am-close am-close-spin" data-am-modal-close onclick="activeStyle()" >&times;</a>
</div>
<div class="am-modal-bd">
<p>Mobile: <b>+86(0)18982079737</b></p>
<p>TEL: <b>+86（028）85170675</b></p>
<p><span>Mobile: <b>+86(0)18982079737</b></span> <span>TEL: <b>+86（028）85170675</b></span></p>
<p>Email: <b class="blue">zhongwxim@outlook.com</b></p>
<div class="icon">
<a href="https://twitter.com/zhongweixing/" title="Zhong WeiXing Twitter"><i class="icon-tuite"></i></a>
......
dist/html/portfolio.html
......@@ -22,8 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -89,8 +89,7 @@
<a href="javascript: void(0)" class="am-close am-close-spin" data-am-modal-close onclick="activeStyle()" >&times;</a>
</div>
<div class="am-modal-bd">
<p>Mobile: <b>+86(0)18982079737</b></p>
<p>TEL: <b>+86（028）85170675</b></p>
<p><span>Mobile: <b>+86(0)18982079737</b></span> <span>TEL: <b>+86（028）85170675</b></span></p>
<p>Email: <b class="blue">zhongwxim@outlook.com</b></p>
<div class="icon">
<a href="https://twitter.com/zhongweixing/" title="Zhong WeiXing Twitter"><i class="icon-tuite"></i></a>
......@@ -113,7 +112,7 @@
<div class="am-gallery-item">
<a href="./portfolioDetail.html">
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
</a>
</div>
</li>
......
dist/html/portfolioDetail.html
......@@ -22,8 +22,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -55,7 +55,7 @@
</head>
<body>
<!--返回上一页-->
<div class="returnCon">
<!--<div class="returnCon">
<span class="left"></span>
<span class="right"><a class="prevBtn" href="./portfolio.html">
<i class="icon-closeIco"></i>
......@@ -63,36 +63,52 @@
<i class="icon-closeIco3"></i>
</a>
</span>
</div>
</div>-->
<div class="am-container">
<div class="am-slider am-container marginTop">
<div class="imgIntro">
<h3>Front Cover: 3D Visualization for the Coastal Shallow Strata</h3>
<p>g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
</p>
</div>
<div class="am-slider am-container">
<ul class="slider lazy portfolioSiles" id="portfolioDel">
<li>
<div>
<img class="image" data-lazy="http://www.zhongweixing.com/media/gallery/1/3321bfddec503e98215f89cf86935d13.jpg"/>
</div>
<div class="imgIntro">
<h3>Front Cover: 3D Visualization for the Coastal Shallow Strata</h3>
<p>g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
</p>
</div>
</li>
<li>
<div>
<img class="image" data-lazy="../images/testImg7.jpg" />
<img class="image" data-lazy="http://zh.zhongweixing.com/media/gallery/1/855185c97ebf2d2f7b5cbb5a20b6018f.jpg" />
</div>
<div class="imgIntro">
<h3>Front Cover:llow Strata</h3>
<p>g with a little CSS to make it lkipedia pages for those albums.
</p>
</div>
</li>
<li>
<div>
<img class="image" data-lazy="http://zh.zhongweixing.com/media/gallery/1/a7817b09f1a8472efceca68de011d66e.jpg" />
</div>
<div class="imgIntro">
<h3>Front Cover: 3D Vista</h3>
<p>g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
a little CSS to make it look nicer, it includes the album cover ima
</p>
</div>
</li>
<li>
<div>
<img class="image" data-lazy="http://zh.zhongweixing.com/media/gallery/1/b2e482d1cf35054549616a36f97b390f.jpg" />
</div>
<div class="imgIntro">
<h3>f扫然后就给你踢人了</h3>
<p>日发售的不好吧霍比特人发的还不如刚发现那边突然发生烦的很吧通过地方</p>
</div>
</li>
</ul>
</div>
......@@ -104,9 +120,6 @@
slidesToShow: 1,
slidesToScroll: 1,
speed: 500
/* init:function(){
$("img.image").attr("style","margin-top:100px;")
}*/
});
</script>
</body>
......
dist/html/publications.html
......@@ -23,8 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -90,8 +90,7 @@
<a href="javascript: void(0)" class="am-close am-close-spin" data-am-modal-close onclick="activeStyle()" >&times;</a>
</div>
<div class="am-modal-bd">
<p>Mobile: <b>+86(0)18982079737</b></p>
<p>TEL: <b>+86（028）85170675</b></p>
<p><span>Mobile: <b>+86(0)18982079737</b></span> <span>TEL: <b>+86（028）85170675</b></span></p>
<p>Email: <b class="blue">zhongwxim@outlook.com</b></p>
<div class="icon">
<a href="https://twitter.com/zhongweixing/" title="Zhong WeiXing Twitter"><i class="icon-tuite"></i></a>
......@@ -116,7 +115,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">《斯里兰卡影像日记·化相重合的瞬间》</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -127,7 +126,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">《秘鲁影像日记·山巅上的乌兹托克》</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -138,7 +137,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">"Peru Diaries - on a hill" Uzi Amsterdam</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -149,7 +148,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">"Sri Lanka video diary of the coincidence of the moment"</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -199,25 +198,5 @@
</a>
</div>
<input id="linkTitle" value="publications" />
<!--<script>
var winWidth=$(window).width();
function autoHeight(obj,bi){
var imgHeight;
var Width= $(obj).find("li").width();
imgHeight=parseInt(Width*bi);
$(obj).find('li').height(imgHeight);
}
$(window).resize(function() {
if(winWidth>414){
autoHeight('#publicationsUl',1.35);
}
});
window.onload = function(){
if(winWidth>414){
autoHeight('#publicationsUl',1.35);
}
}
</script>-->
</body>
</html>
\ No newline at end of file
dist/html/publicationsDetail.html
......@@ -23,8 +23,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......@@ -78,10 +78,11 @@
</div>
<p>
Arago club and Trump's relatives described,<a>trfyhyrht</a> the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," sai <img class="lazy" data-original="../images/testImg1.png" alt=""/>
"That house has never been seriously damaged," sai <img class="lazy" data-original="../images/testImg1.png" alt="" />
</p>
</div>
</div>
<!--回到顶部-->
<div data-am-widget="gotop" class="am-gotop am-gotop-fixed" >
<a href="#top" title="回到顶部">
......@@ -93,12 +94,22 @@
<!--请注意 不同页面的的详情页 需对应不同的value值-->
<input id="linkTitle" value="publications" />
<!-- <input id="linkTitle" value="publications" />
<input id="linkTitle" value="exhibition" />
<input id="linkTitle" value="project" />
<script>
$(window).scroll(function(){
var scrollTop = parseInt($(window).scrollTop());
var scrollHeight = parseInt($(document).height());
var windowHeight =parseInt( $(window).height());
var bottom = parseInt(scrollTop + windowHeight);
if( bottom == scrollHeight){
$(".prevBtn").css("opacity",1);
}else{
$(".prevBtn").css("opacity",0);
}
})
<input id="linkTitle" value="news" />-->
/* setTimeout(function(){ //使用 setTimeout（）方法设定定时2000毫秒
$(".prevBtn").css("opacity",1);
},2000)*/;
</script>
</body>
</html>
\ No newline at end of file
dist/images/leftIcon.png
dist/images/leftIcon.png

57 KB | W: | H:

dist/images/leftIcon.png

1.78 KB | W: | H:

dist/images/leftIcon.png
dist/images/leftIcon.png
dist/images/leftIcon.png
dist/images/leftIcon.png
  • 2-up
  • Swipe
  • Onion skin
dist/images/rightIcon.png
dist/images/rightIcon.png

58.5 KB | W: | H:

dist/images/rightIcon.png

1.3 KB | W: | H:

dist/images/rightIcon.png
dist/images/rightIcon.png
dist/images/rightIcon.png
dist/images/rightIcon.png
  • 2-up
  • Swipe
  • Onion skin
dist/js/public.js
......@@ -20,6 +20,12 @@ function autoHeight2(obj,bi){
imgHeight=parseInt(Width*bi);
$(obj).parents('li').height(imgHeight);
}
function autoHeightPub(obj,bi){
var imgHeight;
var Width= $(obj).find("li").width();
imgHeight=parseInt(Width*bi);
$(obj).find('img').height(imgHeight);
}
function entryH(obj){
$(obj).height(winHeight);
}
......@@ -46,7 +52,7 @@ $(function(){
autoHeight('#portfolioUl',0.667);
autoHeight('#exhibitionsUl',0.55);
autoHeight('#exDetail',1.08);
autoHeight('#publicationsUl',1.35);
autoHeightPub('#publicationsUl',1);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
}
......@@ -73,7 +79,7 @@ $(window).resize(function() {
autoHeight('#portfolioUl',0.667);
autoHeight('#exhibitionsUl',0.55);
autoHeight('#exDetail',1.08);
autoHeight('#publicationsUl',1.35);
autoHeightPub('#publicationsUl',1);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
}
......
dist/js/public.min.js
function autoHeight(i,e){var t,a=$(i).find("li").width();t=parseInt(a*e),$(i).find("li").height(t)}function newsHeight(i,e){var t,a=$(i).find("div.thumbnail"),l=a.width();t=parseInt(l*e),$(i).find("div.thumbnail,div.brief").height(t)}function autoHeight2(i,e){var t,a=$(i).eq(0).width();t=parseInt(a*e),$(i).parents("li").height(t)}function entryH(i){$(i).height(winHeight)}var winHeight=document.documentElement.clientHeight,winWidth=document.documentElement.clientWidth;$(function(){var i=$("#linkTitle").val(),e=$("#collapse-head").find("li");$("#contact-modal").css("display");e.siblings("li").removeClass("am-active"),"portfolio"==i?e.eq(0).addClass("am-active").siblings("li").removeClass("am-active"):"exhibition"==i?e.eq(1).addClass("am-active").siblings("li").removeClass("am-active"):"publications"==i?e.eq(2).addClass("am-active").siblings("li").removeClass("am-active"):"news"==i?e.eq(3).addClass("am-active").siblings("li").removeClass("am-active"):"biography"==i&&e.eq(4).addClass("am-active").siblings("li").removeClass("am-active"),winWidth>414&&(autoHeight("#portfolioUl",.667),autoHeight("#exhibitionsUl",.55),autoHeight("#exDetail",1.08),autoHeight("#publicationsUl",1.35),newsHeight("#news",1),autoHeight2(".imgShow",1)),$(".indexSlide li").css("max-height",winHeight),$("img.lazy").lazyload({placeholder:"./images/transparent.gif",threshold:100,effect:"fadeIn",event:"scroll",skip_invisible:!1})}),$(window).resize(function(){winWidth>414&&(autoHeight("#portfolioUl",.667),autoHeight("#exhibitionsUl",.55),autoHeight("#exDetail",1.08),autoHeight("#publicationsUl",1.35),newsHeight("#news",1),autoHeight2(".imgShow",1))});
\ No newline at end of file
var winHeight=document.documentElement.clientHeight;var winWidth=document.documentElement.clientWidth;function autoHeight(obj,bi){var imgHeight;var Width=$(obj).find("li").width();imgHeight=parseInt(Width*bi);$(obj).find("li").height(imgHeight)}function newsHeight(obj,bi){var imgHeight;var thumbnail=$(obj).find("div.thumbnail");var Width=thumbnail.width();imgHeight=parseInt(Width*bi);$(obj).find("div.thumbnail,div.brief").height(imgHeight)}function autoHeight2(obj,bi){var imgHeight;var Width=$(obj).eq(0).width();imgHeight=parseInt(Width*bi);$(obj).parents("li").height(imgHeight)}function autoHeightPub(obj,bi){var imgHeight;var Width=$(obj).find("li").width();imgHeight=parseInt(Width*bi);$(obj).find("img").height(imgHeight)}function entryH(obj){$(obj).height(winHeight)}$(function(){var title=$("#linkTitle").val();var lis=$("#collapse-head").find("li");var titleVal=$("#contact-modal").css("display");lis.siblings("li").removeClass("am-active");if(title=="portfolio"){lis.eq(0).addClass("am-active").siblings("li").removeClass("am-active")}else{if(title=="exhibition"){lis.eq(1).addClass("am-active").siblings("li").removeClass("am-active")}else{if(title=="publications"){lis.eq(2).addClass("am-active").siblings("li").removeClass("am-active")}else{if(title=="news"){lis.eq(3).addClass("am-active").siblings("li").removeClass("am-active")}else{if(title=="biography"){lis.eq(4).addClass("am-active").siblings("li").removeClass("am-active")}}}}}if(winWidth>414){autoHeight("#portfolioUl",0.667);autoHeight("#exhibitionsUl",0.55);autoHeight("#exDetail",1.08);autoHeightPub("#publicationsUl",1);newsHeight("#news",1);autoHeight2(".imgShow",1)}$(".indexSlide li").css("max-height",winHeight);$("img.lazy").lazyload({placeholder:"../images/transparent.gif",threshold:100,effect:"fadeIn",event:"scroll",skip_invisible:false})});$(window).resize(function(){if(winWidth>414){autoHeight("#portfolioUl",0.667);autoHeight("#exhibitionsUl",0.55);autoHeight("#exDetail",1.08);autoHeightPub("#publicationsUl",1);newsHeight("#news",1);autoHeight2(".imgShow",1)}});
\ No newline at end of file
src/assets/js/slickPort.js
/*
_ _ _ _
_ _ _ _
___| (_) ___| | __ (_)___
/ __| | |/ __| |/ / | / __|
\__ \ | | (__| < _ | \__ \
|___/_|_|\___|_|\_(_)/ |___/
|__/
/ __| | |/ __| |/ / | / __|
\__ \ | | (__| < _ | \__ \
|___/_|_|\___|_|\_(_)/ |___/
|__/
Version: 1.6.0
Author: Ken Wheeler
Author: Ken Wheeler
Website: http://kenwheeler.github.io
Docs: http://kenwheeler.github.io/slick
Repo: http://github.com/kenwheeler/slick
Issues: http://github.com/kenwheeler/slick/issues
Docs: http://kenwheeler.github.io/slick
Repo: http://github.com/kenwheeler/slick
Issues: http://github.com/kenwheeler/slick/issues
*/
/* global window, document, define, jQuery, setInterval, clearInterval */
......@@ -560,7 +560,7 @@
slidesPerSection = _.options.slidesPerRow * _.options.rows;
numOfSlides = Math.ceil(
originalSlides.length / slidesPerSection
originalSlides.length / slidesPerSection
);
for(a = 0; a < numOfSlides; a++){
......@@ -1009,21 +1009,21 @@
_.$slider
.off('focus.slick blur.slick')
.on('focus.slick blur.slick',
'*:not(.slick-arrow)', function(event) {
'*:not(.slick-arrow)', function(event) {
event.stopImmediatePropagation();
var $sf = $(this);
event.stopImmediatePropagation();
var $sf = $(this);
setTimeout(function() {
setTimeout(function() {
if( _.options.pauseOnFocus ) {
_.focussed = $sf.is(':focus');
_.autoPlay();
}
if( _.options.pauseOnFocus ) {
_.focussed = $sf.is(':focus');
_.autoPlay();
}
}, 0);
}, 0);
});
});
};
Slick.prototype.getCurrent = Slick.prototype.slickCurrentSlide = function() {
......@@ -1315,15 +1315,15 @@
if (_.options.arrows === true && _.slideCount > _.options.slidesToShow) {
_.$prevArrow
.off('click.slick')
.on('click.slick', {
.off('click.slick')
.on('click.slick', {
message: 'previous'
}, _.changeSlide);
}, _.changeSlide);
_.$nextArrow
.off('click.slick')
.on('click.slick', {
.off('click.slick')
.on('click.slick', {
message: 'next'
}, _.changeSlide);
}, _.changeSlide);
}
};
......@@ -1428,7 +1428,7 @@
Slick.prototype.keyHandler = function(event) {
var _ = this;
//Dont slide if the cursor is inside the form fields and arrow keys are pressed
//Dont slide if the cursor is inside the form fields and arrow keys are pressed
if(!event.target.tagName.match('TEXTAREA|INPUT|SELECT')) {
if (event.keyCode === 37 && _.options.accessibility === true) {
_.changeSlide({
......@@ -1486,23 +1486,18 @@
var bi=(realHeight / realWidth).toFixed(2);
var mH=parseInt(windowW * bi);
var Top=parseInt((windowH - realHeight)/2);
console.log(windowW);
console.log(realWidth);
//如果真实的宽度大于浏览器的宽度就按照100%显示
if (realWidth >= windowW && realWidth >= realHeight) {
if(mH>windowH){
console.log("11");
image.attr('style','max-height:'+windowH+'px;width:auto');
}else{
console.log("12");
image.attr('style','margin-top:'+Top+'max-width:'+windowW+'px;height:auto');
var marginTop=parseInt((windowH - mH)/2);
image.attr('style','margin-top:'+marginTop+'px;max-width:'+windowW+'px;height:auto');
}
}else if(realHeight >= windowH && realWidth < realHeight ){//如果小于浏览器的宽度按照原尺寸显示
console.log("22");
image.attr('style','max-height:'+windowH+'px;width:auto;');
}else{
console.log("23");
image.attr('style','margin-top:'+Top+'px;width:auto; height:auto;');
}
}
......@@ -2024,102 +2019,102 @@
};
Slick.prototype.setOption =
Slick.prototype.slickSetOption = function() {
Slick.prototype.slickSetOption = function() {
/**
* accepts arguments in format of:
*
* - for changing a single option's value:
* .slick("setOption", option, value, refresh )
*
* - for changing a set of responsive options:
* .slick("setOption", 'responsive', [{}, ...], refresh )
*
* - for updating multiple values at once (not responsive)
* .slick("setOption", { 'option': value, ... }, refresh )
*/
/**
* accepts arguments in format of:
*
* - for changing a single option's value:
* .slick("setOption", option, value, refresh )
*
* - for changing a set of responsive options:
* .slick("setOption", 'responsive', [{}, ...], refresh )
*
* - for updating multiple values at once (not responsive)
* .slick("setOption", { 'option': value, ... }, refresh )
*/
var _ = this, l, item, option, value, refresh = false, type;
var _ = this, l, item, option, value, refresh = false, type;
if( $.type( arguments[0] ) === 'object' ) {
if( $.type( arguments[0] ) === 'object' ) {
option = arguments[0];
refresh = arguments[1];
type = 'multiple';
option = arguments[0];
refresh = arguments[1];
type = 'multiple';
} else if ( $.type( arguments[0] ) === 'string' ) {
} else if ( $.type( arguments[0] ) === 'string' ) {
option = arguments[0];
value = arguments[1];
refresh = arguments[2];
option = arguments[0];
value = arguments[1];
refresh = arguments[2];
if ( arguments[0] === 'responsive' && $.type( arguments[1] ) === 'array' ) {
if ( arguments[0] === 'responsive' && $.type( arguments[1] ) === 'array' ) {
type = 'responsive';
type = 'responsive';
} else if ( typeof arguments[1] !== 'undefined' ) {
} else if ( typeof arguments[1] !== 'undefined' ) {
type = 'single';
type = 'single';
}
}
}
if ( type === 'single' ) {
if ( type === 'single' ) {
_.options[option] = value;
_.options[option] = value;
} else if ( type === 'multiple' ) {
} else if ( type === 'multiple' ) {
$.each( option , function( opt, val ) {
$.each( option , function( opt, val ) {
_.options[opt] = val;
_.options[opt] = val;
});
});
} else if ( type === 'responsive' ) {
} else if ( type === 'responsive' ) {
for ( item in value ) {
for ( item in value ) {
if( $.type( _.options.responsive ) !== 'array' ) {
if( $.type( _.options.responsive ) !== 'array' ) {
_.options.responsive = [ value[item] ];
_.options.responsive = [ value[item] ];
} else {
} else {
l = _.options.responsive.length-1;
l = _.options.responsive.length-1;
// loop through the responsive object and splice out duplicates.
while( l >= 0 ) {
// loop through the responsive object and splice out duplicates.
while( l >= 0 ) {
if( _.options.responsive[l].breakpoint === value[item].breakpoint ) {
_.options.responsive.splice(l,1);
if( _.options.responsive[l].breakpoint === value[item].breakpoint ) {
}
_.options.responsive.splice(l,1);
l--;
}
l--;
_.options.responsive.push( value[item] );
}
_.options.responsive.push( value[item] );
}
}
}
if ( refresh ) {
if ( refresh ) {
_.unload();
_.reinit();
_.unload();
_.reinit();
}
}
};
};
Slick.prototype.setPosition = function() {
......@@ -2328,7 +2323,7 @@
}
for (i = _.slideCount; i > (_.slideCount -
infiniteCount); i -= 1) {
infiniteCount); i -= 1) {
slideIndex = i - 1;
$(_.$slides[slideIndex]).clone(true).attr('id', '')
.attr('data-slick-index', slideIndex - _.slideCount)
......
src/images/icon/closeIco.png
src/images/icon/closeIco.png

30.1 KB | W: | H:

src/images/icon/closeIco.png

1.29 KB | W: | H:

src/images/icon/closeIco.png
src/images/icon/closeIco.png
src/images/icon/closeIco.png
src/images/icon/closeIco.png
  • 2-up
  • Swipe
  • Onion skin
src/images/icon/closeIco2.png
src/images/icon/closeIco2.png

22.1 KB | W: | H:

src/images/icon/closeIco2.png

1.42 KB | W: | H:

src/images/icon/closeIco2.png
src/images/icon/closeIco2.png
src/images/icon/closeIco2.png
src/images/icon/closeIco2.png
  • 2-up
  • Swipe
  • Onion skin
src/images/icon/closeIco3.png
src/images/icon/closeIco3.png

27.4 KB | W: | H:

src/images/icon/closeIco3.png

14.8 KB | W: | H:

src/images/icon/closeIco3.png
src/images/icon/closeIco3.png
src/images/icon/closeIco3.png
src/images/icon/closeIco3.png
  • 2-up
  • Swipe
  • Onion skin
src/images/leftIcon.png
src/images/leftIcon.png

57 KB | W: | H:

src/images/leftIcon.png

1.78 KB | W: | H:

src/images/leftIcon.png
src/images/leftIcon.png
src/images/leftIcon.png
src/images/leftIcon.png
  • 2-up
  • Swipe
  • Onion skin
src/images/rightIcon.png
src/images/rightIcon.png

58.5 KB | W: | H:

src/images/rightIcon.png

1.3 KB | W: | H:

src/images/rightIcon.png
src/images/rightIcon.png
src/images/rightIcon.png
src/images/rightIcon.png
  • 2-up
  • Swipe
  • Onion skin
src/js/public.js
......@@ -20,6 +20,12 @@ function autoHeight2(obj,bi){
imgHeight=parseInt(Width*bi);
$(obj).parents('li').height(imgHeight);
}
function autoHeightPub(obj,bi){
var imgHeight;
var Width= $(obj).find("li").width();
imgHeight=parseInt(Width*bi);
$(obj).find('img').height(imgHeight);
}
function entryH(obj){
$(obj).height(winHeight);
}
......@@ -46,7 +52,7 @@ $(function(){
autoHeight('#portfolioUl',0.667);
autoHeight('#exhibitionsUl',0.55);
autoHeight('#exDetail',1.08);
autoHeight('#publicationsUl',1.35);
autoHeightPub('#publicationsUl',1);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
}
......@@ -73,7 +79,7 @@ $(window).resize(function() {
autoHeight('#portfolioUl',0.667);
autoHeight('#exhibitionsUl',0.55);
autoHeight('#exDetail',1.08);
autoHeight('#publicationsUl',1.35);
autoHeightPub('#publicationsUl',1);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
}
......
src/less/common/base.less
......@@ -6,29 +6,22 @@
box-sizing: border-box;
}
html {
font-family: sans-serif;
font-family: Microsoft YaHei, Helvetica, Tahoma, Arial, Hiragino Sans GB, Hiragino Sans GB W3, STXihei, STHeiti, Heiti, SimSun, sansSerif;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
body {
font-family: "Helvetica Neue", Helvetica, STHeiTi, sans-serif;
font-family: Microsoft YaHei, Helvetica, Tahoma, Arial, Hiragino Sans GB, Hiragino Sans GB W3, STXihei, STHeiti, Heiti, SimSun, sansSerif;
font-size: 14px;
line-height: 1.5;
background: #f9f9f9;
color: #353535;
}
/* Remove default margin */
body,
h1,
h2,
h3,
h4,
h5,
h6,
ul,
ol,
p {
html, 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
{
font-family: Microsoft YaHei, Helvetica, Tahoma, Arial, Hiragino Sans GB, Hiragino Sans GB W3, STXihei, STHeiti, Heiti, SimSun, sansSerif;
padding: 0;
margin: 0;
font-weight: 400;
......@@ -96,7 +89,6 @@ input,
optgroup,
select,
textarea {
font-family: sans-serif; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
......
src/pages/components/header.html
......@@ -33,8 +33,7 @@
<a href="javascript: void(0)" class="am-close am-close-spin" data-am-modal-close onclick="activeStyle()" >&times;</a>
</div>
<div class="am-modal-bd">
<p>Mobile: <b>+86(0)18982079737</b></p>
<p>TEL: <b>+86（028）85170675</b></p>
<p><span>Mobile: <b>+86(0)18982079737</b></span> <span>TEL: <b>+86（028）85170675</b></span></p>
<p>Email: <b class="blue">zhongwxim@outlook.com</b></p>
<div class="icon">
<a href="https://twitter.com/zhongweixing/" title="Zhong WeiXing Twitter"><i class="icon-tuite"></i></a>
......
src/pages/components/publicHead.html
......@@ -13,8 +13,8 @@
<link rel="stylesheet" href="../assets/css/amazeui.min.css">
<link rel="stylesheet" href="../assets/css/amazeui.slick.min.css">
<link rel="stylesheet" href="../css/style.min.css">
<!--<link rel="stylesheet" href="../css/style.min.css">-->
<link rel="stylesheet" href="../css/style.css">
<!--[if (gte IE 9)|!(IE)]><!-->
<script src="../assets/js/jquery.min.js"></script>
<script src="../js/html5shiv.min.js"></script>
......
src/pages/exhibition.ejs
......@@ -25,9 +25,9 @@
</li>
<li>
<div class="am-gallery-item">
<a href="./publicationsDetail.html"">
<a href="./publicationsDetail.html">
<img class="lazy" data-original="../images/testImg2.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">portfolioportfolioportfolioportfolioportfolioportfolioportfoliportfolioportfolioportfolioportfolioportfolioo</h3>
</a>
</div>
</li>
......@@ -35,7 +35,7 @@
<div class="am-gallery-item">
<a href="./publicationsDetail.html">
<img class="lazy" data-original="../images/testImg3.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">《斯里兰卡影像日记·化相重合的瞬间》</h3>
</a>
</div>
</li>
......@@ -43,7 +43,7 @@
<div class="am-gallery-item">
<a href="./publicationsDetail.html">
<img class="lazy" data-original="../images/testImg2.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">《斯里兰卡影像日记·化相重合的瞬间化相重合的瞬间·化相重合的瞬间》</h3>
</a>
</div>
</li>
......
src/pages/index.ejs
......@@ -58,7 +58,8 @@
autoplaySpeed: 5000,
pauseOnHover: false,
speed: 500,
arrows: false
arrows: false,
fade: true
});
</script>
......
src/pages/portfolio.ejs
......@@ -19,7 +19,7 @@
<div class="am-gallery-item">
<a href="./portfolioDetail.html">
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
<h3 class="am-gallery-title">portfolio</h3>
<h3 class="am-gallery-title">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
</a>
</div>
</li>
......
src/pages/portfolioDetail.ejs
......@@ -12,7 +12,7 @@
</head>
<body>
<!--返回上一页-->
<div class="returnCon">
<!--<div class="returnCon">
<span class="left"></span>
<span class="right"><a class="prevBtn" href="./portfolio.html">
<i class="icon-closeIco"></i>
......@@ -20,36 +20,52 @@
<i class="icon-closeIco3"></i>
</a>
</span>
</div>
</div>-->
<div class="am-container">
<div class="am-slider am-container marginTop">
<div class="imgIntro">
<h3>Front Cover: 3D Visualization for the Coastal Shallow Strata</h3>
<p>g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
</p>
</div>
<div class="am-slider am-container">
<ul class="slider lazy portfolioSiles" id="portfolioDel">
<li>
<div>
<img class="image" data-lazy="http://www.zhongweixing.com/media/gallery/1/3321bfddec503e98215f89cf86935d13.jpg"/>
</div>
<div class="imgIntro">
<h3>Front Cover: 3D Visualization for the Coastal Shallow Strata</h3>
<p>g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
</p>
</div>
</li>
<li>
<div>
<img class="image" data-lazy="../images/testImg7.jpg" />
<img class="image" data-lazy="http://zh.zhongweixing.com/media/gallery/1/855185c97ebf2d2f7b5cbb5a20b6018f.jpg" />
</div>
<div class="imgIntro">
<h3>Front Cover:llow Strata</h3>
<p>g with a little CSS to make it lkipedia pages for those albums.
</p>
</div>
</li>
<li>
<div>
<img class="image" data-lazy="http://zh.zhongweixing.com/media/gallery/1/a7817b09f1a8472efceca68de011d66e.jpg" />
</div>
<div class="imgIntro">
<h3>Front Cover: 3D Vista</h3>
<p>g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
g with a little CSS to make it look nicer, it includes the album cover images, and the album names link to the Wikipedia pages for those albums.
a little CSS to make it look nicer, it includes the album cover ima
</p>
</div>
</li>
<li>
<div>
<img class="image" data-lazy="http://zh.zhongweixing.com/media/gallery/1/b2e482d1cf35054549616a36f97b390f.jpg" />
</div>
<div class="imgIntro">
<h3>f扫然后就给你踢人了</h3>
<p>日发售的不好吧霍比特人发的还不如刚发现那边突然发生烦的很吧通过地方</p>
</div>
</li>
</ul>
</div>
......@@ -61,9 +77,6 @@
slidesToShow: 1,
slidesToScroll: 1,
speed: 500
/* init:function(){
$("img.image").attr("style","margin-top:100px;")
}*/
});
</script>
</body>
......
src/pages/publications.ejs
......@@ -22,7 +22,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">《斯里兰卡影像日记·化相重合的瞬间》</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -33,7 +33,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">《秘鲁影像日记·山巅上的乌兹托克》</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -44,7 +44,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">"Peru Diaries - on a hill" Uzi Amsterdam</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -55,7 +55,7 @@
<img class="lazy" data-original="../images/testImg1.png" alt=""/>
</div>
<div class="publicationsIntro">
<h3 class="">portfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolioportfolio</h3>
<h3 class="">"Sri Lanka video diary of the coincidence of the moment"</h3>
<p>拍摄时间：2016/10/26</p>
</div>
</a>
......@@ -99,25 +99,5 @@
<% include ./components/goTop.html %>
<input id="linkTitle" value="publications" />
<!--<script>
var winWidth=$(window).width();
function autoHeight(obj,bi){
var imgHeight;
var Width= $(obj).find("li").width();
imgHeight=parseInt(Width*bi);
$(obj).find('li').height(imgHeight);
}
$(window).resize(function() {
if(winWidth>414){
autoHeight('#publicationsUl',1.35);
}
});
window.onload = function(){
if(winWidth>414){
autoHeight('#publicationsUl',1.35);
}
}
</script>-->
</body>
</html>
\ No newline at end of file
src/pages/publicationsDetail.ejs
......@@ -35,21 +35,32 @@
</div>
<p>
Arago club and Trump's relatives described,<a>trfyhyrht</a> the damage condition of the property is not so bad. Trump's former Butler Anthony Seneca recalled, "Wilma" hurricane passes behind the horse Arago club house many trees were blown down, but the house itself is just blown away some tiles.
"That house has never been seriously damaged," sai <img class="lazy" data-original="../images/testImg1.png" alt=""/>
"That house has never been seriously damaged," sai <img class="lazy" data-original="../images/testImg1.png" alt="" />
</p>
</div>
</div>
<% include ./components/goTop.html %>
<!--请注意 不同页面的的详情页 需对应不同的value值-->
<input id="linkTitle" value="publications" />
<!-- <input id="linkTitle" value="publications" />
<input id="linkTitle" value="exhibition" />
<input id="linkTitle" value="project" />
<script>
$(window).scroll(function(){
var scrollTop = parseInt($(window).scrollTop());
var scrollHeight = parseInt($(document).height());
var windowHeight =parseInt( $(window).height());
var bottom = parseInt(scrollTop + windowHeight);
if( bottom == scrollHeight){
$(".prevBtn").css("opacity",1);
}else{
$(".prevBtn").css("opacity",0);
}
})
<input id="linkTitle" value="news" />-->
/* setTimeout(function(){ //使用 setTimeout（）方法设定定时2000毫秒
$(".prevBtn").css("opacity",1);
},2000)*/;
</script>
</body>
</html>
\ 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 to comment