diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 825fa35..0f8128c 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -48,7 +48,7 @@ body { margin-top: 2.5em; overflow: hidden scroll; letter-spacing: 0.5px; - background-color: #f8f9fa; + background-color: #fff; } a:link, diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index a2343ea..c19edc8 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -10,10 +10,11 @@ position: relative; width: 100%; overflow: hidden; + background-color: #fff; } .internal-page{ .layout-content{ - // background: transparent; + background: transparent; padding-bottom: 4em; } } @@ -34,8 +35,6 @@ } .video-banner{ max-width: 850px; - margin: auto; - position: relative; } .homebanner{ -webkit-transition: .3s ease-out; @@ -142,7 +141,7 @@ position: absolute; left: 48.8%; bottom: 10%; - z-index:100; + z-index:2; display: block; cursor: pointer; @media(max-width:$screen-xs){ @@ -197,8 +196,4 @@ opacity: 0; transform: translateY(55px) scale3d(0.5, 0.5, 0.5); } -} - -.rotated{ - transform: rotate(180deg); } \ No newline at end of file diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index db2a19c..34f1e5c 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -9,13 +9,10 @@ z-index: 1; padding: 0.5em 0; } +.dropdowns{ + padding: 0; +} .header-nav { - display: flex !important; - flex-wrap: wrap; - @media(min-width:820px){ - position: absolute; - right: 0; - } ul{ padding: 0; } @@ -30,9 +27,6 @@ } } } -.dropdowns{ - padding: 0; -} .accessibility_mode a:focus{ outline: 0.1em solid !important; outline: 0.3125em auto -webkit-focus-ring-color !important; @@ -44,9 +38,11 @@ margin-bottom: 0; border: none; border-radius: 0; - background-color:#f8f9fa; + background-color: #fff; + -webkit-box-shadow: 0 1px 5px 1px rgba(26, 26, 26, .3); + box-shadow: 0 1px 5px 1px rgba(26, 26, 26, .3); li{ - list-style: none; + list-style: none; } a[accesskey] { position: relative!important; @@ -57,14 +53,18 @@ } .header-banner { overflow: hidden; } .header-nav { + background: #f5f5f5; padding:0; - font-family: $main-font; - text-transform:uppercase; - display: flex; - align-items: center; - justify-content: flex-end; - ul{ - padding: 0; + + >.container{ + color: $theme-color-main; + font-family: $main-font; + text-transform:uppercase; + display: flex; + align-items: center; + justify-content: flex-end; + padding-right: 0.9375em; + padding-left: 0.9375em; } @media(max-width: 820px){ justify-content: space-between; @@ -72,7 +72,7 @@ } ul{ li{ - float: left; + float: left; } } @@ -81,16 +81,17 @@ padding: 0; margin-top: 0; margin-bottom: 0; - color: #333; } a { - color: #333; text-decoration: none; - padding:15px 15px 12px 15px; + padding: 15px; + font-size: 0.85em; } + @media (min-width:1025px) { - z-index: 105; + // margin-bottom: -4em; + position: relative; } } .navbar-header h1.default_site_h1, .navbar-header h2.default_site_h1{ @@ -101,6 +102,9 @@ z-index: 10; padding: 0; margin: 0; + @media (min-width: $screen-sm) { + + } // @media (max-width: $screen-sm) { // width: 100%; // display: flex; @@ -141,7 +145,7 @@ margin: 0; } width: 80%; - height: 3em; + height: 3.5em; padding: 0; margin: 0; } @@ -156,10 +160,10 @@ height: 60px; } @media(max-width: $screen-xs){ - height: 45px !important; + height: 50px !important; } @media(max-width: 820px)and(min-width:$screen-xs ){ - height: 45px!important; + height: 50px!important; } } } @@ -167,7 +171,7 @@ } .navbar-toggle { - margin-top: 0.8em; + margin-top: 1em; position: absolute; right: 0; // border-radius: 0.125em; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index f3dcd6d..9ea0c8e 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -8,31 +8,9 @@ // 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; + z-index: 101; } .banner-pager .active-slide button{ background: $theme-color-second!important; @@ -44,9 +22,6 @@ iframe{ border:0; } .w-ba-banner { - position: relative; - overflow: hidden; - width: 100%; .cursor { cursor: pointer; } @@ -91,7 +66,7 @@ iframe{ @include list-reset; position: absolute; bottom: 0.5rem!important; - z-index: 100; + z-index: 200; text-align:center; width: 100%; li { @@ -256,7 +231,7 @@ ul.button-mid{ .banner-pager { right: 1em; top: -2em; - z-index: 100; + z-index: 102; display: none; } .button-mid{ @@ -321,15 +296,11 @@ ul.button-mid{ } } } - // Widget 1 -.ad-banner-widget-1 { +.ba-banner-widget-1 { .banner-overlay{ padding: 3.5em 5em; - background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); - position: absolute; - z-index: 99; - color: #fff; + background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); } .w-ba-banner__caption { @@ -379,7 +350,7 @@ ul.button-mid{ .banner-pager { right: 1em; top: -2em; - z-index: 100; + z-index: 102; display: none; } } @@ -422,7 +393,9 @@ ul.button-mid{ .ba-banner-widget-5 { margin: 1em 0; .slide-img { + @media(min-width:769px){ padding: 0; + } } .slide-content { z-index: 200; @@ -506,7 +479,6 @@ ul.button-mid{ } // widget8 .ba-banner-widget-8{ - position: relative; .w-ba-banner__slide{ padding: 0.5em; overflow: hidden; @@ -626,82 +598,4 @@ ul.button-mid{ a i { font-size: 0.75em; } } } -} -//Widget 10 -.ba-banner-widget-10 { - .w-ad-banner__caption{ - padding: 2em 1em; - background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); - position: absolute; - width: 100%; - bottom: 0; - color: #fff; - @extend .i-title; - } - .w-ba-banner__wrap { - text-align: center; - - @media(min-width: $screen-sm){ - display: grid; - grid-template-areas: - "g1 g2 g3" - "g1 g4 g5"; - grid-gap: 2% 1%; - grid-template-columns:32.3% 32.3% 32.3%; - } - .bannerimgwrapper{ - overflow: hidden; - position: relative; - display: block; - @media(max-width: $screen-sm){ - margin-bottom: 1em; - } - &:hover{ - img{ - transform: scale(1.1) !important; - -webkit-transition: .3s ease-out; - -moz-transition: .3s ease-out; - -ms-transition: .3s ease-out; - -o-transition: .3s ease-out; - transition: .3s ease-out; - } - } - &:nth-child(1){ - grid-area: g1; - -ms-grid-row: 1; - -ms-grid-column: 1; - -ms-grid-row-span: 3; - -ms-grid-column-span: 7; - } - &:nth-child(2){ - grid-area: g2; - -ms-grid-row: 1; - -ms-grid-column: 9; - -ms-grid-row-span: 1; - -ms-grid-column-span: 7; - } - &:nth-child(3){ - grid-area: g3; - -ms-grid-row: 1; - -ms-grid-column: 17; - -ms-grid-row-span: 1; - -ms-grid-column-span: 7; - } - &:nth-child(4){ - grid-area: g4; - -ms-grid-row: 3; - -ms-grid-column: 9; - -ms-grid-row-span: 1; - -ms-grid-column-span: 7; - } - &:nth-child(5){ - grid-area: g5; - -ms-grid-row: 3; - -ms-grid-column: 17; - -ms-grid-row-span: 1; - -ms-grid-column-span: 7; - } - } - } - } \ No newline at end of file diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 271b22b..b652447 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -102,66 +102,68 @@ 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; -// } -// } +//直式選單更改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: 3.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; + } + } +} +.layout-header .navbar-header .navbar-brand{ + @media(min-width: 1200px){ + padding-left: 0; + } +} @@ -419,14 +421,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; } } }