diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index ae46f3a..e7fc290 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -11,6 +11,15 @@
this.replaceWith(new_html);
}
});
+ function fix_layout(){
+ window.has_topest_banner = ($('[data-pp="300"] .w-ad-banner').length != 0);
+ if (!window.has_topest_banner) {
+ $('.downIcon').css('display','none')
+ }else{
+ $("#onesection").css("margin", "0");
+ $('.layout-content-inner .row, .layout-content-inner .row > [class*="col-"]').css("padding", "0");
+ }
+ }
function initdata1 () {
window.temp_scrollY = window.pageYOffset;
window.temp_scrollX = window.pageXOffset;
@@ -18,20 +27,17 @@
window.temp_scrollY = document.documentElement.scrollTop;
window.temp_scrollX = document.documentElement.scrollLeft;
}
- if ($('.header-banner').html().trim() == "") {
- $('.downIcon').css('display','none')
- }
// if (location.href.search('editmode') == -1 && document.getElementsByClassName('asideright').length != 0) {
- if ( $('.header-banner').length != 0) {
+ if ( $('.header-banner').length != 0 ) {
$('.layout-header').css('height', '');
var scrollTop = $(window).scrollTop();
- if (scrollTop>5) { /* 要滑動到選單的距離 */
+ if (!window.has_topest_banner || scrollTop>5) { /* 要滑動到選單的距離 */
if (parseInt($('.layout-content').css('margin-top'))==0 && $('.layout-content.topcontent').length != 0 && $('.layout-content.topcontent').offset().top<400){
$('.layout-content').css('margin-top',$('.kenjohn').height()-$('#orbit-bar').height());
}
$('.kenjohn').addClass('navFixed').removeClass('navRel'); /* 幫選單加上固定效果 */
} else {
- if ($('.header-banner').html().trim() == "") {
+ if (!window.has_topest_banner) {
$('.kenjohn').removeClass('navFixed').addClass('navRel');
}else{
$('.kenjohn').removeClass('navRel').removeClass('navFixed'); /* 移除選單固定效果 */
@@ -450,6 +456,7 @@
}
// 在所有的頁面(包含首頁)執行下面這幾個函數
+ fix_layout();
initdata1();
orbit.sitemenuDropdown();
orbit.goBackTop('top', 800);
diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index ce5b530..65d07f4 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -2,89 +2,85 @@
@import "../initial";
body{
-@media (min-width: 1150px){
-.black-screen-social-window.reactable{
-.content-social .social_wrap i, .content-social .social_wrap img {
- width: 1.2em;
- font-size: 2em;
-}
-.content-social .social_wrap>div{
- width: 3.2em;
-}
-}
-}
+ @media (min-width: 1150px){
+ .black-screen-social-window.reactable{
+ .content-social .social_wrap i, .content-social .social_wrap img {
+ width: 1.2em;
+ font-size: 2em;
+ }
+ .content-social .social_wrap>div{
+ width: 3.2em;
+ }
+ }
+ }
}
.downIcon {
+ position: absolute;
+ left: 50%;
+ bottom: 15%;
+ //bottom: 10%;
+ z-index: 2;
+ color: #fff;
+
+ span {
position: absolute;
+ top: 0;
left: 50%;
- bottom: 15%;
- //bottom: 10%;
- z-index: 2;
- color: #fff;
+ width: 46px;
+ height: 46px;
+ margin-left: -23px;
+ border: 2px solid #fff;
+ border-radius: 100%;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
+ box-sizing: border-box;
+ }
- span {
- position: absolute;
- top: 0;
- left: 50%;
- width: 46px;
- height: 46px;
- margin-left: -23px;
- border: 2px solid #fff;
- border-radius: 100%;
- behavior: url("/assets/ie_support/PIE2/PIE.htc");
- box-sizing: border-box;
- }
-
- a:hover span {
- width: 60px;
- height: 60px;
- margin-left: -30px;
- top: -7px;
- border-width: 4px;
- border-color: #facf3d;
- }
+ a:hover span {
+ width: 60px;
+ height: 60px;
+ margin-left: -30px;
+ top: -7px;
+ border-width: 4px;
+ border-color: #facf3d;
+ }
}
.downIcon a:hover span::after {
- width: 21px;
- height: 21px;
- border-left-width: 4px;
- border-bottom-width: 4px;
- margin: -14px 0 0 -10px;
- border-color: #facf3d;
+ width: 21px;
+ height: 21px;
+ border-left-width: 4px;
+ border-bottom-width: 4px;
+ margin: -14px 0 0 -10px;
+ border-color: #facf3d;
}
.downIcon a span::after{
- position: absolute;
- top: 50%;
- left: 50%;
- content: '';
- width: 16px;
- height: 16px;
- margin: -12px 0 0 -8px;
- border-left: 2px solid #fff;
- border-bottom: 2px solid #fff;
- -webkit-transform: rotate(
--45deg
-);
- transform: rotate(
--45deg
-);
- box-sizing: border-box;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ content: '';
+ width: 16px;
+ height: 16px;
+ margin: -12px 0 0 -8px;
+ border-left: 2px solid #fff;
+ border-bottom: 2px solid #fff;
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg);
+ box-sizing: border-box;
}
.downIcon a span::before{
position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- content: '';
- width: 44px;
- height: 44px;
- box-shadow: 0 0 0 0 #ffffff1a;
- border-radius: 100%;
- behavior: url("/assets/ie_support/PIE2/PIE.htc");
- opacity: 0;
- -webkit-animation: sdb03 3s infinite;
- animation: sdb03 3s infinite;
- box-sizing: border-box;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ content: '';
+ width: 44px;
+ height: 44px;
+ box-shadow: 0 0 0 0 #ffffff1a;
+ border-radius: 100%;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
+ opacity: 0;
+ -webkit-animation: sdb03 3s infinite;
+ animation: sdb03 3s infinite;
+ box-sizing: border-box;
}
@-webkit-keyframes sdb03 {
0% {
@@ -142,58 +138,59 @@ body{
@extend .response-pagecontainer;
}
}
+#onesection{
+ margin: 0 0.9375em;
+}
.bannertwo{
-
- @media(min-width:1024px){
- padding: 0;
- .w-ba-banner{
- display: flex;
- flex-direction: row-reverse;
- .w-ba-banner__wrap{
- flex: 0 0 65%;
- }
- .ad-overlay{
- position: relative;
- background: none;
- }
- }
- }
- @media(min-width:800px){
- .ad-overlay{
- p{
- margin-top: 4em;
- }
- }
- }
- @media(min-width:768px){
+ padding: 0;
+ @media(min-width:1024px){
+ .w-ba-banner{
+ display: flex;
+ flex-direction: row-reverse;
+ .w-ba-banner__wrap{
+ flex: 0 0 65%;
+ }
.ad-overlay{
- p{
- margin-top: 1em;
- }
- }
- .ba-banner-widget-1 .w-ba-banner__caption{
- padding: 3em;
+ position: relative;
+ background: none;
}
+ }
+ }
+ @media(min-width:800px){
+ .ad-overlay{
+ p{
+ margin-top: 4em;
+ }
+ }
+ }
+ @media(min-width:768px){
+ .ad-overlay{
+ p{
+ margin-top: 1em;
}
- .button-mid .prev-button{
- background: none;
}
- .button-mid .next-button{
- background: none;
+ .ba-banner-widget-1 .w-ba-banner__caption{
+ padding: 3em;
}
-
+ }
+ .button-mid .prev-button{
+ background: none;
+ }
+ .button-mid .next-button{
+ background: none;
+ }
}
.video-banner{
max-width: 850px;
margin: auto;
@media(min-width:1200px){
- margin-top: -20em;
+ margin-top: -20em;
}
@media only screen and (max-width: 1200px) and (min-width: 1024px){
- margin-top: -17em;
+ margin-top: -17em;
}
@media only screen and (max-width: 1024px) and(min-width:789px){
- margin-top: -9em;
+ margin-top: -9em;
}
img{
border-radius: 20px;
@@ -234,7 +231,7 @@ body{
// }
.leftannounce{
@media(max-width: 769px){
- margin-bottom: 1em;
+ margin-bottom: 1em;
}
}
.subword{
@@ -255,8 +252,8 @@ body{
display: flex;
padding: 2em;
@media(max-width: 1024px){
- flex-wrap: wrap;
- padding: 0 15px;
+ flex-wrap: wrap;
+ padding: 0 15px;
}
}
.fontgroup{
@@ -265,7 +262,7 @@ body{
flex-wrap: wrap;
padding: 2em;
@media(max-width: $screen-xs){
- flex-wrap: wrap;
+ flex-wrap: wrap;
}
}
.iconbox{
@@ -295,8 +292,8 @@ body{
object-fit: cover;
}
.box .w-ba-banner__slide, .box .w-ba-banner__slide a {
- height: 100%;
- display: block;
+ height: 100%;
+ display: block;
}
.box{
flex: 3;
@@ -325,9 +322,9 @@ body{
}
}
.layout-content-box3{
- @media(min-width: $screen-xs){
- top: -9em;
- }
+ @media(min-width: $screen-xs){
+ top: -9em;
+ }
}
.score{
.scorebutton{
@@ -343,25 +340,22 @@ body{
.swiper-banner{
.ba-banner-widget-1 {
.ad-overlay{
- background-image: none!important;
+ background-image: none!important;
}
ul.button-mid .next-button{
- color: #E4002B!important;
- background: none!important;
+ color: #E4002B!important;
+ background: none!important;
}
ul.button-mid .prev-button{
- color: #E4002B!important;
- background: none!important;
+ color: #E4002B!important;
+ background: none!important;
}
}
}
.bannertwo{
@media(min-width:1024px){
- background-color: #72bcad;
+ background-color: #72bcad;
}
- @media(max-width: $screen-sm){
- padding: 0;
- }
}
.onesection{
color: #fff;
@@ -524,20 +518,20 @@ body{
text-shadow:none;
}
.dropdowns{
- justify-content: center;
+ justify-content: center;
}
.kenjohn {
- //flex-wrap:wrap-reverse;
- display: flex;
- flex-direction: column;
- .navbar-header{
+ //flex-wrap:wrap-reverse;
+ display: flex;
+ flex-direction: column;
+ .navbar-header{
+ display: flex!important;
+ }
+ .header-nav{
+ @media(min-width: 480px){
display: flex!important;
}
- .header-nav{
- @media(min-width: 480px){
- display: flex!important;
- }
- }
+ }
.layout-header .header-nav a{
text-shadow: none;
}
@@ -601,68 +595,67 @@ body{
.site-logo{
width:100%!important;
}
- @media(min-width:1900px){
- width: 225px;
- margin-top: -12px;
- }
- @media screen and (min-width:1025px) and (max-width:1899px){
- width: 181px;
- margin-top: -3px;
- }
- @media screen and (min-width:769px) and (max-width:1025px){
- width: 150px;
- margin-top: -5px;
- }
- @media screen and (min-width:$screen-xs) and (max-width:769px){
- width: 146px !important;
- }
- @media screen and (max-width:$screen-xs){
- width: 110px !important;
- margin-top: 3px;
- }
-
+ @media(min-width:1900px){
+ width: 225px;
+ margin-top: -12px;
+ }
+ @media screen and (min-width:1025px) and (max-width:1899px){
+ width: 181px;
+ margin-top: -3px;
+ }
+ @media screen and (min-width:769px) and (max-width:1025px){
+ width: 150px;
+ margin-top: -5px;
+ }
+ @media screen and (min-width:$screen-xs) and (max-width:769px){
+ width: 146px !important;
+ }
+ @media screen and (max-width:$screen-xs){
+ width: 110px !important;
+ margin-top: 3px;
+ }
+ }
+ .navbar-brand:nth-child(2){
+ @media(min-width:1900px){
+ width: 330px!important;
+ margin-top: -14px;
+ }
+ @media screen and (min-width:1025px) and (max-width:1899px){
+ width: 261px!important;
+ margin-top: -5px;
+ }
+ @media screen and (min-width:769px) and (max-width:1025px){
+ width: 200px!important;
+ }
+ @media screen and (max-width:768px){
+ width: 140px!important;
+ }
+ }
+ .modules-menu .modules-menu-level-0 > li > a{
+ color: #333;
+ text-shadow: none;
+ }
+ .header-nav{
+ background: #e7e8ea;
+ padding:0.5em !important;
+ }
+ .header-nav a{
+ text-shadow:none;
+ color: #333333;
+ }
+ .navbar-toggle .icon-bar{
+ background-color: #333;
+ box-shadow: none;
+ }
+ .navbar-header .navbar-brand{
+ @media(max-width: 769px){
+ display: block!important;
+ }
+ }
+ .navbar-toggle{
+ position: absolute;
+ right: 0;
}
- .navbar-brand:nth-child(2){
- @media(min-width:1900px){
- width: 330px!important;
- margin-top: -14px;
- }
- @media screen and (min-width:1025px) and (max-width:1899px){
- width: 261px!important;
- margin-top: -5px;
- }
- @media screen and (min-width:769px) and (max-width:1025px){
- width: 200px!important;
- }
- @media screen and (max-width:768px){
- width: 140px!important;
- }
- }
- .modules-menu .modules-menu-level-0 > li > a{
- color: #333;
- text-shadow: none;
- }
- .header-nav{
- background: #e7e8ea;
- padding:0.5em !important;
- }
- .header-nav a{
- text-shadow:none;
- color: #333333;
- }
- .navbar-toggle .icon-bar{
- background-color: #333;
- box-shadow: none;
- }
- .navbar-header .navbar-brand{
- @media(max-width: 769px){
- display: block!important;
- }
- }
- .navbar-toggle{
- position: absolute;
- right: 0;
- }
}
}
@media(max-width:768px){
diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss
index b14eea6..59653ec 100644
--- a/assets/stylesheets/template/modules/menu.scss
+++ b/assets/stylesheets/template/modules/menu.scss
@@ -1,6 +1,11 @@
@charset "utf-8";
@import "../initial";
+@media (min-width: $screen-sm) {
+ .modules-menu.collapse.in .social_wrap{
+ justify-content: initial;
+ }
+}
.collapse{
@media(min-width: 769px){
width:100%;
diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss
index 54f2380..9748073 100644
--- a/assets/stylesheets/template/template.scss
+++ b/assets/stylesheets/template/template.scss
@@ -22,6 +22,9 @@
//RWD
@import "RWD";
+[data-pp="8"] [data-subpart-id]:last-child {
+ margin-bottom: 2em;
+}
div.weather_widget1{
background: unset;
}
diff --git a/home/index.html.erb b/home/index.html.erb
index 44b2864..becf698 100644
--- a/home/index.html.erb
+++ b/home/index.html.erb
@@ -24,7 +24,9 @@
-
+
+
+