diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
commit | c56a504d116d62fe669d15a270133d7c78dd61f1 (patch) | |
tree | 7400f3182f2a4ebd1606c37a1a5cad4cc95e443b /app/javascript/styles/mastodon/admin.scss | |
parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
parent | c2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.
Diffstat (limited to 'app/javascript/styles/mastodon/admin.scss')
-rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 41654af55..9f7ffe47a 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -232,7 +232,8 @@ $content-width: 840px; } h4 { - font-size: 14px; + text-transform: uppercase; + font-size: 13px; font-weight: 700; color: $darker-text-color; padding-bottom: 8px; @@ -407,7 +408,8 @@ body, strong { font-weight: 500; - font-size: 13px; + text-transform: uppercase; + font-size: 12px; @each $lang in $cjk-langs { &:lang(#{$lang}) { @@ -420,7 +422,8 @@ body, display: inline-block; color: $darker-text-color; text-decoration: none; - font-size: 13px; + text-transform: uppercase; + font-size: 12px; font-weight: 500; border-bottom: 2px solid $ui-base-color; @@ -786,6 +789,7 @@ a.name-tag, flex: 0 0 auto; font-weight: 500; color: $darker-text-color; + text-transform: uppercase; text-align: right; a { |