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 | |
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
-rw-r--r-- | History.md | 9 | ||||
-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 | ||||
-rw-r--r-- | i18n/en.i18n.json | 2 |
5 files changed, 16 insertions, 11 deletions
@@ -4,12 +4,13 @@ This release features: * Card import from Trello * Autocompletion in the minicard editor. Start with <kbd>@</kbd> to start the - a board member autocompletion, or <kbd>#</kbd> for a label. + a board member autocompletion, or <kbd>#</kbd> for a label; * Accelerate the initial page rendering by sending the data on the intial HTTP - response instead of waiting for the DDP connection to open. + response instead of waiting for the DDP connection to open; +* Support images attachments copy pasting. -Thanks to GitHub users AlexanderS, fisle, FuzzyWuzzie, ndarilek, and -xavierpriour for their contributions. +Thanks to GitHub users AlexanderS, fisle, floatinghotpot, FuzzyWuzzie, ndarilek, +and xavierpriour for their contributions. # v0.9 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 diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index a6439fa5..66bd0155 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -184,7 +184,7 @@ "page-maybe-private": "This page may be private. You may be able to view it by <a href='%s'>logging in</a>.", "page-not-found": "Page not found.", "password": "Password", - "paste-or-dragdrop": "Ctrl-V to paste, or drag & drop image file to it (image only)", + "paste-or-dragdrop": "to paste, or drag & drop image file to it (image only)", "preview": "Preview", "previewClipboardImagePopup-title": "Preview", "previewAttachedImagePopup-title": "Preview", |