diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-17 21:54:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 21:54:12 +0200 |
| commit | 012ca4c68d785dcf13e4cabd16b09a844e622f6b (patch) | |
| tree | 106543bbde5ca7a43920ae13928d9ead0075e88b /app/javascript/styles | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | bcf157a1a9597595c61b1cce84bd62f63fcaa90b (diff) | |
Merge pull request #578 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 5 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 560b11ddf..42f507296 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -165,6 +165,11 @@ color: $valid-value-color; font-weight: 500; } + + .negative-hint { + color: $error-value-color; + font-weight: 500; + } } .simple_form { diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index de8538dd1..744f2561c 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1478,6 +1478,7 @@ a.account__display-name { display: flex; align-items: center; justify-content: center; + flex-direction: column; .image-loader__preview-canvas { max-width: $media-modal-media-max-width; @@ -1486,8 +1487,8 @@ a.account__display-name { object-fit: contain; } - &.image-loader--loading .image-loader__preview-canvas { - filter: blur(2px); + .loading-bar { + position: relative; } &.image-loader--amorphous .image-loader__preview-canvas { |