From 4bf558f941e841ee4180c8f37dcae0619d856e3f Mon Sep 17 00:00:00 2001 From: Kris Date: Wed, 20 Dec 2017 15:56:53 -0500 Subject: [PATCH] UX: Reducing number of overall font sizes --- app/assets/stylesheets/desktop/category-list.scss | 10 +++++----- app/assets/stylesheets/desktop/compose.scss | 4 ++-- app/assets/stylesheets/desktop/modal.scss | 2 +- app/assets/stylesheets/desktop/topic-list.scss | 13 +++++-------- app/assets/stylesheets/desktop/topic-post.scss | 14 +++++++------- app/assets/stylesheets/desktop/topic.scss | 15 +++++---------- app/assets/stylesheets/desktop/user-card.scss | 8 ++++---- 7 files changed, 29 insertions(+), 37 deletions(-) diff --git a/app/assets/stylesheets/desktop/category-list.scss b/app/assets/stylesheets/desktop/category-list.scss index fe59aa77bf6..520ad06fa02 100644 --- a/app/assets/stylesheets/desktop/category-list.scss +++ b/app/assets/stylesheets/desktop/category-list.scss @@ -35,10 +35,10 @@ text-align: right; .value { - font-size: 1.2em; + font-size: 1.143em; } .unit { - font-size: .8em; + font-size: .857em; } .badge-notification { display: block; @@ -69,7 +69,7 @@ a.last-posted-at, a.last-posted-at:visited { - font-size: 0.86em; + font-size: 0.857em; color: dark-light-choose($primary-medium, $secondary-high); } @@ -98,7 +98,7 @@ .category { border-left: 6px solid; h3 { - font-size: 1.2em; + font-size: 1.286em; a[href] { color: $primary; } @@ -137,7 +137,7 @@ } .discourse-tag { - font-size: 0.75em; + font-size: 0.786em; } .topic-featured-link { diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index 4a8dee02ca1..1e2b0af89cb 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -100,10 +100,10 @@ bottom: 10px; color: $primary; opacity: 0.5; - font-size: 1.071em; + font-size: 1.143em; &:before { content: 'esc'; - font-size: 0.85em; + font-size: 0.857em; margin-right: 0.5em; } } diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index f4ce2021b11..e7d00fba8fb 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -93,7 +93,7 @@ .custom-message-length { color: dark-light-choose($primary-low-mid, $secondary-high); - font-size: 85%; + font-size: .857em; } .flag-message { diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index c7abc601de7..d8135d7412a 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -65,7 +65,6 @@ } button.bulk-select { padding: 0; - font-size: 1.05em; margin-right: 0.3em; } @@ -142,7 +141,6 @@ margin-right: 2px; } a { - font-size: 0.917em; color: dark-light-choose($primary-medium, $secondary-medium); margin-right: 3px; line-height: 20px; @@ -173,7 +171,6 @@ .topic-list.categories { a.title { color: $tertiary; - font-size: 0.929em; } th.posts { @@ -225,10 +222,10 @@ } a.last-posted-at, a.last-posted-at:visited { color: dark-light-choose($primary-medium, $secondary-medium); - font-size: 0.88em; + font-size: 0.857em; } .badge { - font-size: 0.714em; + font-size: 0.857em; top: -1px; } } @@ -291,7 +288,7 @@ button.dismiss-read { clear: both; p { line-height: 1.5em; - font-size: 1.5em; + font-size: 1.429em; } } @@ -338,10 +335,10 @@ and (max-width : 850px) { // smaller table cell font and cell spacing th, td { padding: 12px 2px; - font-size: 0.929em; + font-size: 1em; } .main-link { - font-size: 1.071em; + font-size: 1em; } .category { min-width: 0; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 579456023b7..40ac5cb3d58 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -7,7 +7,7 @@ } h1 .topic-statuses .topic-status i { - font-size: 0.8em; + font-size: 0.857em; vertical-align: middle; } @@ -105,7 +105,7 @@ nav.post-controls { } i { margin-left: 5px; - font-size: 90%; + font-size: .857em; } } @@ -311,7 +311,7 @@ a.star { } span.domain { - font-size: 0.714em; + font-size: 0.786em; color: dark-light-choose($primary-medium, $secondary-medium); } @@ -353,7 +353,7 @@ a.star { } .number, i { color: dark-light-choose($primary-high, $secondary-low); - font-size: 130%; + font-size: 1.286em; } .avatar a { float: left; @@ -473,7 +473,7 @@ a.star { #suggested-topics .topic-statuses .topic-status { padding: 0; i { - font-size:1.071em; + font-size:1em; } } @@ -541,7 +541,7 @@ video { .extra-info { h1 { margin: 5px 0 0 0; - font-size: 1.6em; + font-size: 1.429em; line-height: 1.3em; } @@ -783,7 +783,7 @@ $topic-avatar-width: 45px; margin: 10px 0 0 0; } h3 { - font-size: 1.786em; + font-size: 1.857em; color: $primary; margin-bottom: 5px; i { diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 2944d94e778..d95273c0afd 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -21,17 +21,12 @@ padding-top: 14px; margin-bottom: 10px; - .star { - font-size: 1.429em; - margin-top: 6px; - margin-right: 6px; - } #edit-title, .category-chooser, .edit-controls { width: 500px; } h1 { - font-size: 1.8em; - line-height: 1.2em; + font-size: 1.857em; + line-height: 1.25em; overflow: hidden; a {color: $primary;} } @@ -46,7 +41,7 @@ float: right; text-transform: lowercase; color: dark-light-choose($primary-medium, $secondary-medium); - font-size: 0.875rem; + font-size: 0.857rem; } } @@ -62,7 +57,7 @@ width: 60%; margin-left: auto; margin-right: auto; - font-size: 1.714em; + font-size: 1.857em; text-align: center; line-height: 1.1em; @@ -199,7 +194,7 @@ bottom: 0; position: fixed; width: 100%; - font-size: 1.071em; + font-size: 1em; z-index: 495 } diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index c6bbe50c961..2a73394fb7f 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -63,7 +63,7 @@ $user_card_background: $secondary; h1 { min-width: 120px; - font-size: 1.786em; + font-size: 1.857em; line-height: 1.25; display: block; max-width: 250px; @@ -74,13 +74,13 @@ $user_card_background: $secondary; color: $user_card_primary; } i { - font-size: .8em; + font-size: .857em; color: $user_card_primary; } } h2 { - font-size: 1.071em; + font-size: 1.143em; line-height: 1.25; font-weight: normal; display: block; @@ -255,7 +255,7 @@ $user_card_background: $secondary; position: absolute; right: 12px; bottom: 12px; - font-size: 2.143em; + font-size: 2.286em; i {color: $user_card_primary;} }