diff options
| author | Maxime Quandalle <maxime@quandalle.com> | 2015-11-15 15:39:11 -0800 |
|---|---|---|
| committer | Maxime Quandalle <maxime@quandalle.com> | 2015-11-25 09:39:29 -0800 |
| commit | 5763714d22c4533f173d1d34a1210acf548c4d58 (patch) | |
| tree | e21021cfc73ef50506dae49ddbe07b197f956c71 /client | |
| parent | da599a19ba32493d4ab5f9e21d5abfb06e3087cb (diff) | |
| download | wekan-5763714d22c4533f173d1d34a1210acf548c4d58.tar.gz wekan-5763714d22c4533f173d1d34a1210acf548c4d58.tar.bz2 wekan-5763714d22c4533f173d1d34a1210acf548c4d58.zip | |
Enphasize keyboard shortcuts with a dedicated style
Also add release notes related to the #387 merge.
-- Fluctuat nec mergitur
Diffstat (limited to 'client')
| -rw-r--r-- | client/components/cards/attachments.jade | 2 | ||||
| -rw-r--r-- | client/components/main/keyboardShortcuts.styl | 5 | ||||
| -rw-r--r-- | client/components/main/layouts.styl | 9 |
3 files changed, 10 insertions, 6 deletions
diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade index 79511ac9..2cb3bb85 100644 --- a/client/components/cards/attachments.jade +++ b/client/components/cards/attachments.jade @@ -7,7 +7,7 @@ template(name="cardAttachmentsPopup") a.js-upload-clipboard-image {{_ 'clipboard'}} template(name="previewClipboardImagePopup") - p {{_ "paste-or-dragdrop"}} + p <kbd>Ctrl</kbd>+<kbd>V</kbd> {{_ "paste-or-dragdrop"}} img.preview-clipboard-image() button.primary.js-upload-pasted-image {{_ 'upload'}} diff --git a/client/components/main/keyboardShortcuts.styl b/client/components/main/keyboardShortcuts.styl index 42e0637b..f77d387f 100644 --- a/client/components/main/keyboardShortcuts.styl +++ b/client/components/main/keyboardShortcuts.styl @@ -14,11 +14,6 @@ padding: 5px 8px margin: 5px font-size: 18px - font-weight: bold - background: white - border-radius: 3px - border: 1px solid darken(white, 10%) - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.15) .shortcuts-list-item-action font-size: 1.4em diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index 1dbefc20..fcc94251 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -172,6 +172,15 @@ dl, dt dd margin: 0 0 16px 24px +kbd + padding: 1px 3px + margin: 3px + font-weight: bold + background: darken(white, 2%) + border-radius: 3px + border: 1px solid darken(white, 10%) + box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.15) + .clear clear: both |