diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-25 22:42:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-25 22:42:21 +0100 |
| commit | 270bf7778d681453b259e54b5da55fb449365c8b (patch) | |
| tree | f94f595aa4347572fe7a62488c8bc90d56f94d2f /app/javascript | |
| parent | afec6b43eb856547ccc7083dbb677096d78821bf (diff) | |
| parent | 8ef0498f1ca4ff4dab7d8255f15577a86907c392 (diff) | |
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/about.scss | 12 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/reset.scss | 2 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/about.scss | 12 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/reset.scss | 2 |
4 files changed, 26 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/about.scss b/app/javascript/flavours/glitch/styles/about.scss index e8f46766a..302de020b 100644 --- a/app/javascript/flavours/glitch/styles/about.scss +++ b/app/javascript/flavours/glitch/styles/about.scss @@ -847,6 +847,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/flavours/glitch/styles/reset.scss b/app/javascript/flavours/glitch/styles/reset.scss index e24ba8c1c..f54ed5bc7 100644 --- a/app/javascript/flavours/glitch/styles/reset.scss +++ b/app/javascript/flavours/glitch/styles/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 { 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 { |