diff --git a/app/components/post_preview_component/post_preview_component.scss b/app/components/post_preview_component/post_preview_component.scss index 1b82f0632..28315bcf6 100644 --- a/app/components/post_preview_component/post_preview_component.scss +++ b/app/components/post_preview_component/post_preview_component.scss @@ -30,7 +30,7 @@ article.post-preview { } .desc { - font-size: 80%; + font-size: var(--text-sm); margin-bottom: 0; } diff --git a/app/components/source_data_component/source_data_component.scss b/app/components/source_data_component/source_data_component.scss index 48cea3c06..ca7286ee2 100644 --- a/app/components/source_data_component/source_data_component.scss +++ b/app/components/source_data_component/source_data_component.scss @@ -16,8 +16,8 @@ div.source-data { } .icon { - height: 1rem; - font-size: 1rem; + height: var(--text-lg); + font-size: var(--text-lg); vertical-align: bottom; } diff --git a/app/javascript/src/styles/base/000_vars.scss b/app/javascript/src/styles/base/000_vars.scss index fd9815b81..46043e63a 100644 --- a/app/javascript/src/styles/base/000_vars.scss +++ b/app/javascript/src/styles/base/000_vars.scss @@ -1,13 +1,13 @@ :root { --text-xs: 0.5625rem; // 9px - --text-sm: 0.7875rem; // 12.6px + --text-sm: 0.75rem; // 12px --text-md: 0.875rem; // 14px - --text-lg: 1.0208rem; // 16.3333px + --text-lg: 1rem; // 16px --text-xl: 1.3125rem; // 21px --text-xxl: 1.75rem; // 28px --header-font: Tahoma, Verdana, Helvetica, sans-serif; --body-font: Verdana, Helvetica, sans-serif; - --monospace-font: 0.85rem monospace; // 13.6px + --monospace-font: 0.875rem monospace; // 14px } $h1_padding: 0.8em 0 0.25em 0; diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss index 700ffa965..ae17ce8c0 100644 --- a/app/javascript/src/styles/base/020_base.scss +++ b/app/javascript/src/styles/base/020_base.scss @@ -125,10 +125,6 @@ details { font-size: 0.8em; } -.text-small { - font-size: 0.9em; -} - a.link-plain { color: unset; diff --git a/app/javascript/src/styles/common/messages.scss b/app/javascript/src/styles/common/messages.scss index 4a612c418..a8f3f9323 100644 --- a/app/javascript/src/styles/common/messages.scss +++ b/app/javascript/src/styles/common/messages.scss @@ -21,7 +21,7 @@ div.list-of-messages { a.message-timestamp { font-style: italic; - font-size: 0.90em; + font-size: var(--text-sm); color: var(--muted-text-color); &:hover { text-decoration: underline; } } @@ -54,7 +54,7 @@ div.list-of-messages { a.message-timestamp { display: inline; color: var(--muted-text-color); - font-size: 0.8em; + font-size: var(--text-sm); } } } diff --git a/app/javascript/src/styles/common/news.scss b/app/javascript/src/styles/common/news.scss index 9fde715f3..dfc6ad628 100644 --- a/app/javascript/src/styles/common/news.scss +++ b/app/javascript/src/styles/common/news.scss @@ -3,7 +3,7 @@ div#news-updates { background: var(--news-updates-background); border-bottom: 2px solid var(--news-updates-border-color); overflow: hidden; - font-size: 0.8em; + font-size: var(--text-sm); ul { float: left; diff --git a/app/javascript/src/styles/common/simple_form.scss b/app/javascript/src/styles/common/simple_form.scss index 9ecc37b4f..3be6f0948 100644 --- a/app/javascript/src/styles/common/simple_form.scss +++ b/app/javascript/src/styles/common/simple_form.scss @@ -53,7 +53,7 @@ form.simple_form { display: block; color: var(--form-input-validation-error-text-color); font-style: italic; - font-size: 0.8em; + font-size: var(--text-sm); } } diff --git a/app/javascript/src/styles/common/utilities.scss b/app/javascript/src/styles/common/utilities.scss index e7420c83e..3c9913f3f 100644 --- a/app/javascript/src/styles/common/utilities.scss +++ b/app/javascript/src/styles/common/utilities.scss @@ -18,6 +18,7 @@ $spacer: 0.25rem; /* 4px */ .text-muted { color: var(--muted-text-color); } .text-xs { font-size: var(--text-xs); } +.text-sm { font-size: var(--text-sm); } .leading-none { line-height: 1; } diff --git a/app/javascript/src/styles/specific/forum.scss b/app/javascript/src/styles/specific/forum.scss index 7b3c8ae40..44a6edccc 100644 --- a/app/javascript/src/styles/specific/forum.scss +++ b/app/javascript/src/styles/specific/forum.scss @@ -13,7 +13,7 @@ div#c-forum-topics { &.label { display: inline-block; - font-size: 0.7em; + font-size: var(--text-xs); text-transform: uppercase; border: 1px solid; border-radius: 0.25rem; diff --git a/app/javascript/src/styles/specific/moderator_dashboard.scss b/app/javascript/src/styles/specific/moderator_dashboard.scss index 12871c469..901f31116 100644 --- a/app/javascript/src/styles/specific/moderator_dashboard.scss +++ b/app/javascript/src/styles/specific/moderator_dashboard.scss @@ -12,7 +12,7 @@ div#c-moderator-dashboards { } caption { - font-size: 1.1em; + font-size: var(--text-lg); font-weight: bold; text-align: left; } diff --git a/app/javascript/src/styles/specific/posts.scss b/app/javascript/src/styles/specific/posts.scss index 628d2a10b..c04a27191 100644 --- a/app/javascript/src/styles/specific/posts.scss +++ b/app/javascript/src/styles/specific/posts.scss @@ -65,7 +65,7 @@ div#c-posts { .fav-buttons { - font-size: 14pt; + font-size: var(--text-lg); button.ui-button { padding: 0.25em 0.75em; diff --git a/app/javascript/src/styles/specific/uploads.scss b/app/javascript/src/styles/specific/uploads.scss index 6db46860b..05c838ea9 100644 --- a/app/javascript/src/styles/specific/uploads.scss +++ b/app/javascript/src/styles/specific/uploads.scss @@ -112,7 +112,7 @@ div#c-uploads { } .caption-top { - font-size: 0.8em; + font-size: var(--text-sm); margin-bottom: 0; } } diff --git a/app/javascript/src/styles/specific/z_responsive.scss b/app/javascript/src/styles/specific/z_responsive.scss index 0640f11c2..80da5b38f 100644 --- a/app/javascript/src/styles/specific/z_responsive.scss +++ b/app/javascript/src/styles/specific/z_responsive.scss @@ -14,7 +14,7 @@ position: absolute; top: 0.5rem; right: 0.5rem; - font-size: 2em; + font-size: var(--text-xxl); } nav#nav { diff --git a/app/views/static/_footer.html.erb b/app/views/static/_footer.html.erb index 6678391cb..cf7dd3664 100644 --- a/app/views/static/_footer.html.erb +++ b/app/views/static/_footer.html.erb @@ -1,4 +1,4 @@ -