diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-06 15:14:36 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-06 15:14:36 +0000 |
| commit | 30cea142ab0263dcd572ac9cdc528b781c283437 (patch) | |
| tree | 7c1e1947c4f07862e915e2a996c57111877622dc | |
| parent | 87e00ee721cc513864637498e20b332d2049d4cc (diff) | |
| parent | 62b2d6735e6615628e9bfc80a14647f6825b4e4e (diff) | |
| download | gitlab-ce-30cea142ab0263dcd572ac9cdc528b781c283437.tar.gz | |
Merge branch '28704-fullscreen-zen-mode-is-broken' into 'master'
Set max for Zen mode textarea to screen height
Closes #28704
See merge request !9667
| -rw-r--r-- | app/assets/stylesheets/framework/zen.scss | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/28704-fullscreen-zen-mode-is-broken.yml | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/zen.scss b/app/assets/stylesheets/framework/zen.scss index 97ade638db6..0c226ff7598 100644 --- a/app/assets/stylesheets/framework/zen.scss +++ b/app/assets/stylesheets/framework/zen.scss @@ -20,8 +20,9 @@ outline: none; resize: none; height: 100vh; + max-height: calc(100vh - 10px); max-width: 900px; - margin: 0 auto; + margin: 0 auto 10px; } .zen-control-leave { diff --git a/changelogs/unreleased/28704-fullscreen-zen-mode-is-broken.yml b/changelogs/unreleased/28704-fullscreen-zen-mode-is-broken.yml new file mode 100644 index 00000000000..b8dba0b5993 --- /dev/null +++ b/changelogs/unreleased/28704-fullscreen-zen-mode-is-broken.yml @@ -0,0 +1,4 @@ +--- +title: Set max height to screen height for Zen mode +merge_request: 9667 +author: |