From 11fa38de6f5b8775e692ba76f80a10944bdad55b Mon Sep 17 00:00:00 2001 From: rulingcom Date: Fri, 17 Sep 2021 15:51:01 +0800 Subject: [PATCH] Updated --- assets/javascripts/app.js | 2 +- assets/stylesheets/template/RWD.scss | 37 +++++ .../stylesheets/template/layout/content.scss | 6 + .../stylesheets/template/layout/footer.scss | 9 +- .../stylesheets/template/layout/header.scss | 23 ++- assets/stylesheets/template/template.scss | 2 - home/footer.html.erb | 3 +- modules/announcement/_annc_widget18.html.erb | 148 +++++++++--------- .../_ruling_weather_widget1.html.erb | 102 ++++++------ modules/ruling_weather/info.json | 26 +-- template.json | 2 +- 11 files changed, 201 insertions(+), 159 deletions(-) diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index eb6ef14..ecebdcb 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -522,7 +522,7 @@ //背景widget設定 if ( location.href.search('editmode=on') != -1 ) { $('.background').css('z-index','0'); - $('.layout-footer').css('position','relative') + } else { $('.background').css('z-index','-1'); diff --git a/assets/stylesheets/template/RWD.scss b/assets/stylesheets/template/RWD.scss index 0c564e0..d65805d 100644 --- a/assets/stylesheets/template/RWD.scss +++ b/assets/stylesheets/template/RWD.scss @@ -23,4 +23,41 @@ position: absolute!important; } } + .linkwraper{ + flex-wrap: wrap; + } +} + +@media(min-width: 1600px){ + .linkwraper{ + flex-wrap: wrap; + margin-bottom: 6em; + } +} +@media(max-width: 1600px){ + .linkwraper{ + ul{ + padding-left: 20px; + } + } +} + .linkwraper{ + display:flex; + width: 100%; + } +@media only screen and (min-width: 768px) and (max-width: 1600px){ + .linkone{ + width:50%; + } + .linktwo{ + width:50%; + } + } +@media(max-width:$screen-xs){ + .linkone{ + width:100%; + } + .linktwo{ + width:100%; + } } diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index c4e77b0..1c784f3 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -10,6 +10,12 @@ margin-left: 430px; } } +.layout-content-inner{ + padding: 0; +} +.layout-content-box2{ + padding: 0; +} .layout-content { min-height: 37.5em; diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index f163f0a..67ff432 100644 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -26,10 +26,10 @@ @media(min-width:1025px){ position: fixed; bottom: 0; - left: 2em; + left: 2.5em; .layout-footer-inner{ - width: 350px!important; - padding: 0 3em!important; + width: 360px!important; + padding: 0 1.2em!important; } } @media only screen and (min-width: 768px) and (max-width: 1024px) { @@ -61,3 +61,6 @@ width: 100%!important; } } +.footerbox{ + padding: 0; +} diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index d4afc8b..f7255a8 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -32,15 +32,13 @@ } .header-banner { overflow: hidden; } .header-nav { - padding: 1em 0; + padding: 0.5em 1em; color: $theme-color-main; font-family: $main-font; text-transform:uppercase; & > * { display: inline-block; - margin-top: 0; - margin-bottom: 0; font-size: 0.8em; color: $theme-color-main; } @@ -48,20 +46,17 @@ a { color: $theme-color-main; text-decoration: none; - padding: 15px; } - @media (min-width: $screen-sm) { + @media (min-width: 1025px) { text-align: inherit; - top: 131px; + top: 120px; position: fixed!important; + width: 400px!important; } - @media (min-width: 1100px) and (min-width: 1100px){ - width: 430px!important; - } - @media (min-width: 1100px) and (min-width: 1350px){ - width: 380px!important; - } + @media (min-width: 1601px){ + top: 130px!important; + } } .navbar-header { @@ -183,7 +178,9 @@ } } .header-nav{ - padding:0 3em!important; + @media (min-width: 1025px){ + padding:0 3em!important; + } } .nav-menu{ display:flex!important; diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index c376388..713e588 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -32,10 +32,8 @@ // container setting .response-container { position: relative; - padding: 0; @media (min-width: $screen-xs) { width: 100%; - padding: 0; } @media (min-width: $screen-sm) { diff --git a/home/footer.html.erb b/home/footer.html.erb index 3b2397b..51b71e0 100644 --- a/home/footer.html.erb +++ b/home/footer.html.erb @@ -1,7 +1,8 @@ \ No newline at end of file + diff --git a/modules/announcement/_annc_widget18.html.erb b/modules/announcement/_annc_widget18.html.erb index 00cf9e7..07139ed 100644 --- a/modules/announcement/_annc_widget18.html.erb +++ b/modules/announcement/_annc_widget18.html.erb @@ -1,74 +1,74 @@ -
-
-

- {{widget-title}} -

- <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> -
- -
- +
+
+

+ {{widget-title}} +

+ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> +
+ +
+ diff --git a/modules/ruling_weather/_ruling_weather_widget1.html.erb b/modules/ruling_weather/_ruling_weather_widget1.html.erb index c63e878..c532056 100644 --- a/modules/ruling_weather/_ruling_weather_widget1.html.erb +++ b/modules/ruling_weather/_ruling_weather_widget1.html.erb @@ -1,52 +1,52 @@ -
- -
-
-
- -
-
-
{{wx_text}}
-
{{avgt}}℃
-
-
-
{{uv-head}}
-
{{uvi_text}}
-
-
-
-
-
{{relative_humidity-head}}
-
{{rh}}%
-
-
-
{{current_wind_speed-head}}
-
{{ws}}m/s
-
-
-
{{accumulated_rainfall-head}}
-
{{rain}}mm
-
-
-
+
+ +
+
+
+ +
+
+
{{wx_text}}
+
{{avgt}}℃
+
+
+
{{uv-head}}
+
{{uvi_text}}
+
+
+
+
+
{{relative_humidity-head}}
+
{{rh}}%
+
+
+
{{current_wind_speed-head}}
+
{{ws}}m/s
+
+
+
{{accumulated_rainfall-head}}
+
{{rain}}mm
+
+
+
\ No newline at end of file diff --git a/modules/ruling_weather/info.json b/modules/ruling_weather/info.json index 2a20a42..2d93212 100644 --- a/modules/ruling_weather/info.json +++ b/modules/ruling_weather/info.json @@ -1,14 +1,14 @@ -{ - "frontend": [ - ], - "widgets" : [ - { - "filename" : "ruling_weather_widget1", - "name" : { - "zh_tw" : "1. 天氣呈現樣式1", - "en" : "1. Weather layout 1" - }, - "thumbnail" : "weather1_thumbs.png" - } - ] +{ + "frontend": [ + ], + "widgets" : [ + { + "filename" : "ruling_weather_widget1", + "name" : { + "zh_tw" : "1. 天氣呈現樣式1", + "en" : "1. Weather layout 1" + }, + "thumbnail" : "weather1_thumbs.png" + } + ] } \ No newline at end of file diff --git a/template.json b/template.json index 1f324fc..ccbd030 100644 --- a/template.json +++ b/template.json @@ -1 +1 @@ -{"key":"asia_kstyle1","title":"asia_Kstyle1","author":"ken","thumbnail":"assets/images/design_thumb.png"} \ No newline at end of file +{"key":"asia_Kstyle1","title":"asia_Kstyle1","author":"ken","thumbnail":"assets/images/design_thumb.png"} \ No newline at end of file