From 0c715b9b2d5743c4d20ac4887e8a550af918c506 Mon Sep 17 00:00:00 2001 From: Bohung Date: Mon, 28 Jun 2021 22:34:40 +0800 Subject: [PATCH] Update. Fix accessibility. --- assets/stylesheets/bootstrap/_variables.scss | 20 +++++++++---------- .../template/base/_go_back_top.scss | 2 +- assets/stylesheets/template/base/_unity.scss | 2 +- .../stylesheets/template/base/_utilities.scss | 2 +- .../stylesheets/template/layout/footer.scss | 2 +- .../template/modules/ad_banner.scss | 8 ++++---- .../template/modules/announcement.scss | 2 +- .../template/modules/archives.scss | 12 +++++------ .../stylesheets/template/modules/gallery.scss | 10 +++++----- .../stylesheets/template/modules/member.scss | 4 ++-- .../template/modules/text_marquee.scss | 2 +- .../template/modules/web_resource.scss | 4 ++-- assets/stylesheets/template/print.css | 2 +- assets/stylesheets/template/template.scss | 2 +- home/header.html.erb | 8 +------- modules/member/member_index2.html.erb | 4 ++-- modules/member/member_index3.html.erb | 4 ++-- modules/member/member_index4.html.erb | 4 ++-- 18 files changed, 44 insertions(+), 50 deletions(-) diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 83a9527..e3056d9 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -49,7 +49,7 @@ $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; -$font-size-base: 14px !default; +$font-size-base: 0.875em !default; $font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px $font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px @@ -84,17 +84,17 @@ $icon-font-svg-id: "glyphicons_halflingsregular" !default; // //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). -$padding-base-vertical: 6px !default; -$padding-base-horizontal: 12px !default; +$padding-base-vertical: 0.375em !default; +$padding-base-horizontal: 0.75em !default; -$padding-large-vertical: 10px !default; -$padding-large-horizontal: 16px !default; +$padding-large-vertical: 0.625em !default; +$padding-large-horizontal: 1em !default; -$padding-small-vertical: 5px !default; -$padding-small-horizontal: 10px !default; +$padding-small-vertical: 0.3125em !default; +$padding-small-horizontal: 0.625em !default; -$padding-xs-vertical: 1px !default; -$padding-xs-horizontal: 5px !default; +$padding-xs-vertical: 0.0625em !default; +$padding-xs-horizontal: 0.3125em !default; $line-height-large: 1.33 !default; $line-height-small: 1.5 !default; @@ -330,7 +330,7 @@ $container-lg: $container-large-desktop !default; //## // Basics of a navbar -$navbar-height: 50px !default; +$navbar-height: 3.125em !default; $navbar-margin-bottom: $line-height-computed !default; $navbar-border-radius: $border-radius-base !default; $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default; diff --git a/assets/stylesheets/template/base/_go_back_top.scss b/assets/stylesheets/template/base/_go_back_top.scss index 9662c6d..8e93acc 100644 --- a/assets/stylesheets/template/base/_go_back_top.scss +++ b/assets/stylesheets/template/base/_go_back_top.scss @@ -12,7 +12,7 @@ cursor: pointer; display: none; color: $theme-white; - font-size: 12px; + font-size: 0.75em; border-radius: 2px; z-index: 1050; diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss index 55783d9..91acfca 100644 --- a/assets/stylesheets/template/base/_unity.scss +++ b/assets/stylesheets/template/base/_unity.scss @@ -24,7 +24,7 @@ .status { font-family: $main-font; - font-size: 12px; + font-size: 0.75em; } .status-top { diff --git a/assets/stylesheets/template/base/_utilities.scss b/assets/stylesheets/template/base/_utilities.scss index dfabc2a..a590569 100644 --- a/assets/stylesheets/template/base/_utilities.scss +++ b/assets/stylesheets/template/base/_utilities.scss @@ -60,7 +60,7 @@ font: 15px/20px $main-font; .fa { color: #666; - font-size: 18px; + font-size: 1.125em; margin: 0 3px 0 0; } } diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index 88de4af..922693d 100644 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -4,7 +4,7 @@ .layout-footer { color: $theme-white; - font-size: 12px; + font-size: 0.75em; font-weight: 100; background-color:$theme-green; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index b629cbe..e11c74f 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -90,7 +90,7 @@ display: inline-block; color: $theme-white; margin-top: 1em; - font-size: 12px; + font-size: 0.75em; padding: .8em 1.4em; border: 2px solid $theme-white; transition:.2s; @@ -103,20 +103,20 @@ @media(min-width: $screen-lg){ h2{ - font-size: 60px; + font-size: 3.75em; } p{ font-size: $font-15; } a{ - font-size: 16px; + font-size: 1em; } } @media(max-width: $screen-lg) and (min-width: $screen-sm){ h2{ - font-size: 36px; + font-size: 2.25em; } p{ font-size: $font-13; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 66266b5..f7e58f1 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -718,7 +718,7 @@ .s-annc__social .print-button { color: #fff; - font-size: 11px; + font-size: 0.6875em; border-radius: 4px; padding: 2px 6px; background-color: $theme-gray-light; diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index 32fad86..dfbef8e 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -78,7 +78,7 @@ } .i-archive__category-item { - font-size: 13px; + font-size: 0.8125em; display: inline; font-size: .8125rem; } @@ -98,7 +98,7 @@ } .i-archive__file-name { - font-size: 12px; + font-size: 0.75em; font-size: 0.75rem; } } @@ -119,7 +119,7 @@ } .i-archive-files-item { - font-size: 13px; + font-size: 0.8125em; font-family: $main-font; } @@ -167,7 +167,7 @@ padding: 10px 12px; margin-right: 5px; border-radius: 4px; - font-size: 15px; + font-size: 0.9375em; &:hover { background-color: darken($theme-color-main, 7%); @@ -192,7 +192,7 @@ } .i-archive__archive-title { - font-size: 15px; + font-size: 0.9375em; } .tab-content { @@ -200,7 +200,7 @@ } .i-archive__file-name { - font-size: 13px; + font-size: 0.8125em; } .i-archive__file-wrap { diff --git a/assets/stylesheets/template/modules/gallery.scss b/assets/stylesheets/template/modules/gallery.scss index a6db465..22b1d06 100644 --- a/assets/stylesheets/template/modules/gallery.scss +++ b/assets/stylesheets/template/modules/gallery.scss @@ -69,11 +69,11 @@ .index-content-title { font-family: $main-font; - font-size: 15px; + font-size: 0.9375em; } .index-img-description { - font-size: 13px; + font-size: 0.8125em; } } } @@ -101,11 +101,11 @@ .index-content-title { font-family: $main-font; - font-size: 15px; + font-size: 0.9375em; } .index-img-description { - font-size: 13px; + font-size: 0.8125em; } } } @@ -138,7 +138,7 @@ .show-description { font-family: $main-font; - font-size: 13px; + font-size: 0.8125em; padding: 8px; } } diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 9e19854..5fa96a5 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -202,14 +202,14 @@ font-family: $sub-font; th, td { - font-size: 15px; + font-size: 0.9375em; } .member-plugins { margin: 20px 0; a { - font-size: 15px; + font-size: 0.9375em; } } } \ No newline at end of file diff --git a/assets/stylesheets/template/modules/text_marquee.scss b/assets/stylesheets/template/modules/text_marquee.scss index 0a87f92..dd4ea67 100644 --- a/assets/stylesheets/template/modules/text_marquee.scss +++ b/assets/stylesheets/template/modules/text_marquee.scss @@ -3,7 +3,7 @@ background: rgba(255,255,255,0.1); border: 1px solid rgba(0,0,0,0.1); border-radius: 5px; - font-size: 15px; + font-size: 0.9375em; list-style: outside none none; margin: 0 0 30px; min-height: 30px; diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss index 275556c..c2d08a5 100644 --- a/assets/stylesheets/template/modules/web_resource.scss +++ b/assets/stylesheets/template/modules/web_resource.scss @@ -49,7 +49,7 @@ .index-context { display: inline-block; - font-size: 13px; + font-size: 0.8125em; margin: 0 0 10px 2em; color: darken($theme-gray-light, 20%); } @@ -57,7 +57,7 @@ .index-content-title { font-family: $main-font; - font-size: 16px; + font-size: 1em; } } } \ No newline at end of file diff --git a/assets/stylesheets/template/print.css b/assets/stylesheets/template/print.css index 0ce5b29..dc45f4e 100644 --- a/assets/stylesheets/template/print.css +++ b/assets/stylesheets/template/print.css @@ -6,7 +6,7 @@ body { color: #000; font-family: Arial, "Helvetica Neue", Helvetica, sans-serif; line-height: 1.3; - font-size: 12pt; + font-size: 1em; } blockquote, diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss index ee14a60..999145c 100644 --- a/assets/stylesheets/template/template.scss +++ b/assets/stylesheets/template/template.scss @@ -71,7 +71,7 @@ padding: 5px 10px; background: $theme-color-main; color:#fff; - font-size: 18px; + font-size: 1.125em; transition:.3s; &:hover{ background: $theme-color-second; diff --git a/home/header.html.erb b/home/header.html.erb index 3f8ea17..111a845 100644 --- a/home/header.html.erb +++ b/home/header.html.erb @@ -1,11 +1,5 @@
- + diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb index c335399..249c6f6 100644 --- a/modules/member/member_index2.html.erb +++ b/modules/member/member_index2.html.erb @@ -14,8 +14,8 @@
diff --git a/modules/member/member_index3.html.erb b/modules/member/member_index3.html.erb index 54c8aac..6f5c67c 100644 --- a/modules/member/member_index3.html.erb +++ b/modules/member/member_index3.html.erb @@ -14,8 +14,8 @@
diff --git a/modules/member/member_index4.html.erb b/modules/member/member_index4.html.erb index ef46e89..a82ba55 100644 --- a/modules/member/member_index4.html.erb +++ b/modules/member/member_index4.html.erb @@ -9,8 +9,8 @@