diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 5e901e9..c4c2da3 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -1203,19 +1203,6 @@ $(document).ready(function() { // if($('.show-announcement').hasClass('show-announcement')) { // $('.').css('', ''); // } - if($('.s-annc').length){ - $(".carousel_images h4").remove(); - $('.carousel_images').addClass('carousel_images2'); - $(".carousel_images .w-ba-banner").next("div").find(".button-mid").remove(); - $(".s-annc__post-wrap").next("hr").remove(); - // $(".carousel_images").insertAfter(".s-annc__meta-wrap"); - $('.breadcrumb-wrap').css('display', 'block'); - // $(".main-content").css({ - // "max-width": "920px", - // "margin": "auto" - // }); - } - $('.s-annc__tag-wrap ').after($('.s-annc__post-orbithashtags')); $('a').each(function () { const $a = $(this); diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 825fa35..c4101fc 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -41,14 +41,19 @@ li{ html { font-size: 100%; } - +.orbitbar-line{ + left: 0; +} body { font-family: $sub-font; font-size: inherit; margin-top: 2.5em; overflow: hidden scroll; letter-spacing: 0.5px; - background-color: #f8f9fa; + @media(min-width:1025px){ + max-width: 960px; + margin: auto; + } } a:link, diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index ce9d706..9d436d4 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -18,14 +18,13 @@ } } } - +.page-home{ .unity-title { span{ width: 100%; display: flex; justify-content: center; align-items: center; - flex-wrap: wrap; &:before{ background: url(/assets/titleicon.png) no-repeat left center; display: block; @@ -40,7 +39,7 @@ } } } - +} // Title .unity-title { line-height: 1.5; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 4960590..1898d25 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -61,7 +61,7 @@ } .header-banner { overflow: hidden; } .header-nav { - padding:0; + padding:0.5em 0 0 0; font-family: $main-font; text-transform:uppercase; display: flex; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index f3dcd6d..a7800c7 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -8,28 +8,6 @@ // Widget // ## gerenral styles -ul.button-mid{ - .prev-button{ - height: 2em !important; - width: 2em !important; - font-size: 1em !important; - line-height: 2rem !important; - border-radius: 1em; - &:hover { - background: rgba(0,0,0,0.1); - } - } - .next-button{ - height: 2em !important; - width: 2em !important; - font-size: 1em !important; - line-height: 2rem !important; - border-radius: 1em; - &:hover { - background: rgba(0,0,0,0.1); - } - } -} ul.button-mid{ margin:0; z-index: 201; @@ -91,7 +69,7 @@ iframe{ @include list-reset; position: absolute; bottom: 0.5rem!important; - z-index: 100; + z-index: 1000; text-align:center; width: 100%; li { @@ -256,7 +234,7 @@ ul.button-mid{ .banner-pager { right: 1em; top: -2em; - z-index: 100; + z-index: 102; display: none; } .button-mid{ @@ -328,7 +306,7 @@ ul.button-mid{ padding: 3.5em 5em; background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); position: absolute; - z-index: 99; + z-index: 999; color: #fff; } .w-ba-banner__caption { @@ -379,7 +357,7 @@ ul.button-mid{ .banner-pager { right: 1em; top: -2em; - z-index: 100; + z-index: 102; display: none; } } @@ -422,7 +400,9 @@ ul.button-mid{ .ba-banner-widget-5 { margin: 1em 0; .slide-img { + @media(min-width:769px){ padding: 0; + } } .slide-content { z-index: 200; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 271b22b..b18b175 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -77,97 +77,119 @@ // } //固定選單 -.navFixed { - .header-nav{ - display: none!important; - -webkit-transition: all .3s ease; - -moz-transition: all .3s ease; - -ms-transition: all .3s ease; - -o-transition: all .3s ease; - transition: all .3s ease; +// .navFixed { +// .header-nav{ +// display: none!important; +// -webkit-transition: all .3s ease; +// -moz-transition: all .3s ease; +// -ms-transition: all .3s ease; +// -o-transition: all .3s ease; +// transition: all .3s ease; +// } +// z-index: 10; +// position: fixed; +// left: 0; +// top:0; +// margin-top: 0; +// min-width: 100%; +// -webkit-backdrop-filter: saturate(180%) blur(20px); +// backdrop-filter: saturate(180%) blur(20px); +// background-color: #fff; +// -webkit-transition: all .3s ease; +// -moz-transition: all .3s ease; +// -ms-transition: all .3s ease; +// -o-transition: all .3s ease; +// transition: all .3s ease; +// } + +//直式選單更改css +.homebanner{ + .ba-banner-widget-9 .jp-video { + @media(min-width: 769px){ + float: right!important; + width: 80%!important; + } + } +} +.navbar-brand{ + h1{ + @media(min-width: 769px){ + margin-top:0.5em; + } + } +} +#layout-navigation{ + @media(min-width: 769px){ + position: absolute; + width: 20%!important; + left: 0; + background-color: #fff; + margin-top: 4em; + padding: 0; + #main-nav{ + padding: 0; + } + .modules-menu-level-0{ + width: 100%!important; + } + .modules-menu-level-0 > li{ + width: 100%; + } + .modules-menu-level-1{ + min-width: 100%; + left: 100%; + top: 0; + } + } +} +.verticalhome{ + .layout-content{ + @media(min-width: 769px){ + float: right!important; + width: 80%!important; + padding-left: 1em; + padding-right: 1em; + } + } +} +.homebanner,.topcontent,.video-banner{ + z-index: 1; + position: relative; + @media(min-width: 769px){ + margin-left: 20% !important; + padding-left: 1em; + .ba-banner-widget-0 img{ + transform: none!important; + } + } +} +.layout-header .navbar-header .navbar-brand{ + @media(min-width: 1200px){ + padding-left: 0; } - z-index: 10; - position: fixed; - left: 0; - top:0; - margin-top: 0; - min-width: 100%; - -webkit-backdrop-filter: saturate(180%) blur(20px); - backdrop-filter: saturate(180%) blur(20px); - background-color: #fff; - -webkit-transition: all .3s ease; - -moz-transition: all .3s ease; - -ms-transition: all .3s ease; - -o-transition: all .3s ease; - transition: all .3s ease; } -// //直式選單更改css -// .navbar-brand{ -// h1{ -// @media(min-width: 769px){ -// margin-top:0.5em; -// } -// } -// } -// #layout-navigation{ -// @media(min-width: 769px){ -// position: absolute; -// width: 20%!important; -// left: 0; -// background-color: #fff; -// margin-top: 5em; -// padding-right: 0; -// #main-nav{ -// padding: 0; -// } -// .modules-menu-level-0{ -// width: 100%!important; -// } -// .modules-menu-level-0 > li{ -// width: 100%; -// } -// .modules-menu-level-1{ -// min-width: 100%; -// left: 100%; -// top: 0; -// } -// } -// } -// .verticalhome{ -// .layout-content{ -// @media(min-width: 769px){ -// float: right!important; -// width: 80%!important; -// } -// } -// } -// .homebanner{ -// @media(min-width: 769px){ -// float: right!important; -// width: 80%!important; -// .ba-banner-widget-0 img{ -// transform: none!important; -// } -// } -// } -// .container{ -// @media(min-width: 1200px){ -// width: 95%!important; -// max-width: unset!important; -// } -// } -// .layout-header .navbar-header .navbar-brand{ -// @media(min-width: 1200px){ -// padding-left: 0; -// } -// } + + +.menufa{ + padding-right: 1em; + @media(max-width:768px){ + display: none!important; + } +} +.menufa2{ + position: absolute; + right: 0; + @media(max-width:768px){ + display: none!important; + } +} #layout-navigation{ @media(min-width: 769px){ width: 100%; @@ -191,6 +213,7 @@ } .modules-menu-level-0 { + float: none!important; width: 100%; padding: 0; @media (min-width:769px)and(max-width: 1024px){ @@ -337,7 +360,6 @@ &:nth-last-child(2){ .modules-menu-level-2 { right: 100%; - left: auto; } } &:last-child { @@ -362,7 +384,6 @@ .modules-menu-level-2 { right: 100%; - left: auto; } } } @@ -372,6 +393,9 @@ color:#686868; font-weight: bold; position: relative; + position: relative; + display: flex; + align-items: center; } &:hover { @@ -419,14 +443,14 @@ } &:hover { -/* background-color: $theme-color-second;*/ + background-color: $theme-color-second; @media(max-width: 769px){ a,i { - color:$theme-color-second; + color: #fff; } } &>a { - color:$theme-color-second; + color: #fff; } } }