From bb2c8b605e61cb21c3823e96013076e6e076ede1 Mon Sep 17 00:00:00 2001 From: Kris Date: Tue, 19 Dec 2017 13:09:37 -0500 Subject: [PATCH] UX: Reducing number of different fonts used in Admin --- .../stylesheets/common/admin/admin_base.scss | 24 ++++++++----------- .../stylesheets/common/admin/customize.scss | 2 +- .../stylesheets/common/admin/flagging.scss | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 67b6b00d031..dab0f7a58df 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -101,7 +101,7 @@ $mobile-breakpoint: 700px; h3 { font-weight: normal; - font-size: 1.1em; + font-size: 1em; } button.edit { @@ -202,7 +202,7 @@ $mobile-breakpoint: 700px; padding: 12px 12px 5px; .powered-by { - font-size: 0.80em; + font-size: 0.857em; position: absolute; bottom: -10px; left: 10px; @@ -278,7 +278,6 @@ $mobile-breakpoint: 700px; .controls .menu-toggle { display: none; float: left; - font-size: 1.7em; padding: 3px 6px; margin-right: 32px; border: 1px solid lighten($primary, 40%); @@ -529,7 +528,7 @@ $mobile-breakpoint: 700px; .desc, .validation-error { padding-top: 3px; - font-size: .8em; + font-size: .857em; line-height: 1.4em; } @@ -542,7 +541,7 @@ $mobile-breakpoint: 700px; } h3 { - font-size: 0.929em; + font-size: 1em; font-weight: normal; } } @@ -562,7 +561,7 @@ $mobile-breakpoint: 700px; section.details { h1 { - font-size: 1.286em; + font-size: 1.429em; color: $primary; padding: 5px 10px; margin: 30px 0 5px 0; @@ -647,7 +646,7 @@ section.details { width: 800px; float: left; margin-left: 12px; - font-size: 0.929em; + font-size: 0.857em; button { margin-left: 10px; @@ -677,7 +676,7 @@ section.details { .list-badge { float: right; - font-size: .8em; + font-size: .857em; font-weight: normal; padding: 0 6px; color: $secondary; @@ -692,7 +691,7 @@ section.details { p.help { margin: 0; color: dark-light-choose($primary-medium, $secondary-medium); - font-size: 0.9em; + font-size: 0.857em; } } @@ -848,7 +847,7 @@ section.details { } .version-number { - font-size: 1.286em; + font-size: 1.429em; font-weight: bold; } @@ -1392,9 +1391,6 @@ and (max-width : 500px) { .setting-value { width: 100%; } - label { - font-size: 0.929em; - } } } @@ -1745,7 +1741,7 @@ table#user-badges { margin-top: 10px; } label { - font-size: 1.05em; + font-size: 1em; } } diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index 91665d43b70..efdbd08a6b1 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -190,7 +190,7 @@ .status-message { display: block; - font-size: 0.8em; + font-size: 0.857em; margin-top: 8px; } diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss index debcb8f7864..4574540c2a4 100644 --- a/app/assets/stylesheets/common/admin/flagging.scss +++ b/app/assets/stylesheets/common/admin/flagging.scss @@ -167,7 +167,7 @@ .type-count { color: $primary-medium; - font-size: 0.9em; + font-size: 0.857em; } }