diff options
| author | reverite <samantha@chalker.io> | 2019-01-29 21:13:22 -0800 |
|---|---|---|
| committer | reverite <samantha@chalker.io> | 2019-01-29 21:13:22 -0800 |
| commit | 3510128c51f615634350a93dfb19053519d65454 (patch) | |
| tree | 85bac2a16c9c2371679d43311d9d6b069c988e94 /app/javascript/styles | |
| parent | c5b97d18762dce34a95ca42e9335e672c66953c0 (diff) | |
| parent | c2ccdad102cae9bc3dc94d1d6c6f306ca0366370 (diff) | |
Merge branch 'master' into production
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/about.scss | 12 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/reset.scss | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss index c6f249fab..b6c92a09e 100644 --- a/app/javascript/styles/mastodon/about.scss +++ b/app/javascript/styles/mastodon/about.scss @@ -845,6 +845,18 @@ $small-breakpoint: 960px; margin-bottom: 0; } + strong { + display: inline; + margin: 0; + padding: 0; + font-weight: 700; + background: transparent; + font-family: inherit; + font-size: inherit; + line-height: inherit; + color: lighten($darker-text-color, 10%); + } + .account { border-bottom: 0; padding: 0; diff --git a/app/javascript/styles/mastodon/reset.scss b/app/javascript/styles/mastodon/reset.scss index e24ba8c1c..f54ed5bc7 100644 --- a/app/javascript/styles/mastodon/reset.scss +++ b/app/javascript/styles/mastodon/reset.scss @@ -54,7 +54,7 @@ table { } html { - scrollbar-color: lighten($ui-base-color, 4%) transparent; + scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1); } ::-webkit-scrollbar { |