diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-02-12 14:02:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 14:02:24 +0100 |
| commit | 8792128f38e19b0d7882468a4f1f9362b98793a0 (patch) | |
| tree | 2689e394f9f88d05533e70ad0f6bcf622ee2fd5c /app/javascript/flavours/glitch/styles | |
| parent | a30a40c4379b26890b6453083ef213e672658902 (diff) | |
| parent | 49eef466b8274ca5768deca3309af31bfbf81184 (diff) | |
Merge pull request #1500 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/modal.scss | 9 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/modal.scss | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index 16c05bc3e..0bda305a8 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -1031,3 +1031,12 @@ } } } + +.modal-root__container .composer--options--dropdown { + flex-grow: 0; +} + +.modal-root__container .composer--options--dropdown--content { + pointer-events: auto; + z-index: 9999; +} diff --git a/app/javascript/flavours/glitch/styles/modal.scss b/app/javascript/flavours/glitch/styles/modal.scss index 10de454c6..6c6de4206 100644 --- a/app/javascript/flavours/glitch/styles/modal.scss +++ b/app/javascript/flavours/glitch/styles/modal.scss @@ -12,10 +12,19 @@ flex-direction: column; justify-content: flex-end; - > * { + > div { flex: 1; max-height: 235px; - background: url('~images/elephant_ui_plane.svg') no-repeat left bottom / contain; + position: relative; + + img { + max-height: 100%; + max-width: 100%; + height: 100%; + position: absolute; + bottom: 0; + left: 0; + } } } |