From dbe874f3cd077c459f75786b7694315d4a175581 Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 21 Aug 2025 12:54:33 +0800 Subject: [PATCH] 'css' --- assets/javascripts/app.js | 13 + assets/stylesheets/template/base/_unity.scss | 5 +- .../stylesheets/template/layout/header.scss | 2 +- .../template/modules/ad_banner.scss | 32 +- .../template/modules/announcement.scss | 42 +- .../template/modules/archives.scss | 5 + .../template/modules/event_news.scss | 62 ++- .../stylesheets/template/modules/hashtag.scss | 25 ++ .../stylesheets/template/modules/member.scss | 12 + assets/stylesheets/template/modules/menu.scss | 390 +++++++++++------- .../template/modules/universal-table.scss | 41 +- .../stylesheets/template/modules/video.scss | 5 +- .../stylesheets/template/widget/sitemenu.scss | 5 + modules/announcement/_annc_widget15.html.erb | 2 +- modules/announcement/_annc_widget19.html.erb | 2 +- modules/announcement/_annc_widget22.html.erb | 2 +- modules/announcement/annc_index1.html.erb | 2 +- modules/announcement/annc_index10.html.erb | 2 +- modules/announcement/annc_index11.html.erb | 2 +- modules/announcement/annc_index12.html.erb | 2 +- modules/announcement/annc_index13.html.erb | 2 +- modules/announcement/annc_index14.html.erb | 2 +- modules/announcement/annc_index15.html.erb | 2 +- modules/announcement/annc_index16.html.erb | 2 +- modules/announcement/annc_index18.html.erb | 2 +- modules/announcement/annc_index19.html.erb | 2 +- modules/announcement/annc_index2.html.erb | 2 +- modules/announcement/annc_index20.html.erb | 2 +- modules/announcement/annc_index21.html.erb | 2 +- modules/announcement/annc_index3.html.erb | 2 +- modules/announcement/annc_index4.html.erb | 2 +- modules/announcement/annc_index5.html.erb | 2 +- modules/announcement/annc_index6.html.erb | 2 +- modules/announcement/annc_index7.html.erb | 2 +- modules/announcement/annc_index8.html.erb | 2 +- modules/announcement/annc_index9.html.erb | 2 +- .../_annc_widget15.html.erb | 2 +- .../custom_announcement/annc_index7.html.erb | 2 +- .../_event_news_widget15.html.erb | 2 +- .../_event_news_widget22.html.erb | 2 +- .../event_news_mod/event_news_index1.html.erb | 2 +- .../event_news_index10.html.erb | 2 +- .../event_news_index11.html.erb | 2 +- .../event_news_index12.html.erb | 2 +- .../event_news_index14.html.erb | 2 +- .../event_news_index15.html.erb | 2 +- .../event_news_index16.html.erb | 2 +- .../event_news_index17.html.erb | 2 +- .../event_news_index18.html.erb | 2 +- .../event_news_index19.html.erb | 2 +- .../event_news_mod/event_news_index2.html.erb | 2 +- .../event_news_index20.html.erb | 2 +- .../event_news_index21.html.erb | 14 +- .../event_news_mod/event_news_index3.html.erb | 2 +- .../event_news_mod/event_news_index4.html.erb | 2 +- .../event_news_mod/event_news_index5.html.erb | 2 +- .../event_news_mod/event_news_index6.html.erb | 2 +- .../event_news_mod/event_news_index7.html.erb | 2 +- .../event_news_mod/event_news_index8.html.erb | 2 +- .../event_news_mod/event_news_index9.html.erb | 2 +- modules/member/show.html.erb | 13 +- modules/personal_journal/index.html.erb | 25 +- .../personal_journal/index_search1.html.erb | 22 +- .../publication/publications_index1.html.erb | 2 +- .../publication/publications_index2.html.erb | 2 +- .../publication/publications_index3.html.erb | 2 +- modules/universal_table/_tag_cloud.html.erb | 112 +++++ modules/universal_table/info.json | 10 + .../_video_pro_widget_jqcloud1.html.erb | 4 +- modules/video_pro/info.json | 24 +- .../thumbs/video_pro_widget1_thumb.png | Bin 0 -> 10021 bytes .../thumbs/video_pro_widget2_thumb.png | Bin 0 -> 14582 bytes .../thumbs/video_pro_widget3_thumb.png | Bin 0 -> 14453 bytes .../thumbs/video_pro_widget4_thumb.png | Bin 0 -> 9877 bytes .../thumbs/video_pro_widget5_thumb.png | Bin 0 -> 13144 bytes .../thumbs/video_pro_widget6_thumb.png | Bin 0 -> 10445 bytes modules/video_pro/video_pro_index1.html.erb | 2 +- modules/video_pro/video_pro_index2.html.erb | 2 +- .../video_pro/video_pro_index2_tag.html.erb | 2 +- modules/video_pro/video_pro_index3.html.erb | 2 +- modules/video_pro/video_pro_index4.html.erb | 2 +- .../web_resource/_web_res_widget3.html.erb | 2 +- .../_site_menu_widget1.html.erb | 4 +- .../_site_menu_widget2.html.erb | 4 +- .../_site_menu_widget3.html.erb | 4 +- .../_site_menu_widget4.html.erb | 4 +- 86 files changed, 719 insertions(+), 270 deletions(-) create mode 100644 assets/stylesheets/template/modules/hashtag.scss create mode 100644 modules/universal_table/_tag_cloud.html.erb create mode 100644 modules/video_pro/thumbs/video_pro_widget1_thumb.png create mode 100644 modules/video_pro/thumbs/video_pro_widget2_thumb.png create mode 100644 modules/video_pro/thumbs/video_pro_widget3_thumb.png create mode 100644 modules/video_pro/thumbs/video_pro_widget4_thumb.png create mode 100644 modules/video_pro/thumbs/video_pro_widget5_thumb.png create mode 100644 modules/video_pro/thumbs/video_pro_widget6_thumb.png diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index b5a6dfb..1547748 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -1203,6 +1203,19 @@ $(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/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 9d436d4..ce9d706 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -18,13 +18,14 @@ } } } -.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; @@ -39,7 +40,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 28f5154..18a6687 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -56,7 +56,7 @@ } .header-banner { overflow: hidden; } .header-nav { - padding:1em 0 0 0; + padding: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 a7800c7..f3dcd6d 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -8,6 +8,28 @@ // 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; @@ -69,7 +91,7 @@ iframe{ @include list-reset; position: absolute; bottom: 0.5rem!important; - z-index: 1000; + z-index: 100; text-align:center; width: 100%; li { @@ -234,7 +256,7 @@ ul.button-mid{ .banner-pager { right: 1em; top: -2em; - z-index: 102; + z-index: 100; display: none; } .button-mid{ @@ -306,7 +328,7 @@ ul.button-mid{ padding: 3.5em 5em; background-image: linear-gradient(180deg, transparent 0, #00000066 40%, #000); position: absolute; - z-index: 999; + z-index: 99; color: #fff; } .w-ba-banner__caption { @@ -357,7 +379,7 @@ ul.button-mid{ .banner-pager { right: 1em; top: -2em; - z-index: 102; + z-index: 100; display: none; } } @@ -400,9 +422,7 @@ 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/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 3df9986..4d5d061 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -53,11 +53,17 @@ .w-annc__table{ background-color: #fff; .w-annc__th{ - border-bottom: 0.125em solid #ddd; + // border-bottom: 0.125em solid #ddd; } tr{ @media(max-width: $screen-xs){ - margin-bottom: 10px; + margin-bottom: 10px; + display: flex; + flex-wrap: wrap; + width: 100%; + td{ + width: 100%; + } } } } @@ -294,9 +300,6 @@ .w-annc__list > .w-annc__item:nth-child(3n+1) { clear: both; } - .w-annc__entry-title { - height: 2.5em; - } .w-annc__img-wrap { height: 14.5em; margin:0; @@ -908,7 +911,6 @@ font-family: $main-font; font-weight: bold; } - .w-annc__widget-title { float: left; } .w-annc__more { margin-top: 1.5em; display: none; @@ -2066,6 +2068,9 @@ } //widget 15 .widget-announcement-15 { + .w-annc__entry-title{ + height: 2.5em; + } .cycle-carousel-wrap{ display: flex; align-items: baseline; @@ -2479,7 +2484,6 @@ .i-annc__item { list-style: none; overflow: hidden; - border-bottom: 1px solid #bbb; padding: 1em 0; // box-shadow: #0000004d 0 0 4px; // background: #fff; @@ -2518,7 +2522,7 @@ } } tr{ - border: 0.0625em solid #ddd!important; + // border: 0.0625em solid #ddd!important; } td { font-size: 1rem; @@ -2599,7 +2603,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr>td:first-child:before, table.dataT table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th:first-child:before { background-color: $theme-gray !important; } - +.i-annc__table{ + border: 0.0625em solid #ddd !important; +} .i-annc__table .child span.dtr-data li { padding: 0 0.5em; } @@ -2756,11 +2762,13 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl clear: both; } - + .i-annc__content-wrap{ + margin: 0.5em; + } .i-annc__img-wrap { overflow: hidden; height: 13.5em; - margin: 1em 0.5em; + margin: 0.5em; img { @media (max-width:767px) { transform: scale(1) !important; @@ -2880,7 +2888,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl // Index-13 .index-announcement-13 { thead{ - border-bottom: 0.125em solid #ddd; + } .child{ li{ @@ -2904,7 +2912,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl // Index-14 .index-announcement-14 { thead{ - border-bottom: 0.125em solid #ddd; + // border-bottom: 0.125em solid #ddd; } .child{ li{ @@ -2980,8 +2988,12 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl // Index-17 .index-announcement-17 { @media(max-width: $screen-xs){ + .i-annc__table{ + border: 0 !important; + } tr{ margin-bottom: 10px; + border: 0.0625em solid #ddd !important; } th{ width: 100%; @@ -3205,7 +3217,8 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl border-radius: 4px; behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 4px; - -moz-border-radius: 4px + -moz-border-radius: 4px; + z-index: 100; } .VivaTimeline dl dd { @@ -3464,6 +3477,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl border-radius: 10px; transition: all 0.3s; width: calc( 100%/5 - 1.5em); + margin-bottom: 1em; &:hover{ box-shadow: 2px 2px 7px 2px rgba(0, 0, 0, 0.5); transform: translateY(-5px); diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index 8f823f5..501260a 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -7,6 +7,11 @@ // // Widget // ## gerenral styles +.i-archive__list{ + .date-thead{ + min-width: 4em; + } +} .i-archive{ tr{ border: 0.0625em solid #ddd!important; diff --git a/assets/stylesheets/template/modules/event_news.scss b/assets/stylesheets/template/modules/event_news.scss index 6e02aa0..c30b4c3 100644 --- a/assets/stylesheets/template/modules/event_news.scss +++ b/assets/stylesheets/template/modules/event_news.scss @@ -1,6 +1,12 @@ @charset "utf-8"; @import "../initial"; +[data-list="event_news_links"]{ + padding: 0; + li{ + list-style: none; + } +} .w-annc__list{ clear: both; } @@ -431,7 +437,6 @@ @media(max-width: $screen-xs){ tr{ margin-bottom: 10px; - // border: 0.125em solid #ddd !important; } th{ width: 100%; @@ -586,7 +591,8 @@ .index-eventnews-11 { .i-annc__item{ - width: 100% + width: 100%; + border-bottom: 0.0625em solid #ddd; } .child{ li{ @@ -608,29 +614,19 @@ // Index-12 .index-eventnews-12 { .i-annc__item{ - width: 100% + width: 100%; + border-bottom: 0.0625em solid #ddd; } .child{ li{ list-style: none; } } - @media(max-width: $screen-xs){ - .i-annc__th--date{ - width:50%!important; - } - .i-annc__th--title{ - width:50%!important; - } - } - table tr{ - flex-wrap: unset!important; - } } // Index-13 .index-eventnews-13 { thead{ - border-bottom: 0.125em solid #ddd; + } .child{ li{ @@ -654,7 +650,7 @@ // Index-14 .index-eventnews-14 { thead{ - border-bottom: 0.125em solid #ddd; + } .child{ li{ @@ -747,7 +743,7 @@ @media(max-width: $screen-xs){ tr{ margin-bottom: 10px; - // border: 0.125em solid #ddd !important; + } th{ width: 100%; @@ -781,7 +777,7 @@ @media(max-width: $screen-xs){ tr{ margin-bottom: 10px; - // border: 0.125em solid #ddd !important; + } th{ width: 100%; @@ -1181,4 +1177,32 @@ } .widget-event-news-calendar-2.w-calendar .w-calendar-title{ background:$theme-color-second; -} \ No newline at end of file +} + + + .carousel_images_slide{ + transform: scale(0.8); + width: 10em; + margin: auto!important; + display: flex; + justify-content: center; + } + .carousel_img-wrap{ + width: 25px; + height: 25px; + border-radius: 2em; + overflow: hidden; + -webkit-filter: grayscale(100%); + filter: grayscale(100%); + backdrop-filter: saturate(180%) blur(20px); + img{ + border-radius: 1em; + overflow: hidden; + } + } + .carousel_images_slide{ + margin-top: 1em !important; + } + .carousel_img_item{ + display: block!important; + } diff --git a/assets/stylesheets/template/modules/hashtag.scss b/assets/stylesheets/template/modules/hashtag.scss new file mode 100644 index 0000000..cfdd4c8 --- /dev/null +++ b/assets/stylesheets/template/modules/hashtag.scss @@ -0,0 +1,25 @@ +@charset "utf-8"; + +@import "../initial"; + + + +p.s-annc__post-orbithashtags{ + clear: both; +} +a.orbit-hash-tag { + list-style: none; + background: #e0edff; + color: #0a84ff; + margin-right: 0.5em; + border-radius: 0.5em; + padding: 0.2em 0.5em; + margin-bottom: 0.5em; + display: inline-block; + &:hover{ + background: #0a84ff; + transform: translatey(-2px); + transition: transform 0.4s; + color: #fff; + } +} \ No newline at end of file diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 25c7f06..4937ab1 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -471,6 +471,13 @@ // Show page .show-member { font-family: $sub-font; + .memberul{ + padding: 0; + li{ + margin-bottom: 0.5em; + list-style: none; + } + } th, td { font-size: 0.938em; @@ -526,3 +533,8 @@ .member-data { width: 100%; } } } +.show-member{ + .table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th{ + border: 0; + } +} \ No newline at end of file diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 022d0d4..271b22b 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -2,6 +2,79 @@ @import "../initial"; +// // 選單樣式2 +// .modules-menu .modules-menu-level-1 > li:hover, .modules-menu .modules-menu-level-1 > li.hover-class{ +// background-color: transparent!important; +// >a{ +// text-decoration: underline; +// } +// } +// .modules-menu{ +// @media (min-width: $screen-sm){ +// li{ +// padding-left: 0!important; +// } +// .modules-menu-level-1 > li > a{ +// color: $theme-color-second!important; +// } +// } +// .modules-menu-level-0 > li{ +// @media (min-width: $screen-sm){ +// position: static!important; +// } +// } +// +// .modules-menu-level-1{ +// +// @media (min-width: $screen-sm){ +// min-width:unset; +// flex-wrap: wrap; +// justify-content: flex-start; +// display: flex!important; +// visibility: hidden; +// opacity: 0; +// width: 100vw!important; +// box-shadow: 2px 2px 5px #00000033; +// margin:0; +// padding:1em 13% 3em!important; +// transition-duration: 0.5s; +// background: #f0f0f0; +// } +// } +// .modules-menu-level-0 > li:hover .modules-menu-level-1, .modules-menu .modules-menu-level-0 > li.hover-class .modules-menu-level-1{ +// visibility: visible!important; +// opacity: 1!important; +// } +// +// .modules-menu-level-2 { +// right:auto!important; +// display: block; +// top: auto!important; +// left: auto!important; +// background-color: transparent!important; +// position: relative!important; +// } +// .modules-menu-level-1{ +// @media (min-width: $screen-sm) { +// & > li { +// width: 25%; +// & > a { +// padding-left: 1em; +// padding: 5px 0; +// } +// +// &:hover { +// .modules-menu-level-2 { +// display: block; +// } +// } +// } +// .modules-menu-level-2{ +// display: block; +// } +// } +// } +// } //固定選單 .navFixed { @@ -21,7 +94,7 @@ min-width: 100%; -webkit-backdrop-filter: saturate(180%) blur(20px); backdrop-filter: saturate(180%) blur(20px); - background-color: #ffffffd9; + background-color: #fff; -webkit-transition: all .3s ease; -moz-transition: all .3s ease; -ms-transition: all .3s ease; @@ -29,6 +102,69 @@ 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; +// } +// } + + + @@ -38,7 +174,7 @@ } } .navbar-collapse.in { - overflow: scroll!important; + overflow-y: unset; } .modules-menu { @@ -47,11 +183,8 @@ z-index: 1020; li { - white-space: nowrap; + padding: 1em; list-style: none; - @media(max-width: 768px){ - padding: 1em; - } } .menu-drop.opened { transform: rotateX(180deg); @@ -60,19 +193,20 @@ .modules-menu-level-0 { width: 100%; padding: 0; - @media (min-width:769px) { - margin: 0 0 0.8em 0; - -webkit-flex-flow: row wrap; + @media (min-width:769px)and(max-width: 1024px){ + display: flex; + flex-wrap: wrap; + justify-content:space-between; + padding: 0; + width: 100%; + } + @media (min-width:1025px) { + margin: 0; list-style: none; - float: left !important; - padding-top: 10px; display: flex; - width: 100%; - justify-content: start; - padding-left: 0; - padding-left: 6em; - padding-right: 3em; - padding-bottom: 4em; + flex-wrap: wrap; + justify-content: flex-end; + width: 65%; } .has-dropdown.level-1.active { .modules-menu-level-1 { @@ -110,7 +244,7 @@ text-align: center; border-radius: 0.13em; top: 2em; - @media(max-width: 768px){ + @media(max-width: 769px){ top: 1em; font-size: 1em; } @@ -130,21 +264,12 @@ margin: 0; padding: 0.5em; border-bottom: 0.0625em solid lighten($theme-gray, 5%); - i{ - color: #fff; - @media(max-width: 768px){ - color: $theme-color-main; - } - } + & > a { display: block; - padding: 1.125em 0; + padding: 1em; font-family: $main-font; font-size: 1.1em; - color: #fff; - @media(max-width: 768px){ - color: $theme-color-main; - } &:after{ content:''; position:absolute; @@ -162,7 +287,7 @@ bottom:0; } &.active { - text-decoration: revert; + color: $theme-color-second; background: none; &:after{ width:100%; @@ -173,7 +298,7 @@ &:hover { & > a { - text-decoration: revert; + color: $theme-color-second; background: transparent; box-shadow:none; &:after{ @@ -184,21 +309,37 @@ } @media (min-width: $screen-sm) { - // background-text-decoration: revert; + // background-color: $theme-color-second; // border-radius: 0.5em; } } + @media (min-width: $screen-sm)and(max-width: 1439px){ + &:last-child{ + .modules-menu-level-1 { + right: 0; + } + } + &:nth-last-child(2){ + .modules-menu-level-1 { + right: 0; + } + } + } @media (min-width: $screen-sm) { margin: 0; padding: 0; border-bottom: none; - width: 30%; &:first-child { margin-left: 0; } - + &:nth-last-child(2){ + .modules-menu-level-2 { + right: 100%; + left: auto; + } + } &:last-child { margin-right: 0; @@ -211,6 +352,8 @@ } & > li { + padding-right: 1em; + padding-left: 1em; & > a { padding-left: 0; @@ -225,12 +368,10 @@ } & > a { - font-size:1.2em; - color:#fff; - font-weight: 900; + font-size:1.1em; + color:#686868; + font-weight: bold; position: relative; - border-bottom: 2px solid #f8f9fa; - margin-right: 1em; } &:hover { @@ -245,15 +386,18 @@ } .modules-menu-level-1 { + display: none; list-style: none; z-index: 1; padding:0; left: auto; @media(min-width:769px){ - display: block !important; + min-width: 200px; + width:max-content; + box-shadow: 2px 2px 5px #00000033; margin:0; transition-duration: 0.5s; - padding-right: 1em; + background: #f0f0f0; & > a { padding: 1em 1.5em; } @@ -261,9 +405,7 @@ & > li { position: relative; - padding-top: 1em; - padding-left: 0; - list-style: none; + padding: 1em; // & + li { // border-top: 0.0625em solid lighten($theme-gray, 5%); // } @@ -272,23 +414,25 @@ display: block; font-family: $main-font; font-weight: 600; - color: #fff; + color: #686868; font-size: 1.1em; - @media(max-width: 768px){ - color: $theme-color-main; - } } &:hover { - // background-text-decoration: revert; - & > a { - text-decoration: revert; - color: $theme-color-second; +/* background-color: $theme-color-second;*/ + @media(max-width: 769px){ + a,i { + color:$theme-color-second; + } + } + &>a { + color:$theme-color-second; } } } @media (min-width: $screen-sm) { + position: absolute; & > li { & > a { @@ -297,7 +441,8 @@ &:hover { .modules-menu-level-2 { - + display: block; + position: absolute; } } } @@ -308,35 +453,35 @@ margin: 0; padding: 0; list-style: none; + display: none; & > li { & + li { - list-style: none; // border-top: 0.0625em solid lighten($theme-gray, 5%); } & > a { display: block; - color:#fff; + font-family: $main-font; + color:#686868; font-weight: 500; font-weight: bold; - padding-top: 1em; - @media(max-width: 768px){ - color: $theme-color-main; - } } &:hover { a{ transition: all 0.3s ease-in-out; - text-decoration: revert; - margin-left: 0.5rem; color: $theme-color-second; + margin-left: 0.5rem; } } } @media (min-width: $screen-sm) { - + top: 0; + left: 100%; + background-color: #dbdbdb; + position: absolute; + min-width: 150px; } } } @@ -362,14 +507,7 @@ padding: 0; } } -.navbar-toggle{ - @media(min-width: 769px){ - margin-top: 1em; - right:6%; - position: absolute; - display: block; - } -} + //mobile .mobile-menu { z-index: 1051; @@ -385,57 +523,30 @@ } .modules-menu { - width: 100%; + width: 80%; position: absolute; right: 0; - background: #222222a6; + background: #ffffff; height: 100%; - top: 40px; - padding-top: 0; - @media(max-width: 768px){ - width: 80%; - position: absolute; - right: 0; - background: #ffffff; - height: 100%; - top: 0; - padding-top: 40px; - } + top: 0; + padding-top: 40px; } .modules-menu .modules-menu-level-0 > li > a, .modules-menu .modules-menu-level-0 ,.modules-menu .modules-menu-level-0 > li { font-weight:bold; } .menu-drop{ - font-size: 10px ; + } .navbar-toggle { - - @media(max-width: 768px){ - display: block!important; - position: absolute; - left: 0; - background: transparent; - top: 40px; - z-index: 1; - height: 100vh; - margin: 0; - width: 20%; - border: 0; - } - @media(min-width: 769px){ - position: absolute; - right: 3%; - background: transparent; - top: 3.5em; - z-index: 11111; - height: 40px; - margin: 0; - border: 0; - -webkit-transition: -webkit-transform 0.3s; - transition: -webkit-transform 0.3s; - transition: transform 0.3s; - transition: transform 0.3s, -webkit-transform 0.3s; - } + position: absolute; + left: 0; + background: transparent; + top: 40px; + z-index: 1; + height: 100vh; + margin: 0; + width: 20%; + border: 0; } .cover { position: fixed; @@ -464,20 +575,20 @@ transition-property:transform; } .mobile-menu .modules-menu.collapse.in { - transform: translateX(100%); - -webkit-transition-timing-function: ease; - -o-transition-timing-function: ease; - transition-timing-function: ease; - -webkit-transition-duration: .35s; - -o-transition-duration: .35s; - transition-duration: .35s; - -webkit-transition-property: transform; - -o-transition-property: transform; - transition-property: transform; + transform: translateX(0%); + -webkit-transition-timing-function:ease; + -o-transition-timing-function:ease; + transition-timing-function:ease; + -webkit-transition-duration:.35s; + -o-transition-duration:.35s; + transition-duration:.35s; + -webkit-transition-property:transform; + -o-transition-property:transform; + transition-property:transform; } .mobile-menu .collapse.navbar-collapse.modules-menu { - transform: translateX(0%); + overflow-y: scroll; } .display-on{ display:block!important; @@ -494,7 +605,7 @@ align-self: center; margin-left: 10px; z-index: 999; - @media(max-width: 768px){ + @media(max-width: 769px){ position: absolute; right: 0.3em; width: 2.5em; @@ -517,26 +628,23 @@ display: block!important; visibility: visible!important; } -.mobile-menu .collapse.navbar-collapse.modules-menu{ - @media(min-width: 769px){ - // overflow-y: scroll !important; - height: 100% !important; - padding: 0; +.mobile-menu2{ + &>a{ + padding-right: 1em; + } + .menu-drop{ + top: 0.6em!important; } } -.mobile-menu1{ - @media(min-width: 769px){ - &>.menu-drop{ - display: none; +html[lang="en"]{ + .modules-menu .modules-menu-level-0{ + @media (min-width: 1025px){ + width: 50%; + } + } + .modules-menu-level-1{ + @media(min-width:769px){ + min-width: 220px!important; } } } -.navbar-toggle0{ - @media(min-width: 769px){ - position: absolute; - right: 0; - .navbar-toggle{ - transform: translateX(-100%); - } - } -} \ No newline at end of file diff --git a/assets/stylesheets/template/modules/universal-table.scss b/assets/stylesheets/template/modules/universal-table.scss index f648323..0df16c3 100644 --- a/assets/stylesheets/template/modules/universal-table.scss +++ b/assets/stylesheets/template/modules/universal-table.scss @@ -1,6 +1,7 @@ @charset "utf-8"; @import "../initial"; + .universal-table-index tbody{ width:100% ; } @@ -104,6 +105,7 @@ @media(max-width: $screen-xs){ margin-top: 0.5em; right:0; + top:-4em; } .searchbtn2, .universal-btn { line-height: 2em; @@ -166,7 +168,6 @@ display: flex; flex-wrap: wrap; padding: 0; - margin-top: 3em; } .row > div { @@ -329,3 +330,41 @@ } } } +@media (max-width: 768px) { + #hashtag-wordcloud { + width: 800px!important; + height: 500px!important; + } + + /* 讓外層容器可以左右滑動 */ + #hashtag-wordcloud-wrapper { + overflow-x: auto; + width: 100%; + } +} +#hashtag-wordcloud{ + margin-top: 1.5em; + position: relative; + margin:1.5em auto; + width: 80%; + height:400px; + overflow: hidden; + a{ + border-radius: 0.5em; + padding: 0.2em; + &:hover{ + -webkit-transform: translateY(-6px); + -ms-transform: translateY(-6px); + transform: translateY(-6px); + box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033; + -webkit-box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033; + -webkit-transition: all .3s ease; + -moz-transition: all .3s ease; + -ms-transition: all .3s ease; + -o-transition: all .3s ease; + transition: all .3s ease; + filter: brightness(0.4) saturate(1.3); + transform: scale(1.1); + } + } +} \ No newline at end of file diff --git a/assets/stylesheets/template/modules/video.scss b/assets/stylesheets/template/modules/video.scss index b697e7c..dcf46e8 100644 --- a/assets/stylesheets/template/modules/video.scss +++ b/assets/stylesheets/template/modules/video.scss @@ -963,4 +963,7 @@ background-color: #1515154d; } } -} \ No newline at end of file +} +// .wordcloud-link{ +// font-size: 1.2em; +// } \ No newline at end of file diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss index d0325c2..bfb9f68 100644 --- a/assets/stylesheets/template/widget/sitemenu.scss +++ b/assets/stylesheets/template/widget/sitemenu.scss @@ -5,10 +5,15 @@ z-index: 1; position: relative; } +.sitemenu-title{ + @extend .unity-title; +} .sitemenu-wrap{ // padding-right: 0.9375em!important; // padding-left: 0.9375em!important; margin-bottom: 1em; + z-index: 1; + position: relative; } .sitemenu-item{ list-style: none; diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb index b0b0939..8135e52 100644 --- a/modules/announcement/_annc_widget15.html.erb +++ b/modules/announcement/_annc_widget15.html.erb @@ -53,7 +53,7 @@ - +