diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-15 18:17:37 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 14:50:42 +0200 |
| commit | f26f1145ac0fab4a657ee1fc784e824858601bd3 (patch) | |
| tree | 3980b53a1440a8e6d4ee8c539668c3c190363017 /app/javascript/styles | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | 7a686082370ad6d1c7a7d0ad331c22bf3e1fbede (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
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 { |