From 50061c30492eaffc92bf254fc5049e2c3f1741b2 Mon Sep 17 00:00:00 2001 From: ken Date: Mon, 21 Sep 2026 19:46:25 +0800 Subject: [PATCH] up --- .../stylesheets/template/base/_accesskey.scss | 2 +- assets/stylesheets/template/base/_global.scss | 4 +- assets/stylesheets/template/base/_unity.scss | 2 +- .../stylesheets/template/layout/content.scss | 12 ++--- .../stylesheets/template/layout/header.scss | 44 +++++++++++++++++-- .../template/modules/ad_banner.scss | 2 +- assets/stylesheets/template/modules/menu.scss | 2 +- .../template/modules/web_resource.scss | 8 ++++ home/index.html.erb | 8 +++- modules/announcement/_annc_widget22.html.erb | 2 +- modules/announcement/_annc_widget5.html.erb | 2 +- 11 files changed, 68 insertions(+), 20 deletions(-) diff --git a/assets/stylesheets/template/base/_accesskey.scss b/assets/stylesheets/template/base/_accesskey.scss index 065e503..3523ed3 100644 --- a/assets/stylesheets/template/base/_accesskey.scss +++ b/assets/stylesheets/template/base/_accesskey.scss @@ -7,7 +7,7 @@ a[accesskey] { } #orbit-bar a[accesskey] { - color: #525252; + color: #333; margin-left: 0; position: relative; &:hover { diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss index 34bf3ae..6b06486 100644 --- a/assets/stylesheets/template/base/_global.scss +++ b/assets/stylesheets/template/base/_global.scss @@ -82,7 +82,7 @@ a[href="/en/sitemap"]{ } blockquote{ - color: #525252; + color: #333; padding: 0; margin: 0; font-size: unset; @@ -97,7 +97,7 @@ a[href="/en/sitemap"]{ display: none; } a{ - color: #525252; + color: #333; text-decoration: none; display: inline-block; height: 40px; diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index d1770ad..6494ca5 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -133,7 +133,7 @@ transform: rotate(45deg); float: left; i{ - color: #525252; + color: #333; font-size: 1em!important; padding: 0!important; } diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index fa75456..84eba20 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -96,22 +96,22 @@ position: relative; width: 100%; // background-image: linear-gradient(280deg, #e6e6e6 56%, #fff 0); - padding-top: 2em; - padding-bottom: 2em; + padding-top: 1em; + padding-bottom: 1em; } .contentwrap2{ overflow: hidden; position: relative; width: 100%; - padding-top: 2em; - padding-bottom: 2em; + padding-top: 1em; + padding-bottom: 1em; } .contentwrap3{ overflow: hidden; position: relative; width: 100%; - padding-top: 2em; - padding-bottom: 2em; + padding-top: 1em; + padding-bottom: 1em; } .iconwrap{ padding: 4em 0 0; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 55b7a6e..84e56d1 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -2,7 +2,11 @@ @import "../initial"; #orbit-bar .orbit-bar-title a { - color: #333 !important; + color: #fff !important; +} +sup { + line-height: 0; + font-size: 0.6em; } .outdropdowns{ background: linear-gradient( @@ -82,11 +86,11 @@ padding: 0; margin-top: 0; margin-bottom: 0; - color: #333; + color: #fff; } a { - color: #333; + color: #fff; text-decoration: none; padding:15px 15px 12px 15px; } @@ -99,6 +103,38 @@ .navbar-header h1.default_site_h1, .navbar-header h2.default_site_h1{ display: flex; align-items: center; +} +.default_site_h1 { + display: flex; + align-items: center; + font-size: 1rem; + font-weight: normal; + margin: 0; + color: $theme-color-second; + @media(max-width:1300px){ + flex-wrap: wrap; + } + strong { + display: flex; + flex-direction: column; + justify-content: center; + border-left: 1px solid rgba($theme-color-second, 0.2); + padding-left: 1em; + margin-left: 0.5em; + line-height: 1; + font-weight: normal; + span { + font-size: 1.2em; + font-weight: bold; + display: block; + } + } + + sup { + font-size: 0.65em; + color: #6a6a6a; + align-self: flex-end; + } } .navbar-header { z-index: 10; @@ -154,7 +190,7 @@ } .site-logo { - filter: brightness(0) invert(1); + filter: brightness(0) invert(1); margin-right: 0.5em; float: left; height: 50px; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index efaf2d3..721abe0 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -386,7 +386,7 @@ ul.button-mid{ .ad-overlay { padding:1em; position: relative; - background: $theme-color-second; + background: $theme-color-second!important; } .controlplay { right: 0; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index cf93577..8b49d3a 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -547,7 +547,7 @@ width: 80%; position: absolute; right: 0; - background: #ffffff; + background: $theme-color-four; height: 100%; top: 0; padding-top: 40px; diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index 0a39409..a92bb01 100644 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -10,6 +10,13 @@ } } } +.modules-menu{ + @media(min-width:769px){ + .widget-content{ + width: 100%!important; + } + } +} .liWrapper{ position: relative; } @@ -139,6 +146,7 @@ .widget-content { border-radius: 1em; overflow: hidden; + padding: 0; &:hover{ transition: all 0.3s; background-color: rgba($theme-color-second, 0.1); diff --git a/home/index.html.erb b/home/index.html.erb index 8c078f9..ad08855 100644 --- a/home/index.html.erb +++ b/home/index.html.erb @@ -10,7 +10,7 @@
-
+
@@ -113,7 +113,11 @@
- +
+
+
+
+
<%= render_footer %> diff --git a/modules/announcement/_annc_widget22.html.erb b/modules/announcement/_annc_widget22.html.erb index b1d48fd..e80d594 100644 --- a/modules/announcement/_annc_widget22.html.erb +++ b/modules/announcement/_annc_widget22.html.erb @@ -34,7 +34,7 @@ {{status}}

- {{title}} + {{title}}

{{subtitle}}

diff --git a/modules/announcement/_annc_widget5.html.erb b/modules/announcement/_annc_widget5.html.erb index 8ecca3e..86dc57d 100644 --- a/modules/announcement/_annc_widget5.html.erb +++ b/modules/announcement/_annc_widget5.html.erb @@ -20,7 +20,7 @@ {{status}} - {{title}} + {{title}}

{{subtitle}}

{{orbithashtags}}