diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index f6cddf9..f911271 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -836,19 +836,19 @@ function transdate(){ $('.layout-content').css('margin-top',$('.kenjohn').height()-$('#orbit-bar').height()); } 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{ - 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{ - theTop = 10; + theTop = 5; } console.log(theTop); $("html, body").animate({ - scrollTop: theTop }, {duration: 500,easing: "swing",complete: function(){ + scrollTop: theTop }, {duration: 400,easing: "swing",complete: function(){ console.log('finish'); 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'); calc_menu_pos(); - + window.has_hover = false; if($(window).outerWidth(true) >= 768){ window.has_hover = true; } }); - + $('#main-nav>li').mouseover(function(){ if (!calc_menu_flag){ calc_menu_pos(); diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index faff835..c2c8b53 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -17,10 +17,7 @@ body{ .downIcon{ position: absolute; left: 50%; - top: 775px; - @media (min-width:1026px) and (max-width:1280px){ - top: 735px; - } + bottom: 15%; //bottom: 10%; z-index: 2; color: #fff; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index efef6a6..61d80b5 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -98,7 +98,7 @@ a#content{ padding: 0.5em; &:hover{ span { - color:#0d5151!important; + color:#288e8e!important; text-decoration: underline; } } @@ -144,9 +144,9 @@ a#content{ 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{ - bottom: 31%; + bottom: 50%; position: absolute; } } @@ -159,9 +159,12 @@ a#content{ @media screen and (min-width: 769px){ height: 100vh; } - @media screen and (max-width: 768px){ - height: 720px; + @media screen and(min-width:$screen-xs) and (max-width:768px){ + height: 1000px; } + @media screen and (max-width: $screen-xs){ + height: 720px; + } } } .jp-jplayer{