diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss index 1c784f3..792f196 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -186,7 +186,7 @@ text-align: center; color: #333; font-size: 1em; - left: 23.5em; + left: 24em; cursor: pointer; &:hover{ color:#777; @@ -194,7 +194,7 @@ } @media(min-width:1025px){ position: fixed !important; - top: 4em; + top: 3.3em; } @media(max-width:1024px){ display: none!important; diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index 67ff432..d56a31f 100644 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -3,7 +3,7 @@ @import "../initial"; .layout-footer { - padding: 2em 0; + padding: 1em 0; color: $theme-color-main; font-size: 0.8125em; letter-spacing: 1px; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index f7255a8..93e28f6 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -2,17 +2,19 @@ @import "../initial"; .default_site_h1{ - display: contents; @media (min-width: 480px){ font-size: 1.2em!important; } + @media only screen and (min-width: 1025px) and (max-width: 1200px){ + display: flex; + } @media (max-width: 480px){ font-size: 1.5em!important; - display: grid; + display: flex; + align-items: center; padding: 0 0 0 0.5em !important; .site-logo{ margin-left: -0.8em; - width: 100% !important; margin-top: 0; } } @@ -64,6 +66,9 @@ padding: 0; margin: 0; position: fixed; + @media (min-width: 1025px){ + max-width: 30%; + } @media (max-width: 1025px) { position:relative!important; } @@ -75,13 +80,12 @@ font-size: 1em; } .navbar-brand { - margin: 0.5em; + margin: 1em; padding: 0; line-height: 3.75em; color: $theme-color-main; font-family: $main-font; @media (min-width: 1300px){ - margin: 0.5em 0.5em 0.5em 3em; } @media (max-width: 767px) { height: 5em; @@ -90,13 +94,13 @@ @media (max-width: 480px) { height: 3.5em; padding: 0.5rem; + width: 75%; } .site-logo { - width: 180px; - height: auto; - margin-right: 0.5em; - float: left; + width: auto; + height:40px; + margin-right:0.5em!important; } } } @@ -105,6 +109,8 @@ .navbar-toggle { padding: 0.875em 0.625em; margin-top: 1em; + position: absolute; + right: 0; // border-radius: 0.125em; // border-width: 0.125em; // border-color: lighten($theme-color-main, 30%); @@ -173,7 +179,6 @@ .outdropdowns{ background-color: #fff; @media (max-width: 480px) { - height: 156px; background-color: #F8F8F8; } } diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 4ba9e7c..cacd34a 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -338,6 +338,7 @@ ul.button-mid{ // Widget 0 .ba-banner-widget-0 { .w-ba-banner__wrap{ + z-index: -1; @media(max-width: $screen-xs){ height: 400px; } @@ -388,6 +389,7 @@ ul.button-mid{ position: relative; margin-top: -180px; background-color: #288E8E; + z-index: -1; @media(max-width: $screen-xs){ width: 120px; height: 90px; @@ -408,15 +410,14 @@ ul.button-mid{ } } .aad-overlay{ - background-image: linear-gradient( - 180deg - , transparent 0, rgba(0, 0, 0, 0.6) 50%, #000); + background-image: linear-gradient(180deg, transparent 0, #00000026 30%, #000000e0); padding: 1.5em 1em; height: 200px; position: absolute; width: 100%; z-index: 198; bottom: 0; + z-index: -1; } } // Widget 1 diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss index fdddf5a..681fdab 100644 --- a/assets/stylesheets/template/widget/sitemenu.scss +++ b/assets/stylesheets/template/widget/sitemenu.scss @@ -113,6 +113,5 @@ } } .sitemenu-title{ - color: #fff; margin-top: 0; } diff --git a/modules/announcement/annc_index11.html.erb b/modules/announcement/annc_index11.html.erb index 5df5931..b191161 100644 --- a/modules/announcement/annc_index11.html.erb +++ b/modules/announcement/annc_index11.html.erb @@ -1,6 +1,6 @@

{{page-title}}

- +
diff --git a/modules/announcement/annc_index12.html.erb b/modules/announcement/annc_index12.html.erb index e478a9f..3e1dbc6 100644 --- a/modules/announcement/annc_index12.html.erb +++ b/modules/announcement/annc_index12.html.erb @@ -1,6 +1,6 @@

{{page-title}}

-
{{date-head}}
+
diff --git a/modules/announcement/annc_index15.html.erb b/modules/announcement/annc_index15.html.erb index 55ddde9..a521e5f 100644 --- a/modules/announcement/annc_index15.html.erb +++ b/modules/announcement/annc_index15.html.erb @@ -1,6 +1,6 @@

{{page-title}}

-
{{date-head}}
+
diff --git a/modules/announcement/annc_index16.html.erb b/modules/announcement/annc_index16.html.erb index 006afa4..07e10c5 100644 --- a/modules/announcement/annc_index16.html.erb +++ b/modules/announcement/annc_index16.html.erb @@ -1,6 +1,6 @@

{{page-title}}

-
{{date-head}}
+
diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb index 7d4f475..6062e09 100644 --- a/modules/member/member_index2.html.erb +++ b/modules/member/member_index2.html.erb @@ -35,8 +35,8 @@ $('.i-member img').eq(i).parent().attr('title','noname'); } } - for(var i = 0;i < $('.i-member span a').length ; i++){ - if($('.i-member span a').eq(i).html().trim().replace(' ','') == "") - $('.i-member span a').eq(i).html('noname'); + for(var i = 0;i < $('.i-member span.member-data-value-name a').length ; i++){ + if($('.i-member span.member-data-value-name a').eq(i).html().trim().replace(' ','') == "") + $('.i-member span.member-data-value-name a').eq(i).html('noname'); } \ No newline at end of file diff --git a/modules/member/show.html.erb b/modules/member/show.html.erb index 66c0f89..ea66f67 100644 --- a/modules/member/show.html.erb +++ b/modules/member/show.html.erb @@ -21,7 +21,7 @@ {{data_intro_title}} -
{{date-head}}
+
diff --git a/modules/personal_activity/index.html.erb b/modules/personal_activity/index.html.erb index 6c80469..36ad70f 100644 --- a/modules/personal_activity/index.html.erb +++ b/modules/personal_activity/index.html.erb @@ -1,4 +1,4 @@ -
{{plugin_data_title}}
+
diff --git a/modules/personal_course/index.html.erb b/modules/personal_course/index.html.erb index 53f10cc..83fd717 100644 --- a/modules/personal_course/index.html.erb +++ b/modules/personal_course/index.html.erb @@ -1,4 +1,4 @@ -

{{widget-title}}

+
diff --git a/modules/personal_honor/index.html.erb b/modules/personal_honor/index.html.erb index 119a0b9..831e4c3 100644 --- a/modules/personal_honor/index.html.erb +++ b/modules/personal_honor/index.html.erb @@ -1,4 +1,4 @@ -

{{widget-title}}

+
diff --git a/modules/personal_lab/index.html.erb b/modules/personal_lab/index.html.erb index a469853..b22a8de 100644 --- a/modules/personal_lab/index.html.erb +++ b/modules/personal_lab/index.html.erb @@ -1,4 +1,4 @@ -

{{widget-title}}

+
diff --git a/modules/personal_research/index.html.erb b/modules/personal_research/index.html.erb index 180bbab..6538b0b 100644 --- a/modules/personal_research/index.html.erb +++ b/modules/personal_research/index.html.erb @@ -1,4 +1,4 @@ -

{{widget-title}}

+

{{widget-title}}