diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 928a147..0622cd1 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -75,12 +75,6 @@ a[href="/en/sitemap"]{ } -.orbit-bar-inner{ - .orbit-bar-menu{ - display: flex; - align-items: center; - } - blockquote{ color: #333; padding: 0; @@ -101,11 +95,11 @@ a[href="/en/sitemap"]{ text-decoration: none; display: inline-block; height: 40px; - padding: 0.7em; - font-size: 0.85em; + height: 40px; + line-height: 40px; + padding: 0 0.5em; } } -} .fa-classic, .fa-regular, .fa-solid, .far, .fas ,.fa{ font-family: var(--fa-style-family, "FontAwesome")!important; } diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 74385e0..9df259e 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -1,10 +1,13 @@ @charset "utf-8"; @import "variables"; +.page-module-title{ + margin-top: 1em; +} .internal-page{ - // .unity-title{ - // margin-top: 1em; - // } + .unity-title{ + margin-top: 1em; + } .page-module-title{ display: block !important; text-align: left !important; diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss index 894cd7d..c8568ae 100644 --- a/assets/stylesheets/template/base/_variables.scss +++ b/assets/stylesheets/template/base/_variables.scss @@ -19,6 +19,9 @@ $theme-color-third: darken(#256b86, 8%); $theme-color-green: #0c81ae; $theme-color-hover: darken(#256b86, 8%); +// :root { +// --theme-color-second: #{$theme-color-second}; +// } // Font stacks $main-font: "Noto Sans TC", sans-serif; $sub-font: "Noto Sans TC", sans-serif; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 20af65b..aca7820 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -26,7 +26,16 @@ sup { ul{ padding: 0; } - @media(max-width: 769px){ + @media(min-width: 769px){ + float: right; + } + @media(max-width: 768px){ + a{ + color: #333; + padding: 0.5em; + margin: 0; + position: relative; + } ul{ display: flex!important; flex-wrap: wrap; @@ -120,6 +129,11 @@ sup { .navbar-header { z-index: 10; position: relative; + @media(max-width:768px){ + display: flex; + align-items: center; + justify-content: space-between; + } padding: 0; margin: 0; @media (min-width: $screen-sm) { @@ -172,7 +186,7 @@ sup { margin-right:0; height: auto; padding-right: 0.5em; - width: 100%!important; + width: 100%; @media(min-width: 769px){ margin-bottom: 0.5em; } diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index bf0fb48..fb4f88c 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -9,13 +9,29 @@ // Widget // ## gerenral styles .ba-banner-widget-youtube{ - overflow: hidden; - height: auto !important; - .banner-overlay{ - @media(max-width:768px){ - position: relative; + overflow: hidden; + iframe{ + @media(min-width:1025px){ + position: absolute; + top: -180px; + left: 0; + width: 100%; + height: calc(100% + 215px); + } + } + .jarallax-video-audio{ + @media(min-width:769px){ + top: 7em; + } + } + .w-ba-banner__wrap{ + height: auto !important; + } + .banner-overlay{ + @media(max-width:768px){ + position: relative; + } } - } } .w-ba-banner { position: relative; @@ -268,10 +284,10 @@ ul.button-mid{ } // Widget 0 .ba-banner-widget-0 { - height: 100vh !important; + height: 70vh !important; z-index: 0; .w-ba-banner__wrap{ - height: 100vh !important; + height: 70vh !important; } .youtube, .cycle-youtube { width: 100%; @@ -282,12 +298,6 @@ ul.button-mid{ width: 100%; height: 100%; } - .banner-pager { - right: 1em; - top: -2em; - z-index: 100; - display: none; - } .button-mid{ z-index: 101; } @@ -314,7 +324,6 @@ ul.button-mid{ // width: auto; max-width: unset; // transform: translateX(-9%); - height: 100vh; } } &,& .jp-jplayer{ @@ -468,25 +477,22 @@ ul.button-mid{ // Widget 3 .ba-banner-widget-3 { -.banner-pager .active-slide a { - background: $theme-color-second !important; -} - - .w-ba-banner__wrap { + overflow: hidden; + border-radius: 2em; + .w-ba-banner__image { width: 100%; + height: auto; } - .w-ba-banner__slide { + .youtube, .cycle-youtube { width: 100%; - position: relative; + height: 100%; } - .banner-pager { - right: 0; - bottom: 2em; - li { height: unset; width: unset; } + object, embed { + width: 100%; + height: 100%; } - ul.button-mid { display: none; } } //Widget 4 diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index e54d23f..aa208bc 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -34,6 +34,7 @@ float: right!important; width: 80%!important; padding-left: 1em; + padding-right: 1em; .ba-banner-widget-0 img{ transform: none!important; } diff --git a/assets/stylesheets/template/modules/universal-table.scss b/assets/stylesheets/template/modules/universal-table.scss index 6789b2c..985dbd5 100644 --- a/assets/stylesheets/template/modules/universal-table.scss +++ b/assets/stylesheets/template/modules/universal-table.scss @@ -4,6 +4,10 @@ .universal-th-text{ white-space: pre; } +.btn-info { + background-color: #157d9d; + border-color: #157d9d; +} .universal-table-index h3 { padding: 0; } diff --git a/assets/stylesheets/template/modules/video.scss b/assets/stylesheets/template/modules/video.scss index c1ec642..4f98c88 100644 --- a/assets/stylesheets/template/modules/video.scss +++ b/assets/stylesheets/template/modules/video.scss @@ -453,7 +453,7 @@ font-family: "Noto Sans TC", PingFangTC, 微軟正黑體, "Microsoft JhengHei", sans-serif; font-weight: normal; letter-spacing: 0.3px; - color: #8f8f8f; + color: #707070; line-height: 1.6; cursor: pointer; } @@ -707,7 +707,7 @@ .movie_desc{ clear: both; letter-spacing: 0.3px; - color: #8f8f8f; + color: #707070; line-height: 1.8; } .video_title { @@ -727,7 +727,7 @@ clear: both; } .video_group_time{ - color: #8f8f8f!important; + color: #707070!important; } .movietitle{ margin-bottom: 15px; @@ -905,7 +905,7 @@ } .video_desc{ letter-spacing: 0.3px; - color: #8f8f8f; + color: #707070; line-height: 1.6; max-height: 5em; } diff --git a/assets/stylesheets/template/widget/breadcrumb.scss b/assets/stylesheets/template/widget/breadcrumb.scss index df648a3..6ceaec1 100644 --- a/assets/stylesheets/template/widget/breadcrumb.scss +++ b/assets/stylesheets/template/widget/breadcrumb.scss @@ -7,6 +7,9 @@ // padding-left: 0.9375em!important; } } +.widget-breadcrumb{ + margin-bottom: 1em; +} .breadcrumb { @media(max-width: 768px){ padding: 0; diff --git a/modules/ad_banner/_ad_banner_widget3.html.erb b/modules/ad_banner/_ad_banner_widget3.html.erb new file mode 100644 index 0000000..dc60869 --- /dev/null +++ b/modules/ad_banner/_ad_banner_widget3.html.erb @@ -0,0 +1,99 @@ +
+ + \ No newline at end of file diff --git a/modules/ad_banner/info.json b/modules/ad_banner/info.json index ff8db23..c95782f 100644 --- a/modules/ad_banner/info.json +++ b/modules/ad_banner/info.json @@ -40,6 +40,14 @@ }, "thumbnail": "ad_banner2_thumb.png" }, + { + "filename": "ad_banner_widget3", + "name": { + "zh_tw": "P1-1. 純圖片導圓角輪播-標準 ( 圖片, 導航圖示 )", + "en": "P1-1. Pure Image Carousel - Rounded - Standard ( image, navigation )" + }, + "thumbnail": "ad_banner2_thumb.png" + }, { "filename": "ad_banner_widget0", "name": {