diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-15 17:11:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-15 17:11:40 +0200 |
| commit | 6badf2d252a980d496b894c7258a778c57639953 (patch) | |
| tree | b7c71885c413a8205dbe9d01bab7c60ea75c11bf /app/javascript/styles | |
| parent | cd534830adab89300703904ffe87894dec8e2f95 (diff) | |
| parent | f4f22391b2d469bd1d5c29ec815daf020282f30c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon-light/diff.scss | 3 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index de03cf1a6..48236a286 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -162,7 +162,7 @@ .actions-modal ul li:not(:empty) a:focus button, .actions-modal ul li:not(:empty) a:hover, .actions-modal ul li:not(:empty) a:hover button, -.admin-wrapper .sidebar ul ul a.selected, +.admin-wrapper .sidebar ul li a.selected, .simple_form .block-button, .simple_form .button, .simple_form button { @@ -230,6 +230,7 @@ .empty-column-indicator, .error-column { color: $primary-text-color; + background: $white; } // Change the default colors used on some parts of the profile pages diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index f8f64bdd6..19e7ac41b 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1412,6 +1412,15 @@ a.account__display-name { width: 48px; } +.status__expand { + width: 68px; + position: absolute; + left: 0; + top: 0; + height: 100%; + cursor: pointer; +} + .muted { .status__content p, .status__content a { |