Skip to content

G
gitlab-ce
Commit 9c839496 authored by Fatih Acet's avatar Fatih Acet
Browse files
Options

Merge branch 'shortcuts-modal-fix' into 'master' 

Fix styling of shortcuts modal

## What does this MR do?

Fixes some weird height issue in the shortcuts modal.

## Screenshots (if relevant)

### Before

![Screen_Shot_2016-09-07_at_15.13.09](/uploads/5c4d7716e355794c8aa9764e0fa53f4e/Screen_Shot_2016-09-07_at_15.13.09.png)

### After

![Screen_Shot_2016-09-07_at_15.12.57](/uploads/6f5c145963b4b89910be44b6b254e117/Screen_Shot_2016-09-07_at_15.12.57.png)

See merge request !6244
parents a726c505 6cdc3460
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 273 deletions
app/views/help/_shortcuts.html.haml
View file @ 9c839496
...@@ -7,277 +7,278 @@ ...@@ -7,277 +7,278 @@
Keyboard Shortcuts Keyboard Shortcuts
%small %small
= link_to '(Show all)', '#', class: 'js-more-help-button' = link_to '(Show all)', '#', class: 'js-more-help-button'
.modal-body.shortcuts-cheatsheet .modal-body
.col-lg-4 .row
%table.shortcut-mappings .col-lg-4
%tbody %table.shortcut-mappings
%tr %tbody
%th %tr
%th Global Shortcuts %th
%tr %th Global Shortcuts
%td.shortcut %tr
.key s %td.shortcut
%td Focus Search .key s
%tr %td Focus Search
%td.shortcut %tr
.key f %td.shortcut
%td Focus Filter .key f
%tr %td Focus Filter
%td.shortcut %tr
.key ? %td.shortcut
%td Show/hide this dialog .key ?
%tr %td Show/hide this dialog
%td.shortcut %tr
- if browser.platform.mac? %td.shortcut
.key ⌘ shift p - if browser.platform.mac?
- else .key ⌘ shift p
.key ctrl shift p - else
%td Toggle Markdown preview .key ctrl shift p
%tr %td Toggle Markdown preview
%td.shortcut %tr
.key %td.shortcut
%i.fa.fa-arrow-up .key
%td Edit last comment (when focused on an empty textarea) %i.fa.fa-arrow-up
%tbody %td Edit last comment (when focused on an empty textarea)
%tr %tbody
%th %tr
%th Project Files browsing %th
%tr %th Project Files browsing
%td.shortcut %tr
.key %td.shortcut
%i.fa.fa-arrow-up .key
%td Move selection up %i.fa.fa-arrow-up
%tr %td Move selection up
%td.shortcut %tr
.key %td.shortcut
%i.fa.fa-arrow-down .key
%td Move selection down %i.fa.fa-arrow-down
%tr %td Move selection down
%td.shortcut %tr
.key enter %td.shortcut
%td Open Selection .key enter
%tbody %td Open Selection
%tr %tbody
%th %tr
%th Finding Project File %th
%tr %th Finding Project File
%td.shortcut %tr
.key %td.shortcut
%i.fa.fa-arrow-up .key
%td Move selection up %i.fa.fa-arrow-up
%tr %td Move selection up
%td.shortcut %tr
.key %td.shortcut
%i.fa.fa-arrow-down .key
%td Move selection down %i.fa.fa-arrow-down
%tr %td Move selection down
%td.shortcut %tr
.key enter %td.shortcut
%td Open Selection .key enter
%tr %td Open Selection
%td.shortcut %tr
.key esc %td.shortcut
%td Go back .key esc
%td Go back
.col-lg-4 .col-lg-4
%table.shortcut-mappings %table.shortcut-mappings
%tbody{ class: 'hidden-shortcut project', style: 'display:none' } %tbody{ class: 'hidden-shortcut project', style: 'display:none' }
%tr %tr
%th %th
%th Global Dashboard %th Global Dashboard
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key a .key a
%td %td
Go to the activity feed Go to the activity feed
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key p .key p
%td %td
Go to projects Go to projects
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key i .key i
%td %td
Go to issues Go to issues
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key m .key m
%td %td
Go to merge requests Go to merge requests
%tbody %tbody
%tr %tr
%th %th
%th Project %th Project
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key p .key p
%td %td
Go to the project's home page Go to the project's home page
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key e .key e
%td %td
Go to the project's activity feed Go to the project's activity feed
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key f .key f
%td %td
Go to files Go to files
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key c .key c
%td %td
Go to commits Go to commits
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key b .key b
%td %td
Go to builds Go to builds
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key n .key n
%td %td
Go to network graph Go to network graph
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key g .key g
%td %td
Go to graphs Go to graphs
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key i .key i
%td %td
Go to issues Go to issues
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key m .key m
%td %td
Go to merge requests Go to merge requests
%tr %tr
%td.shortcut %td.shortcut
.key g .key g
.key s .key s
%td %td
Go to snippets Go to snippets
%tr %tr
%td.shortcut %td.shortcut
.key t .key t
%td Go to finding file %td Go to finding file
%tr %tr
%td.shortcut %td.shortcut
.key i .key i
%td New issue %td New issue
.col-lg-4 .col-lg-4
%table.shortcut-mappings %table.shortcut-mappings
%tbody{ class: 'hidden-shortcut network', style: 'display:none' } %tbody{ class: 'hidden-shortcut network', style: 'display:none' }
%tr %tr
%th %th
%th Network Graph %th Network Graph
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.fa.fa-arrow-left %i.fa.fa-arrow-left
\/ \/
.key h .key h
%td Scroll left %td Scroll left
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.fa.fa-arrow-right %i.fa.fa-arrow-right
\/ \/
.key l .key l
%td Scroll right %td Scroll right
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.fa.fa-arrow-up %i.fa.fa-arrow-up
\/ \/
.key k .key k
%td Scroll up %td Scroll up
%tr %tr
%td.shortcut %td.shortcut
.key .key
%i.fa.fa-arrow-down %i.fa.fa-arrow-down
\/ \/
.key j .key j
%td Scroll down %td Scroll down
%tr %tr
%td.shortcut %td.shortcut
.key .key
shift shift
%i.fa.fa-arrow-up %i.fa.fa-arrow-up
\/ \/
.key .key
shift k shift k
%td Scroll to top %td Scroll to top
%tr %tr
%td.shortcut %td.shortcut
.key .key
shift shift
%i.fa.fa-arrow-down %i.fa.fa-arrow-down
\/ \/
.key .key
shift j shift j
%td Scroll to bottom %td Scroll to bottom
%tbody{ class: 'hidden-shortcut issues', style: 'display:none' } %tbody{ class: 'hidden-shortcut issues', style: 'display:none' }
%tr %tr
%th %th
%th Issues %th Issues
%tr %tr
%td.shortcut %td.shortcut
.key a .key a
%td Change assignee %td Change assignee
%tr %tr
%td.shortcut %td.shortcut
.key m .key m
%td Change milestone %td Change milestone
%tr %tr
%td.shortcut %td.shortcut
.key r .key r
%td Reply (quoting selected text) %td Reply (quoting selected text)
%tr %tr
%td.shortcut %td.shortcut
.key e .key e
%td Edit issue %td Edit issue
%tr %tr
%td.shortcut %td.shortcut
.key l .key l
%td Change Label %td Change Label
%tbody{ class: 'hidden-shortcut merge_requests', style: 'display:none' } %tbody{ class: 'hidden-shortcut merge_requests', style: 'display:none' }
%tr %tr
%th %th
%th Merge Requests %th Merge Requests
%tr %tr
%td.shortcut %td.shortcut
.key a .key a
%td Change assignee %td Change assignee
%tr %tr
%td.shortcut %td.shortcut
.key m .key m
%td Change milestone %td Change milestone
%tr %tr
%td.shortcut %td.shortcut
.key r .key r
%td Reply (quoting selected text) %td Reply (quoting selected text)
%tr %tr
%td.shortcut %td.shortcut
.key e .key e
%td Edit merge request %td Edit merge request
%tr %tr
%td.shortcut %td.shortcut
.key l .key l
%td Change Label %td Change Label
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7