From c455a537e21a6bab34fe6ca698deb31b2c3138b4 Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 24 Sep 2026 14:06:23 +0800 Subject: [PATCH] up --- assets/stylesheets/template/base/_global.scss | 6 +-- .../stylesheets/template/layout/content.scss | 4 +- .../stylesheets/template/layout/header.scss | 10 ++++- .../template/modules/announcement.scss | 7 +++- assets/stylesheets/template/modules/menu.scss | 23 +++++++++++ .../template/modules/web_resource.scss | 6 ++- home/index.html.erb | 38 ++++++------------- 7 files changed, 58 insertions(+), 36 deletions(-) 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/content.scss b/assets/stylesheets/template/layout/content.scss index 8f19334..4882821 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -86,8 +86,8 @@ overflow: hidden; position: relative; width: 100%; - padding-bottom: 3em; - padding-top: 2em; + padding-bottom: 1em; + padding-top: 1em; // p{ // padding-bottom: 1em; // } diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index c516c8a..e519bbf 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -105,6 +105,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; } @@ -143,6 +146,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:769px){ @@ -203,7 +211,7 @@ sup { float: left; height: 50px; padding-right: 0.5em; - width: auto!important; + width: auto; @media(min-width: 1024px){ height: 50px; } 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 71d0487..8a60206 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -78,6 +78,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; + } + } -webkit-transition: all .3s ease; -moz-transition: all .3s ease; -ms-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 fbcd081..5203119 100644 --- a/home/index.html.erb +++ b/home/index.html.erb @@ -17,10 +17,15 @@
/accesskey" title="Content">::: -
-
+
+
+
+
+
+
+
@@ -36,13 +41,6 @@
-
-
- -
- -
-
@@ -53,12 +51,9 @@
+
-
-
- -
-
+
@@ -78,15 +73,7 @@
-
-
@@ -103,15 +90,12 @@
-
-
- -
-
+
+