diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-01-25 16:57:23 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-01-25 16:57:23 +0000 |
| commit | c203ceffb05f001e885274747eda77b4f1a97cab (patch) | |
| tree | 5606afd6528b525b29170412411a9436b9ac0f1f | |
| parent | c194adb5c1ddf144917d6c98a800164ee799717a (diff) | |
| parent | ea09ef8da3755f51dc6cbb15f8c36bf82e5c329d (diff) | |
| download | gitlab-ce-c203ceffb05f001e885274747eda77b4f1a97cab.tar.gz | |
Merge branch 'small-screen-fullscreen-button' into 'master'
Display fullscreen button on small screens
Closes #19891
See merge request !5302
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/small-screen-fullscreen-button.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 085f79de785..23e27c1105c 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -23,7 +23,7 @@ = markdown_toolbar_button({ icon: "list-ol fw", data: { "md-tag" => "1. ", "md-prepend" => true }, title: "Add a numbered list" }) = markdown_toolbar_button({ icon: "check-square-o fw", data: { "md-tag" => "* [ ] ", "md-prepend" => true }, title: "Add a task list" }) .toolbar-group - %button.toolbar-btn.js-zen-enter.has-tooltip.hidden-xs{ type: "button", tabindex: -1, aria: { label: "Go full screen" }, title: "Go full screen", data: { container: "body" } } + %button.toolbar-btn.js-zen-enter.has-tooltip{ type: "button", tabindex: -1, aria: { label: "Go full screen" }, title: "Go full screen", data: { container: "body" } } = icon("arrows-alt fw") .md-write-holder diff --git a/changelogs/unreleased/small-screen-fullscreen-button.yml b/changelogs/unreleased/small-screen-fullscreen-button.yml new file mode 100644 index 00000000000..f4c269bc473 --- /dev/null +++ b/changelogs/unreleased/small-screen-fullscreen-button.yml @@ -0,0 +1,4 @@ +--- +title: Display fullscreen button on small screens +merge_request: 5302 +author: winniehell |