chiu
/
asia-home-b
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
rulingcom 2022-01-07 12:11:07 +00:00
parent ee1f3d44e5
commit ee474b01c3
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/javascripts/app.js
View File

@ -836,19 +836,19 @@ function transdate(){
$('.layout-content').css('margin-top',$('.kenjohn').height()-$('#orbit-bar').height()); $('.layout-content').css('margin-top',$('.kenjohn').height()-$('#orbit-bar').height());
} }
if (parseInt($('.layout-content').css('margin-top')==0)){ if (parseInt($('.layout-content').css('margin-top')==0)){
theTop = $('.layout-content-inner.container').offset().top-$(".kenjohn").position().top+10; theTop = $('.layout-content-inner.container').offset().top-$(".kenjohn").position().top+5;
}else{ }else{
theTop = $('.layout-content-inner.container').offset().top-$(".kenjohn").position().top-$(".kenjohn").height()+10; theTop = $('.layout-content-inner.container').offset().top-$(".kenjohn").position().top-$(".kenjohn").height()+5;
} }
}else{ }else{
theTop = 10; theTop = 5;
} }
console.log(theTop); console.log(theTop);
$("html, body").animate({ $("html, body").animate({
scrollTop: theTop }, {duration: 500,easing: "swing",complete: function(){ scrollTop: theTop }, {duration: 400,easing: "swing",complete: function(){
console.log('finish'); console.log('finish');
if(!stop){ if(!stop){
move_to_target(true); move_to_target(true);
} }
}}); }});
} }
@ -877,13 +877,13 @@ function transdate(){
//$('.modules-menu-level-1').css('calc_menu_flagleft','-'+$('.outdropdowns .dropdowns').offset().left+'px'); //$('.modules-menu-level-1').css('calc_menu_flagleft','-'+$('.outdropdowns .dropdowns').offset().left+'px');
calc_menu_pos(); calc_menu_pos();
window.has_hover = false; window.has_hover = false;
if($(window).outerWidth(true) >= 768){ if($(window).outerWidth(true) >= 768){
window.has_hover = true; window.has_hover = true;
} }
}); });
$('#main-nav>li').mouseover(function(){ $('#main-nav>li').mouseover(function(){
if (!calc_menu_flag){ if (!calc_menu_flag){
calc_menu_pos(); calc_menu_pos();

5
assets/stylesheets/template/layout/content.scss
View File

@ -17,10 +17,7 @@ body{
.downIcon{ .downIcon{
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 775px; bottom: 15%;
@media (min-width:1026px) and (max-width:1280px){
top: 735px;
}
//bottom: 10%; //bottom: 10%;
z-index: 2; z-index: 2;
color: #fff; color: #fff;

13
assets/stylesheets/template/layout/header.scss
View File

@ -98,7 +98,7 @@ a#content{
padding: 0.5em; padding: 0.5em;
&:hover{ &:hover{
span { span {
color:#0d5151!important; color:#288e8e!important;
text-decoration: underline; text-decoration: underline;
} }
} }
@ -144,9 +144,9 @@ a#content{
position: absolute; position: absolute;
} }
} }
@media screen and (min-width:991px) and (max-width:1025px){ @media screen and (min-width:$screen-xs) and (max-width:1025px){
.ad-overlay{ .ad-overlay{
bottom: 31%; bottom: 50%;
position: absolute; position: absolute;
} }
} }
@ -159,9 +159,12 @@ a#content{
@media screen and (min-width: 769px){ @media screen and (min-width: 769px){
height: 100vh; height: 100vh;
} }
@media screen and (max-width: 768px){ @media screen and(min-width:$screen-xs) and (max-width:768px){
height: 720px; height: 1000px;
} }
@media screen and (max-width: $screen-xs){
height: 720px;
}
} }
} }
.jp-jplayer{ .jp-jplayer{