diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-22 23:06:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 23:06:54 +0200 |
| commit | 91a74ea86bb0c5b0016012ad50231956ff26592c (patch) | |
| tree | ede17b03acf207674fdf2d535a4ca05a5ed69986 /app/javascript/flavours/glitch | |
| parent | c3fa4e8e07e5bcc685163959833a989fb15e8029 (diff) | |
| parent | 039e35560c04e4af1bb35b8ab11b9e145c8a4985 (diff) | |
Merge pull request #1002 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/actions_modal.js | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/modal.scss | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js index 9ac6dcf49..724f1c764 100644 --- a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js @@ -114,7 +114,7 @@ export default class ActionsModal extends ImmutablePureComponent { <div className='modal-root__modal actions-modal'> {status} - <ul> + <ul className={classNames({ 'with-status': !!status })}> {this.props.actions.map(this.renderAction)} </ul> </div> diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index 05af34680..2e5b7be55 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -621,6 +621,11 @@ ul { overflow-y: auto; flex-shrink: 0; + max-height: 80vh; + + &.with-status { + max-height: calc(80vh - 75px); + } li:empty { margin: 0; |