diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-21 00:53:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-21 00:53:28 +0200 |
| commit | f1597e1ab90b1fb291f16977877c6ca79bf89676 (patch) | |
| tree | 7cb8facbd66c2199e173d2fc897863108b1fb398 /app/javascript/flavours/glitch | |
| parent | 19c3a941e8ac53a6e1ab6e9c0aaadbc53dd0050f (diff) | |
| parent | 055450bc02732f654317096f56b03b77f5b84270 (diff) | |
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/containers.scss | 4 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/index.scss | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/statuses.scss (renamed from app/javascript/flavours/glitch/styles/stream_entries.scss) | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/containers.scss b/app/javascript/flavours/glitch/styles/containers.scss index dc60dd14b..130e1461c 100644 --- a/app/javascript/flavours/glitch/styles/containers.scss +++ b/app/javascript/flavours/glitch/styles/containers.scss @@ -147,6 +147,10 @@ min-height: 100%; } + .flash-message { + margin-bottom: 10px; + } + @media screen and (max-width: 738px) { grid-template-columns: minmax(0, 50%) minmax(0, 50%); diff --git a/app/javascript/flavours/glitch/styles/index.scss b/app/javascript/flavours/glitch/styles/index.scss index 323b2e7fe..af73feb89 100644 --- a/app/javascript/flavours/glitch/styles/index.scss +++ b/app/javascript/flavours/glitch/styles/index.scss @@ -14,7 +14,7 @@ @import 'widgets'; @import 'forms'; @import 'accounts'; -@import 'stream_entries'; +@import 'statuses'; @import 'components/index'; @import 'polls'; @import 'about'; diff --git a/app/javascript/flavours/glitch/styles/stream_entries.scss b/app/javascript/flavours/glitch/styles/statuses.scss index 611d5185b..611d5185b 100644 --- a/app/javascript/flavours/glitch/styles/stream_entries.scss +++ b/app/javascript/flavours/glitch/styles/statuses.scss |