diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 5c64423..3a9cdd3 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -446,16 +446,21 @@ // 當文件物件模型(DOM)載入後,執行init函數 $(document).ready(function() { + $(".w-ba-banner__wrap").height(300); init(); - if( $('div[data-pp="1000"]').text() !== ''){ - $('.black-screen').addClass('active'); - } - - $('.close-btn').click(function() { - $('.black-screen').removeClass('active'); - }) + if( $('div[data-pp="1000"]').text() !== ''){ + $('.black-screen').addClass('active'); + } + + $('.close-btn').click(function() { + $('.black-screen').removeClass('active'); + }) }); - + $(window).on("load",function(){ + $(".ba-banner-widget-1 .ad-overlay").css("bottom","auto"); + $(".slide").css("height","auto"); + $(".w-ba-banner__wrap").css("height","auto"); + }) // 執行 member等高計算,目前改用flexbox故mark掉 by ika 20160105 // $(window).load(function() { // if ($('.index-member-3').length && $(window).width() > 992) { diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index 6860dc8..6b95304 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -81,22 +81,22 @@ font-weight: bold; transition:opacity .5s ,top .5s, left 0s .5s; padding: 2px; - @media (min-width: 768px){ - width: 40%; - padding: 30px; - } + @media (min-width: 768px){ + width: 40%; + padding: 30px; + } + @media (max-width: 767px){ + padding: 30px 10px; + } .close-btn{ position: absolute; right: 0; - top:-40px; + top:0; padding: 5px 10px; background: $theme-color-main; color:#fff; font-size: 18px; transition:.3s; - @media (min-width: 768px){ - top:0; - } &:hover{ background: $theme-color-second; } @@ -143,15 +143,19 @@ } .w-ba-banner.ad-banner-widget-1.ba-banner-widget-1, .slide { - padding: 0 !important; - height: 458px!important; + padding: 0; + height: 458px; } .ad-overlay.w-ba-banner__caption.w-ad-banner__caption { bottom: 55px; - height: 60px !important; - padding: 10px; + height: 60px; + padding: 0 10px; text-align: center; + overflow: hidden; + p{ + display: none; + } } span.w-annc__category-wrap.col-sm-2 { width: 90px; diff --git a/home/index.html.erb b/home/index.html.erb index c0d2b6a..4ae0a0e 100644 --- a/home/index.html.erb +++ b/home/index.html.erb @@ -33,13 +33,12 @@
-
-
- - - - -
+
+
+ + + +
<%= render_footer %>