Skip to content

Z
ZhongWeiXin
Commit 7c5e73ef by 邓丽
Options

titleFix

parent d8e7e9c6
Showing with 19 additions and 39 deletions
dist/css/style.css
......@@ -1012,6 +1012,8 @@ a.cd-read-more:hover {
width: 20%;
line-height: 20px;
margin: 10px 5%;
padding: 15px;
background: rgba(0, 0, 0, 0.1);
}
.imgIntro h3 {
font-size: 2.2rem;
......@@ -1040,7 +1042,7 @@ a.cd-read-more:hover {
height: 100%;
width: 100%;
z-index: 8;
background: rgba(0, 0, 0, 0.2);
background: rgba(0, 0, 0, 0.3);
}
.title {
color: #fff;
......@@ -2091,5 +2093,5 @@ a.cd-read-more:hover {
}
}
.am-dimmer {
background-color: rgba(255, 255, 255, 0.3);
background-color: rgba(0, 0, 0, 0.5);
}
dist/html/biography.html
......@@ -67,7 +67,7 @@
<li class=""><a href="./portfolio.html">Portfolio</a></li>
<li><a href="./exhibition.html">Exhibitions</a></li>
<li><a href="./publications.html">Publications</a></li>
<li><a href="./project.html" >Project</a></li>
<!-- <li><a href="./project.html" >Project</a></li>-->
<li><a href="./news.html">News</a></li>
<li><a href="./biography.html">Biography</a></li>
<li onclick="n=$('.am-active').index();$(this).addClass('am-active').siblings().removeClass('am-active');" id="contact"><a data-am-modal="{target: '#contact-modal'}">Contact</a></li>
......
dist/html/exhibition.html
......@@ -64,7 +64,7 @@
<li class=""><a href="./portfolio.html">Portfolio</a></li>
<li><a href="./exhibition.html">Exhibitions</a></li>
<li><a href="./publications.html">Publications</a></li>
<li><a href="./project.html" >Project</a></li>
<!-- <li><a href="./project.html" >Project</a></li>-->
<li><a href="./news.html">News</a></li>
<li><a href="./biography.html">Biography</a></li>
<li onclick="n=$('.am-active').index();$(this).addClass('am-active').siblings().removeClass('am-active');" id="contact"><a data-am-modal="{target: '#contact-modal'}">Contact</a></li>
......
dist/html/news.html
......@@ -66,7 +66,7 @@
<li class=""><a href="./portfolio.html">Portfolio</a></li>
<li><a href="./exhibition.html">Exhibitions</a></li>
<li><a href="./publications.html">Publications</a></li>
<li><a href="./project.html" >Project</a></li>
<!-- <li><a href="./project.html" >Project</a></li>-->
<li><a href="./news.html">News</a></li>
<li><a href="./biography.html">Biography</a></li>
<li onclick="n=$('.am-active').index();$(this).addClass('am-active').siblings().removeClass('am-active');" id="contact"><a data-am-modal="{target: '#contact-modal'}">Contact</a></li>
......
dist/html/portfolio.html
......@@ -62,7 +62,7 @@
<li class=""><a href="./portfolio.html">Portfolio</a></li>
<li><a href="./exhibition.html">Exhibitions</a></li>
<li><a href="./publications.html">Publications</a></li>
<li><a href="./project.html" >Project</a></li>
<!-- <li><a href="./project.html" >Project</a></li>-->
<li><a href="./news.html">News</a></li>
<li><a href="./biography.html">Biography</a></li>
<li onclick="n=$('.am-active').index();$(this).addClass('am-active').siblings().removeClass('am-active');" id="contact"><a data-am-modal="{target: '#contact-modal'}">Contact</a></li>
......
dist/html/portfolioDetail.html
......@@ -62,7 +62,6 @@
<div>
<img src="../images/testImg4.png" />
</div>
<div class="bgImg"></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.
......@@ -82,7 +81,6 @@
<div>
<img src="../images/testImg1.png" />
</div>
<div class="bgImg"></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.</p>
......
dist/html/project.html
......@@ -65,7 +65,7 @@
<li class=""><a href="./portfolio.html">Portfolio</a></li>
<li><a href="./exhibition.html">Exhibitions</a></li>
<li><a href="./publications.html">Publications</a></li>
<li><a href="./project.html" >Project</a></li>
<!-- <li><a href="./project.html" >Project</a></li>-->
<li><a href="./news.html">News</a></li>
<li><a href="./biography.html">Biography</a></li>
<li onclick="n=$('.am-active').index();$(this).addClass('am-active').siblings().removeClass('am-active');" id="contact"><a data-am-modal="{target: '#contact-modal'}">Contact</a></li>
......
dist/html/publications.html
......@@ -64,7 +64,7 @@
<li class=""><a href="./portfolio.html">Portfolio</a></li>
<li><a href="./exhibition.html">Exhibitions</a></li>
<li><a href="./publications.html">Publications</a></li>
<li><a href="./project.html" >Project</a></li>
<!-- <li><a href="./project.html" >Project</a></li>-->
<li><a href="./news.html">News</a></li>
<li><a href="./biography.html">Biography</a></li>
<li onclick="n=$('.am-active').index();$(this).addClass('am-active').siblings().removeClass('am-active');" id="contact"><a data-am-modal="{target: '#contact-modal'}">Contact</a></li>
......
dist/js/public.js
......@@ -35,12 +35,10 @@ $(function(){
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=="project"){
lis.eq(3).addClass("am-active").siblings("li").removeClass("am-active");
}else if(title=="news"){
lis.eq(4).addClass("am-active").siblings("li").removeClass("am-active");
lis.eq(3).addClass("am-active").siblings("li").removeClass("am-active");
}else if(title=="biography"){
lis.eq(5).addClass("am-active").siblings("li").removeClass("am-active");
lis.eq(4).addClass("am-active").siblings("li").removeClass("am-active");
}
/*自动适配高度*/
......@@ -51,10 +49,6 @@ $(function(){
autoHeight('#publicationsUl',1.35);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
/*
var portfolioDelH=$(".am-viewport").height();
alert(portfolioDelH);
$("#entry").height(portfolioDelH);*/
}
/*portfolioDetail和index页面高度满屏*/
......@@ -73,10 +67,6 @@ $(window).resize(function() {
autoHeight('#publicationsUl',1.35);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
/* var portfolioDelH=$(".am-viewport").height();
alert(portfolioDelH);
$("#entry").height(portfolioDelH);*/
}
});
......
src/js/public.js
......@@ -35,12 +35,10 @@ $(function(){
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=="project"){
lis.eq(3).addClass("am-active").siblings("li").removeClass("am-active");
}else if(title=="news"){
lis.eq(4).addClass("am-active").siblings("li").removeClass("am-active");
lis.eq(3).addClass("am-active").siblings("li").removeClass("am-active");
}else if(title=="biography"){
lis.eq(5).addClass("am-active").siblings("li").removeClass("am-active");
lis.eq(4).addClass("am-active").siblings("li").removeClass("am-active");
}
/*自动适配高度*/
......@@ -51,10 +49,6 @@ $(function(){
autoHeight('#publicationsUl',1.35);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
var portfolioDelH=$("#portfolioDel").height();
alert(portfolioDelH);
$("#entry").height(portfolioDelH);
}
/*portfolioDetail和index页面高度满屏*/
......@@ -73,10 +67,6 @@ $(window).resize(function() {
autoHeight('#publicationsUl',1.35);
newsHeight("#news",1);
autoHeight2('.imgShow',1);
var portfolioDelH=$("#portfolioDel").height();
alert(portfolioDelH);
$("#entry").height(portfolioDelH);
}
});
......
src/less/style.less
......@@ -666,6 +666,8 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
width: 20%;
line-height: 20px;
margin:10px 5%;
padding: 15px;
background: rgba(0,0,0,.1);
h3{
font-size: 2.2rem;
line-height: 30px;
......@@ -694,7 +696,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
height: 100%;
width: 100%;
z-index: 8;
background: rgba(0,0,0,0.2);
background: rgba(0,0,0,0.3);
}
.title{
color: #fff;
......@@ -1774,7 +1776,7 @@ a.cd-read-more:hover{text-decoration:none; background-color: #424242; }
}
.am-dimmer {
background-color: rgba(255,255,255,.3);
background-color: rgba(0,0,0,0.5);
}
src/pages/components/header.html
......@@ -16,7 +16,7 @@
<li class=""><a href="./portfolio.html">Portfolio</a></li>
<li><a href="./exhibition.html">Exhibitions</a></li>
<li><a href="./publications.html">Publications</a></li>
<li><a href="./project.html" >Project</a></li>
<!-- <li><a href="./project.html" >Project</a></li>-->
<li><a href="./news.html">News</a></li>
<li><a href="./biography.html">Biography</a></li>
<li onclick="n=$('.am-active').index();$(this).addClass('am-active').siblings().removeClass('am-active');" id="contact"><a data-am-modal="{target: '#contact-modal'}">Contact</a></li>
......
src/pages/portfolioDetail.ejs
......@@ -28,7 +28,6 @@
<div>
<img src="../images/testImg4.png" />
</div>
<div class="bgImg"></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.
......@@ -48,7 +47,6 @@
<div>
<img src="../images/testImg1.png" />
</div>
<div class="bgImg"></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.</p>
......
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