diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 22f2653..15abf25 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -290,9 +290,9 @@ blockquote ol:last-child, blockquote p:last-child, blockquote ul:last-child { } iframe{ @media(max-width:1024px){ - width: 100%!important; - aspect-ratio: 16 / 9; - height: auto !important; + width: 100%; + // aspect-ratio: 16 / 9; + // height: auto !important; } } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 8af3a9a..cc0d34a 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -99,6 +99,9 @@ sup { } } .navbar-header h1.default_site_h1, .navbar-header h2.default_site_h1{ + @media(max-width:768px){ + font-size: 0.8em; + } // display: flex; // align-items: center; white-space: normal; @@ -112,7 +115,6 @@ sup { } & > * { clear: both; - display: block; } } .navbar-header { diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index f25a090..01a47e8 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -2306,6 +2306,10 @@ img.w-annc__img { } //widget 15 .widget-announcement-15 { + .w-annc__item_inner{ + -webkit-box-shadow: 0 1px 2px 0 #0000002e; + box-shadow: 0 1px 2px 0 #0000002e; + } .cycle-carousel-wrap { align-items: stretch; } @@ -2354,10 +2358,9 @@ img.w-annc__img { // } .w-annc__img-wrap { - margin: 0; overflow: hidden; - border: 2px solid #333; + aspect-ratio: 16 / 9; aspect-ratio: 16 / 9; // @media(min-width:480px)and(max-width:820px){ // height: 9.5em; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index ef4d020..82832fa 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -115,6 +115,29 @@ // } //固定選單 .navFixed { + @media (max-width: 768px) { + .site-logo { + display: block!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; + height: 40px !important; + width: auto !important; + } + .default_site_h1{ + padding: 0.5em !important; + } + .navbar-header .default_site_h1>*{ + display: none; + -webkit-transition: all .3s ease; + -moz-transition: all .3s ease; + -ms-transition: all .3s ease; + -o-transition: all .3s ease; + transition: all .3s ease; + } + } @media (max-width: 768px){ -webkit-transition: all .3s ease; -moz-transition: all .3s ease; diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index f62ad79..b849988 100644 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -72,7 +72,11 @@ vertical-align: top; } .widget-link { - margin-bottom: 1em; + margin-bottom: 1em; + margin-top: 1em; + .widget-link__more{ + display: none; + } } .morebken{ font-size: 1.2em; diff --git a/home/index.html.erb b/home/index.html.erb index 3570229..4ba145a 100644 --- a/home/index.html.erb +++ b/home/index.html.erb @@ -16,11 +16,15 @@