diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-07 10:50:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-07 10:50:52 +0100 |
| commit | 0194bd33fe4294ef6c1af34e907360f2980155c8 (patch) | |
| tree | 39b966d8c051d08eff2ddf203051dc91ad15e01a /app/javascript/flavours/glitch/styles/components | |
| parent | fe523a304520a09f6371f45bd63b9e8988776c03 (diff) | |
| parent | 16fb604c52a84a48bb729ea15e7fa8c9568ae118 (diff) | |
Merge pull request #1995 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/columns.scss | 6 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/modal.scss | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss index 71edf7fb3..42a591931 100644 --- a/app/javascript/flavours/glitch/styles/components/columns.scss +++ b/app/javascript/flavours/glitch/styles/components/columns.scss @@ -65,6 +65,7 @@ $ui-header-height: 55px; z-index: 2; justify-content: space-between; align-items: center; + overflow: hidden; &__logo { display: inline-flex; @@ -81,10 +82,15 @@ $ui-header-height: 55px; align-items: center; gap: 10px; padding: 0 10px; + overflow: hidden; .button { flex: 0 0 auto; } + + .button-tertiary { + flex-shrink: 1; + } } } diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index ab8609170..8ba8bec10 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -1306,7 +1306,8 @@ img.modal-warning { width: 600px; background: $ui-base-color; border-radius: 8px; - overflow: hidden; + overflow-x: hidden; + overflow-y: auto; position: relative; display: block; padding: 20px; |