diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index 85eb6273904..57121a834b4 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -174,7 +174,7 @@ } td.stats { .unit { - font-size: .8em; + font-size: .857em; } } @@ -217,7 +217,7 @@ padding: 0; border: 0; color: $danger-medium; - font-size: 0.929em; + font-size: 1em; cursor: default; } } @@ -267,7 +267,7 @@ ol.category-breadcrumb { margin-bottom: 0; } a.badge-category, .dropdown-header { - font-size: 0.929em; + font-size: 0.857em; font-weight: bold; float: none; text-transform: none; @@ -296,7 +296,7 @@ ol.category-breadcrumb { float: left; margin: 5px 0 10px; .top-date-string { - font-size: 0.7em; + font-size: 0.857em; } } @@ -318,7 +318,7 @@ ol.category-breadcrumb { @include unselectable; - font-size: 1.2em; + font-size: 1.143em; border: 1px solid $primary-low; padding: 5px; background: $secondary; @@ -342,7 +342,7 @@ ol.category-breadcrumb { } .top-date-string { font-weight: normal; - font-size: 0.8em; + font-size: 0.857em; } &:hover { background-color: $highlight-medium; diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss index c38bfe61c73..1e01b6268d7 100644 --- a/app/assets/stylesheets/common/base/category-list.scss +++ b/app/assets/stylesheets/common/base/category-list.scss @@ -75,7 +75,7 @@ .description { padding: 0 1em 1em 1em; text-align: center; - font-size: 1.05em; + font-size: 1em; color: dark-light-choose($primary-medium, $secondary-high); .overflow { max-height: 6em; @@ -85,7 +85,7 @@ } h3 { - font-size: 1.2em; + font-size: 1.286em; margin-bottom: 0.5em; margin-top: 0.25em; line-height: 1.1em; @@ -102,7 +102,7 @@ } h3 { - font-size: 1.2em; + font-size: 1.286em; text-align: center; } diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index 2c9f7e18320..e7a969ac5ed 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -300,7 +300,7 @@ color: $primary; } span.name { - font-size: .8em; + font-size: .857em; vertical-align: middle; } &.selected { @@ -326,7 +326,7 @@ div.ac-wrap.disabled { div.ac-wrap div.item a.remove, .remove-link { margin-left: 4px; - font-size: .8em; + font-size: .857em; line-height: 10px; padding: 1.5px 1.5px 1.5px 2.5px; border-radius: 12px; diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss index 6e874e14dff..c9092a03b7d 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -29,7 +29,7 @@ border-bottom: 1px solid $primary-low; .number, .time-read { - font-size: 1.4em; + font-size: 1.429em; color: $primary-medium; } } diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index fb3825c5f6e..ce410bfb13f 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -47,11 +47,11 @@ body { } big { - font-size: 2em; + font-size: 2.286em; } small { - font-size: .643em; + font-size: .786em; } //setting a static limit on big and small prevents nesting abuse @@ -423,7 +423,7 @@ select { .content-list { h3 { color: $primary-medium; - font-size: 1.071em; + font-size: 1.143em; padding-left: 5px; margin-bottom: 10px; } @@ -474,7 +474,7 @@ select { .control-label { font-weight: bold; - font-size: 1.2em; + font-size: 1.286em; line-height: 2; } @@ -517,7 +517,7 @@ select { #loading-message { position: absolute; - font-size: 2.143em; + font-size: 2.286em; text-align: center; top: 120px; left: 500px; diff --git a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss index 2a398d6f100..c842e1f7110 100644 --- a/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss +++ b/app/assets/stylesheets/common/base/edit-topic-status-update-modal.scss @@ -49,7 +49,7 @@ h3 { font-weight: normal; - font-size: 1.071em; + font-size: 1.143em; } } } diff --git a/app/assets/stylesheets/common/base/exception.scss b/app/assets/stylesheets/common/base/exception.scss index 312e87da1e4..346a833432e 100644 --- a/app/assets/stylesheets/common/base/exception.scss +++ b/app/assets/stylesheets/common/base/exception.scss @@ -7,12 +7,12 @@ height: 60px; } .reason { - font-size: 1.714em; + font-size: 1.857em; height: 24px; } .url { font-style: italic; - font-size: .786em; + font-size: .857em; } .desc { margin-top: 16px; diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss index 4b8f48d08bb..3f04c28bf18 100644 --- a/app/assets/stylesheets/common/base/group.scss +++ b/app/assets/stylesheets/common/base/group.scss @@ -15,7 +15,7 @@ .time, .delete-info { color: lighten($primary, 40%); - font-size: 0.8em; + font-size: 0.857em; } .group-member-info { @@ -28,11 +28,13 @@ display: flex; width: 100%; justify-content: space-between; + .group-post-title { + font-size: 1.143em; + } } .group-post-excerpt { margin: 1em 0; - font-size: 0.929em; word-wrap: break-word; color: $primary; } @@ -45,13 +47,13 @@ width: 100%; .group-info-name { - font-size: 1.4em; + font-size: 1.429em; font-weight: bold; color: $primary; } .group-info-full-name { - font-size: 1.2em; + font-size: 1.286em; color: dark-light-choose($primary-high, $secondary-low); } diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss index c6e7791ab88..6ea6a1a8c9e 100644 --- a/app/assets/stylesheets/common/base/groups.scss +++ b/app/assets/stylesheets/common/base/groups.scss @@ -22,7 +22,7 @@ } td.groups-user-count { - font-size: 1.2em; + font-size: 1.286em; } } @@ -38,7 +38,7 @@ } .groups-info-title { - font-size: 0.9em; + font-size: 0.857em; color: dark-light-choose($primary-medium, $secondary-medium); } diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss index c45ce027bfa..d774ad0fed3 100644 --- a/app/assets/stylesheets/common/base/login.scss +++ b/app/assets/stylesheets/common/base/login.scss @@ -28,7 +28,7 @@ $input-width: 220px; } .disclaimer { - font-size: 0.9em; + font-size: 0.857em; color: dark-light-choose($primary-medium, $secondary-medium); clear: both; } @@ -58,7 +58,7 @@ $input-width: 220px; .instructions { color: dark-light-choose($primary-medium, $secondary-medium); margin: 0; - font-size: 0.929em; + font-size: 0.857em; font-weight: normal; line-height: 18px; } @@ -100,7 +100,7 @@ $input-width: 220px; .instructions { color: dark-light-choose($primary-medium, $secondary-medium); margin: 0; - font-size: 0.929em; + font-size: 0.857em; font-weight: normal; line-height: 18px; } diff --git a/app/assets/stylesheets/common/base/magnific-popup.scss b/app/assets/stylesheets/common/base/magnific-popup.scss index b37047cb0c4..c1dfab230bf 100644 --- a/app/assets/stylesheets/common/base/magnific-popup.scss +++ b/app/assets/stylesheets/common/base/magnific-popup.scss @@ -285,7 +285,6 @@ button { } padding: 0 0 18px 10px; color: $controls-color; - font-style: normal; font-size: 2em; font-family: Arial, Baskerville, monospace; diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss index 2aef0117e00..977866908d4 100644 --- a/app/assets/stylesheets/common/base/menu-panel.scss +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -65,7 +65,7 @@ } .new { - font-size: 0.8em; + font-size: 0.857em; margin-left: 0.5em; color: dark-light-choose($primary-medium, $secondary-medium); } @@ -174,7 +174,7 @@ } li:not(.category):not(.heading) { - font-size: 0.929em; + font-size: 1em; line-height: 16px; .fa { @@ -328,7 +328,7 @@ div.menu-links-header { } a { - font-size: 1.1em; + font-size: 1.143em; } .d-icon-user { margin-right: 0.2em; diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 48a8f67824f..30d2fc27e00 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -153,7 +153,7 @@ } p { color: darken($primary, 40%); - font-size: 0.929em; + font-size: 1em; } .archetype-option { margin-bottom: 20px; @@ -247,7 +247,7 @@ margin-left: 0 !important; // override needed font-weight: bold; .topic-title { - font-size: 0.929em; + font-size: 1em; font-weight: normal; } &.btn-reply-here { diff --git a/app/assets/stylesheets/common/base/not-found.scss b/app/assets/stylesheets/common/base/not-found.scss index aa9165f29e1..22295480074 100644 --- a/app/assets/stylesheets/common/base/not-found.scss +++ b/app/assets/stylesheets/common/base/not-found.scss @@ -1,7 +1,7 @@ // Page not found styles h1.page-not-found { - font-size: 2.25em; + font-size: 2.286em; line-height: 1.25; } diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 2d68e3a9265..82518359343 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -118,7 +118,7 @@ aside.onebox { clear: both; h3, h4 { - font-size: 1.17em; + font-size: 1.143em; margin: 0 0 10px 0; } @@ -395,7 +395,7 @@ aside.onebox.twitterstatus .onebox-body { .album-title { width: 100%; - font-size: 1.083em; + font-size: 1.143em; line-height: 30px; color: #ccc; text-decoration: none; diff --git a/app/assets/stylesheets/common/base/request_access.scss b/app/assets/stylesheets/common/base/request_access.scss index 63c95bc7e5c..77fd99202ac 100644 --- a/app/assets/stylesheets/common/base/request_access.scss +++ b/app/assets/stylesheets/common/base/request_access.scss @@ -4,10 +4,10 @@ input[type=text] { width: 320px; height: 30px; - font-size: 1.571em; + font-size: 1.429em; } input[type=submit] { - font-size: 1.571em; + font-size: 1.429em; padding: 10px; } } diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss index b5a29fba5dc..e4a18b18ae3 100644 --- a/app/assets/stylesheets/common/base/search.scss +++ b/app/assets/stylesheets/common/base/search.scss @@ -36,7 +36,7 @@ } .search-link { .topic-statuses, .topic-title { - font-size: 1.3em; + font-size: 1.286em; line-height: 25px; } @@ -63,7 +63,7 @@ } .discourse-tag { - font-size: 0.8em; + font-size: 0.857em; } } diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss index 00cf0ca4269..b9c3694119e 100644 --- a/app/assets/stylesheets/common/base/share_link.scss +++ b/app/assets/stylesheets/common/base/share_link.scss @@ -22,7 +22,7 @@ margin: 14px 0; } h3 { - font-size: 0.929em; + font-size: 1em; } .copy-text { display: inline-block; @@ -31,7 +31,7 @@ color: $success; opacity: 1; transition: opacity 0.25s; - font-size: .929em; + font-size: 1em; &:not(.success) { opacity: 0; } @@ -40,7 +40,7 @@ margin-left: 2px; margin-right: 8px; float: left; - font-size: 1.571em; + font-size: 1.857em; } .reply-as-new-topic { float: left; diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index 6eb3d47d468..46a363c53aa 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -23,7 +23,7 @@ } .tag-count { - font-size: 0.9em; + font-size: 0.857em; } } @@ -86,7 +86,7 @@ $tag-color: $primary-medium; .discourse-tag-count { - font-size: 0.8em; + font-size: 0.857em; color: $tag-color; } @@ -153,7 +153,7 @@ $tag-color: $primary-medium; .topic-list-item .discourse-tags { display: block; - font-size: 0.75em; + font-size: 0.786em; font-weight: normal; clear: both; margin-top: 5px; @@ -170,7 +170,7 @@ $tag-color: $primary-medium; .mobile-view .topic-list-item .discourse-tags { display: inline-block; - font-size: 0.9em; + font-size: 0.857em; margin-top: 0; .discourse-tag.box { position:relative; @@ -185,7 +185,7 @@ $tag-color: $primary-medium; font-family: FontAwesome; color: $primary-low-mid; margin-right: 5px; - font-size: 0.7em; + font-size: 0.786em; position:relative; top: -0.1em; } diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index de4ed21e790..9197ebfa736 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -371,14 +371,14 @@ blockquote > *:last-child { margin-top: 6px; text-transform: uppercase; font-weight: bold; - font-size: 0.9em; + font-size: 0.857em; color: dark-light-choose($primary-low-mid, $secondary-high); .custom-message { text-transform: none; margin: 15px 0px 5px; font-weight: normal; - font-size: 1.11em; + font-size: 1.143em; p { margin: 5px 0; } @@ -464,7 +464,7 @@ a.mention, a.mention-group { > span.help { display: inline-block; color: dark-light-choose($primary-medium, $secondary-medium); - font-size: 0.929em; + font-size: 0.857em; font-style: italic; line-height: $base-line-height; margin-bottom: 1px; diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss index 4c275a0598f..61a6179fb89 100644 --- a/app/assets/stylesheets/common/base/user-badges.scss +++ b/app/assets/stylesheets/common/base/user-badges.scss @@ -60,7 +60,7 @@ .show-badge .badge-user-info { .earned { - font-size: 1.3em; + font-size: 1.286em; margin-bottom: 1em; } } @@ -71,7 +71,7 @@ .load-more { padding-top: 30px; display: block; - font-size: 1.2em; + font-size: 1.286em; } } @@ -86,11 +86,11 @@ } .date { display: inline-block; - font-size: 1.1em; + font-size: 1.143em; margin-left: 10px; } .post-link { - font-size: 1.3em; + font-size: 1.286em; width: 500px; margin: 0; padding: 0; @@ -130,7 +130,7 @@ top: 5px; font-weight: bold; color: $primary-medium; - font-size: 1.2em; + font-size: 1.286em; } .badge-contents { diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index d3a415b75ec..1d4373cc964 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -19,7 +19,6 @@ width: 100%; .secondary { - font-size: 0.929em; .btn { padding: 3px 12px; @@ -61,13 +60,13 @@ } h1 { - font-size: 2.143em; + font-size: 2.286em; font-weight: normal; i {font-size: .8em;} } h2 { - font-size: 1.214em; + font-size: 1.286em; font-weight: normal; margin-top: 10px; max-width: 100%; @@ -168,7 +167,7 @@ } h2 { - font-size: 1.071em; + font-size: 1.143em; margin-top: 4px; } @@ -256,7 +255,7 @@ color: dark-light-choose($primary-medium, $secondary-medium); margin-top: 5px; margin-bottom: 10px; - font-size: 80%; + font-size: .857em; line-height: 1.4em; } } @@ -268,7 +267,7 @@ text-align: top; color: $danger; font-weight: bold; - font-size: 1.3em; + font-size: 1.286em; } } @@ -403,7 +402,7 @@ .value { font-weight: bold; - font-size: 1.2em; + font-size: 1.286em; } .label { @@ -450,7 +449,7 @@ .links-section { .domain { - font-size: 0.714em; + font-size: 0.786em; color: dark-light-choose($primary-medium, $secondary-high); } } @@ -480,7 +479,7 @@ .instructions { color: dark-light-choose($primary-medium, $secondary-medium); margin-bottom: 10px; - font-size: 80%; + font-size: .857em; line-height: 1.4em; a[href] {