diff --git a/assets/scss/_theme.scss b/assets/scss/_theme.scss index cf96c085e..71b0759b5 100644 --- a/assets/scss/_theme.scss +++ b/assets/scss/_theme.scss @@ -1,2 +1,6 @@ $content-color-lighter: #777; $link-color: #336979; + +$font-size-base: 14px; +$font-size-large: 16px; +$font-size-larger: 18px; diff --git a/assets/scss/components/_date-picker.scss b/assets/scss/components/_date-picker.scss index c7ba5e8d7..6c4ccd4ec 100644 --- a/assets/scss/components/_date-picker.scss +++ b/assets/scss/components/_date-picker.scss @@ -15,8 +15,7 @@ .form-date > * > .sublabel { color: theme.$content-color-lighter; padding-top: 0.35em; - font-size: 12px; - font-size: 0.75rem; + font-size: theme.$font-size-base; font-weight: 400; } diff --git a/assets/scss/components/_detail-tag-form.scss b/assets/scss/components/_detail-tag-form.scss index ada27bfde..3da410649 100644 --- a/assets/scss/components/_detail-tag-form.scss +++ b/assets/scss/components/_detail-tag-form.scss @@ -2,7 +2,6 @@ @use '../theme'; .tags-textarea { - font-size: 14px; box-sizing: border-box; width: 100% !important; } diff --git a/assets/scss/components/_private-messages.scss b/assets/scss/components/_private-messages.scss index 6b40c6dd3..aea0f4d9d 100644 --- a/assets/scss/components/_private-messages.scss +++ b/assets/scss/components/_private-messages.scss @@ -86,7 +86,7 @@ $cell-padding: 4px; } #notes-content { - font-size: 14px; + font-size: theme.$font-size-base; padding-top: 2em; } diff --git a/assets/scss/components/_text-post-list.scss b/assets/scss/components/_text-post-list.scss index 59ec1a59a..edbc4164c 100644 --- a/assets/scss/components/_text-post-list.scss +++ b/assets/scss/components/_text-post-list.scss @@ -1,3 +1,5 @@ +@use '../theme'; + .text-post-list { overflow: hidden; } @@ -35,7 +37,7 @@ .text-post-actions { flex-shrink: 0; - font-size: 12px; + font-size: theme.$font-size-base; font-weight: normal; margin-left: 0.6em; margin-right: -0.4em; diff --git a/assets/scss/components/_user-tabs.scss b/assets/scss/components/_user-tabs.scss index dd2ee5e6c..f505c13cb 100644 --- a/assets/scss/components/_user-tabs.scss +++ b/assets/scss/components/_user-tabs.scss @@ -1,4 +1,5 @@ @use 'sass:color'; +@use '../theme'; #user-nav > li { width: 50%; @@ -8,8 +9,7 @@ #user-nav > li > a { display: block; padding: 0.5em 0; - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; } .user-nav-with-count { diff --git a/assets/scss/site.scss b/assets/scss/site.scss index cb6ffa572..12641817c 100644 --- a/assets/scss/site.scss +++ b/assets/scss/site.scss @@ -49,14 +49,12 @@ a:hover { --------------------------------*/ #page-container, textarea, .typeface-default, button { font-family: Lucida Sans, Lucida Grande, Arial, Roboto, sans-serif; - font-size: 12px; - font-size: 0.75rem; + font-size: theme.$font-size-base; line-height: 1.5; } textarea { - font-size: 12px; - font-size: 0.75rem; + font-size: theme.$font-size-base; } .typeface-a, .username, .page-title, a.more span, #header-messages a, @@ -191,13 +189,11 @@ a.more::after { } a.more span { - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-large; } a.more-block span, a.more { - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; } a.more-block { @@ -226,9 +222,8 @@ a.more-block:last-child { } @media (min-width: 30em) { - a.more-block span, a.more span { - font-size: 16px; - font-size: 1rem; + a.more-block span, a.more span, a.more i { + font-size: theme.$font-size-large; } a.more-block::after { @@ -365,8 +360,7 @@ a.more-block:last-child { } a.bar { - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-larger; height: 40px; height: 2.5rem; line-height: 40px; @@ -412,8 +406,7 @@ a.bar { height: 2.75rem; line-height: 44px; line-height: 2.75rem; - font-size: 22px; - font-size: 1.4rem; + font-size: 26px; } .page-title { @@ -548,7 +541,7 @@ a.bar { padding: 0.5em; tab-size: 4; word-break: break-all; - font-size: 0.82rem; + font-size: theme.$font-size-base; } .formatted-content pre:only-child { @@ -578,8 +571,7 @@ a.bar { line-height: 2rem; padding: 0 0.8em 0 0; margin: 0; - font-size: 13px; - font-size: 0.8rem; + font-size: 15px; color: #696d6f; background: transparent; border: none; @@ -601,8 +593,7 @@ a.bar { @media (min-width: 45em) { .toolset li a, .toolset li button { - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; } } @@ -1041,7 +1032,7 @@ a:hover .icon-report, button:hover .icon-report { background-position: -20px -24 padding-bottom: 45px; position: relative; text-decoration: none; - font-size: 12px; + font-size: theme.$font-size-base; color: #ccc; &.thumb-no-byline { @@ -1074,7 +1065,7 @@ a:hover .icon-report, button:hover .icon-report { background-position: -20px -24 opacity: 1; } .thumbnail-grid .title { - font-size: 13px; + font-size: 15px; line-height: 15px; font-weight: 400; padding: 0; @@ -1299,7 +1290,7 @@ a:hover .icon-report, button:hover .icon-report { background-position: -20px -24 .comment .actions { float: right; padding-left: 2em; - font-size: 0.9em; + font-size: theme.$font-size-base; } .comment .comment-content .formatted-content { @@ -1346,7 +1337,7 @@ a:hover .icon-report, button:hover .icon-report { background-position: -20px -24 .comment-formatting-help { margin-left: 1em; display: inline-block; - font-size: 0.85em; + font-size: theme.$font-size-large; } .comment textarea:focus { @@ -1516,8 +1507,7 @@ blockquote + blockquote { } .label, .form label:not(.input-checkbox):not(.label-around) { - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; font-weight: 700; } @@ -1753,8 +1743,7 @@ blockquote + blockquote { line-height: 40px; line-height: 2.5rem; padding: 0 0.5em; - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; font-weight: 700; } @@ -1783,8 +1772,7 @@ $notifs-color-active: #b9b9b9; #header-guest { min-height: 3.7em; padding: 1.4em 16px 0.4em 112px; - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; text-align: right; color: #ddd; } @@ -1856,7 +1844,7 @@ $small-caps-ratio: 1.2; #header-nav a { display: block; - font-size: 0.875rem; + font-size: theme.$font-size-large; padding: 0.625rem 1.125rem; } @@ -1885,8 +1873,7 @@ $small-caps-ratio: 1.2; } #header h2 .username { - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; } } @@ -1964,7 +1951,7 @@ $small-caps-ratio: 1.2; #header-nav a { height: 4.5rem; line-height: 4.5rem; - font-size: math.div(0.75rem, $small-caps-ratio); + font-size: math.div(theme.$font-size-large, $small-caps-ratio); padding: 0 0.4375rem; &::first-letter { @@ -1995,7 +1982,7 @@ $small-caps-ratio: 1.2; } #header-nav a { - font-size: math.div(0.9rem, $small-caps-ratio); + font-size: math.div(theme.$font-size-large, $small-caps-ratio); } } @@ -2051,8 +2038,7 @@ $small-caps-ratio: 1.2; @media (min-width: 78em) { #header-guest { padding-top: 1.7em; - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-large; min-height: 2.6em; } @@ -2068,6 +2054,14 @@ $small-caps-ratio: 1.2; line-height: 72px; line-height: 4.5rem; } + + #header-user i { + font-size: theme.$font-size-large; + } + + #header-search { + font-size: theme.$font-size-large; + } } @media (min-width: 88em) { @@ -2147,7 +2141,7 @@ $small-caps-ratio: 1.2; padding: 0 16px; line-height: 48px; margin: 0; - font-size: 16px; + font-size: theme.$font-size-larger; background: transparent; border: none; cursor: pointer; @@ -2172,7 +2166,7 @@ $small-caps-ratio: 1.2; } .home-pane-link { - font-size: 14px; + font-size: theme.$font-size-large; padding: 0; text-align: center; } @@ -2248,13 +2242,13 @@ $small-caps-ratio: 1.2; } .stream-header > .username { - font-size: 16px; + font-size: theme.$font-size-larger; font-style: normal; margin-right: 4px; } .stream-link { - font-size: 14px; + font-size: theme.$font-size-large; margin-top: auto; overflow: hidden; text-overflow: ellipsis; @@ -2266,7 +2260,7 @@ $small-caps-ratio: 1.2; } .streams-all { - font-size: 16px; + font-size: theme.$font-size-larger; &::after { content: ' ›'; @@ -2366,8 +2360,7 @@ $small-caps-ratio: 1.2; height: 54px; line-height: 54px; margin-left: 64px; - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-larger; } #user-actions { @@ -2460,8 +2453,7 @@ $small-caps-ratio: 1.2; #uf-folders h5 { padding-top: 0.5em; - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; font-weight: 400; } @@ -2474,8 +2466,7 @@ $small-caps-ratio: 1.2; } #user-commissions > h4, #user-journal > h4 { - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-larger; } #user-commissions .formatted-content, #user-journal .formatted-content { @@ -2553,8 +2544,7 @@ $small-caps-ratio: 1.2; #uf-folders h5 { padding-top: 0.5em; - font-size: 14px; - font-size: 0.9rem; + font-size: theme.$font-size-large; } } @@ -2863,14 +2853,13 @@ $small-caps-ratio: 1.2; padding-top: 1.25rem; padding-bottom: 20px; padding-bottom: 1.25rem; - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-larger; font-weight: 400; text-align: center; } #detail-title i, #detail-bar .date { - font-size: 0.8em; + font-size: theme.$font-size-large; color: #687a89; } @@ -3300,8 +3289,7 @@ img + #detail-art-text { left: 96px; bottom: -2.5em; padding: 0; - font-size: 12px; - font-size: 0.75rem; + font-size: theme.$font-size-base; } #detail-info { @@ -3505,8 +3493,7 @@ img + #detail-art-text { } #submit-multimedia-content .files .or { - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-larger; padding-top: 1em; } @@ -3683,8 +3670,7 @@ img + #detail-art-text { } #journals-content h4 { - font-size: 16px; - font-size: 1rem; + font-size: theme.$font-size-larger; } #browse-search-top { @@ -3779,7 +3765,7 @@ img + #detail-art-text { #footer-info { padding: 2em 0; text-align: center; - font-size: 0.9em; + font-size: theme.$font-size-base; line-height: 2.1; color: #939699; } @@ -3902,8 +3888,7 @@ img + #detail-art-text { } #footer ul a { - padding: 0.4em 0 0.4em 24px; - padding: 0.4em 0 0.4em 1.5rem; + padding: 0.3em 0 0.3em 1.5rem; } #footer-wesley { @@ -4024,7 +4009,7 @@ body input[type="checkbox"] { padding: 0.5em; tab-size: 4; word-break: break-all; - font-size: 0.82rem; + font-size: theme.$font-size-base; } .comment-content .formatted-content h1, diff --git a/weasyl/templates/common/user_tools.html b/weasyl/templates/common/user_tools.html index c5b36e968..b72db1024 100644 --- a/weasyl/templates/common/user_tools.html +++ b/weasyl/templates/common/user_tools.html @@ -37,7 +37,7 @@

${profile['username']} $ user_type = USER_TYPE(profile['userid']) $if user_type: - (${user_type}) + (${user_type})