keeweb/keeweb
1
0
Fork 0
mirror of https://github.com/keeweb/keeweb.git synced 2024-06-27 07:45:08 +02:00
Code Issues Releases Wiki Activity

removed shortcuts formatting

Browse Source
This commit is contained in:
antelle 2020-05-09 16:35:11 +02:00
parent 89415c86a4
commit c9cb15d7b7
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
6 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/comp/app/shortcuts.js
View File

@ -85,7 +85,7 @@ const Shortcuts = {
return Features.isMac ? '⌃' : this.formatShortcut(Locale.ctrlKey, formatting); return Features.isMac ? '⌃' : this.formatShortcut(Locale.ctrlKey, formatting);
}, },
formatShortcut(shortcut, formatting) { formatShortcut(shortcut, formatting) {
return formatting ? `<span class="thin">${shortcut} + </span>` : `${shortcut}+`; return formatting ? `${shortcut} + ` : `${shortcut}+`;
}, },
globalShortcutText(type, formatting) { globalShortcutText(type, formatting) {
return this.presentShortcut(this.globalShortcut(type), formatting); return this.presentShortcut(this.globalShortcut(type), formatting);

10
app/scripts/comp/format/otp-qr-reader.js
View File

@ -21,17 +21,11 @@ class OtpQrReader {
read() { read() {
let screenshotKey = Shortcuts.screenshotToClipboardShortcut(); let screenshotKey = Shortcuts.screenshotToClipboardShortcut();
if (screenshotKey) { if (screenshotKey) {
screenshotKey = Locale.detSetupOtpAlertBodyWith.replace( screenshotKey = Locale.detSetupOtpAlertBodyWith.replace('{}', screenshotKey);
'{}',
'<code>' + screenshotKey + '</code>'
);
} }
const pasteKey = Features.isMobile const pasteKey = Features.isMobile
? '' ? ''
: Locale.detSetupOtpAlertBodyWith.replace( : Locale.detSetupOtpAlertBodyWith.replace('{}', Shortcuts.actionShortcutSymbol() + 'V');
'{}',
'<code>' + Shortcuts.actionShortcutSymbol() + 'V</code>'
);
this.startListenClipoard(); this.startListenClipoard();
const buttons = [ const buttons = [
{ result: 'manually', title: Locale.detSetupOtpManualButton, silent: true }, { result: 'manually', title: Locale.detSetupOtpManualButton, silent: true },

2
app/scripts/views/details/details-attachment-view.js
View File

@ -16,7 +16,7 @@ class DetailsAttachmentView extends View {
isMobile: Features.isMobile isMobile: Features.isMobile
}); });
const shortcut = this.$el.find('.details__attachment-preview-download-text-shortcut'); const shortcut = this.$el.find('.details__attachment-preview-download-text-shortcut');
shortcut.html(Shortcuts.actionShortcutSymbol(false)); shortcut.text(Shortcuts.actionShortcutSymbol());
const blob = new Blob([this.model.getBinary()], { type: this.model.mimeType }); const blob = new Blob([this.model.getBinary()], { type: this.model.mimeType });
const dataEl = this.$el.find('.details__attachment-preview-data'); const dataEl = this.$el.find('.details__attachment-preview-data');
switch ((this.model.mimeType || '').split('/')[0]) { switch ((this.model.mimeType || '').split('/')[0]) {

4
app/styles/base/_typography.scss
View File

@ -93,10 +93,6 @@ img {
max-width: 100%; max-width: 100%;
} }
.thin {
font-weight: 200;
}
body:not(.edge) * { body:not(.edge) * {
// https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12132854/ // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12132854/
&::selection { &::selection {

6
app/templates/auto-type/auto-type-select.hbs
View File

@ -3,9 +3,9 @@
<h1 class="at-select__header-text">{{res 'autoTypeHeader'}}</h1> <h1 class="at-select__header-text">{{res 'autoTypeHeader'}}</h1>
<div class="at-select__hint" id="at-select__hint"> <div class="at-select__hint" id="at-select__hint">
<div class="at-select__hint-text"><span class="shortcut">{{keyEnter}}</span>: {{res 'autoTypeSelectionHint'}}</div> <div class="at-select__hint-text"><span class="shortcut">{{keyEnter}}</span>: {{res 'autoTypeSelectionHint'}}</div>
<div class="at-select__hint-text"><span class="shortcut">{{{actionSymbol}}} {{keyEnter}}</span>: {{res 'autoTypeSelectionHintAction'}}</div> <div class="at-select__hint-text"><span class="shortcut">{{actionSymbol}} {{keyEnter}}</span>: {{res 'autoTypeSelectionHintAction'}}</div>
<div class="at-select__hint-text"><span class="shortcut">{{{altSymbol}}} {{keyEnter}}</span>: {{res 'autoTypeSelectionHintOpt'}}</div> <div class="at-select__hint-text"><span class="shortcut">{{altSymbol}} {{keyEnter}}</span>: {{res 'autoTypeSelectionHintOpt'}}</div>
<div class="at-select__hint-text"><span class="shortcut">{{{shiftSymbol}}} {{keyEnter}}</span>: {{res 'autoTypeSelectionHintShift'}}</div> <div class="at-select__hint-text"><span class="shortcut">{{shiftSymbol}} {{keyEnter}}</span>: {{res 'autoTypeSelectionHintShift'}}</div>
</div> </div>
{{#if filterText}} {{#if filterText}}
<div class="at-select__header-filter" id="at-select__header-filter"> <div class="at-select__header-filter" id="at-select__header-filter">

40
app/templates/settings/settings-shortcuts.hbs
View File

@ -1,37 +1,37 @@
<div class="settings__content"> <div class="settings__content">
<h1><i class="fa fa-keyboard-o settings__head-icon"></i> {{res 'setShTitle'}}</h1> <h1><i class="fa fa-keyboard-o settings__head-icon"></i> {{res 'setShTitle'}}</h1>
<div><span class="shortcut">{{{cmd}}}A</span> {{res 'or'}} <span class="shortcut">{{{alt}}}A</span> {{res 'setShShowAll'}}</div> <div><span class="shortcut">{{cmd}}A</span> {{res 'or'}} <span class="shortcut">{{alt}}A</span> {{res 'setShShowAll'}}</div>
<div><span class="shortcut">{{{alt}}}C</span> {{res 'setShColors'}}</div> <div><span class="shortcut">{{alt}}C</span> {{res 'setShColors'}}</div>
<div><span class="shortcut">{{{alt}}}D</span> {{res 'setShTrash'}}</div> <div><span class="shortcut">{{alt}}D</span> {{res 'setShTrash'}}</div>
<div><span class="shortcut">{{{cmd}}}F</span> {{res 'setShFind'}}</div> <div><span class="shortcut">{{cmd}}F</span> {{res 'setShFind'}}</div>
<div><span class="shortcut">esc</span> {{res 'setShClearSearch'}}</div> <div><span class="shortcut">esc</span> {{res 'setShClearSearch'}}</div>
<div><span class="shortcut">{{{cmd}}}C</span> {{res 'setShCopyPass'}}</div> <div><span class="shortcut">{{cmd}}C</span> {{res 'setShCopyPass'}}</div>
<div><span class="shortcut">{{{cmd}}}B</span> {{res 'setShCopyUser'}}</div> <div><span class="shortcut">{{cmd}}B</span> {{res 'setShCopyUser'}}</div>
<div><span class="shortcut">{{{cmd}}}U</span> {{res 'setShCopyUrl'}}</div> <div><span class="shortcut">{{cmd}}U</span> {{res 'setShCopyUrl'}}</div>
{{#if autoTypeSupported}} {{#if autoTypeSupported}}
<div><span class="shortcut">{{{cmd}}}T</span> {{res 'setShAutoType'}}</div> <div><span class="shortcut">{{cmd}}T</span> {{res 'setShAutoType'}}</div>
{{/if}} {{/if}}
<div><span class="shortcut">&uarr;</span> {{res 'setShPrev'}}</div> <div><span class="shortcut">&uarr;</span> {{res 'setShPrev'}}</div>
<div><span class="shortcut">&darr;</span> {{res 'setShNext'}}</div> <div><span class="shortcut">&darr;</span> {{res 'setShNext'}}</div>
<div><span class="shortcut">{{{alt}}}N</span> {{res 'setShCreateEntry'}}</div> <div><span class="shortcut">{{alt}}N</span> {{res 'setShCreateEntry'}}</div>
<div><span class="shortcut">{{{cmd}}}O</span> {{res 'setShOpen'}}</div> <div><span class="shortcut">{{cmd}}O</span> {{res 'setShOpen'}}</div>
<div><span class="shortcut">{{{cmd}}}S</span> {{res 'setShSave'}}</div> <div><span class="shortcut">{{cmd}}S</span> {{res 'setShSave'}}</div>
<div><span class="shortcut">{{{cmd}}}G</span> {{res 'setShGen'}}</div> <div><span class="shortcut">{{cmd}}G</span> {{res 'setShGen'}}</div>
<div><span class="shortcut">{{{cmd}}},</span> {{res 'setShSet'}}</div> <div><span class="shortcut">{{cmd}},</span> {{res 'setShSet'}}</div>
<div><span class="shortcut">{{{cmd}}}L</span> {{res 'setShLock'}}</div> <div><span class="shortcut">{{cmd}}L</span> {{res 'setShLock'}}</div>
{{#if globalShortcuts}} {{#if globalShortcuts}}
<p>{{res 'setShGlobal'}}</p> <p>{{res 'setShGlobal'}}</p>
<div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}" <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
data-shortcut="autoType">{{{globalShortcuts.autoType}}}</button> {{res 'setShAutoTypeGlobal'}}</div> data-shortcut="autoType">{{globalShortcuts.autoType}}</button> {{res 'setShAutoTypeGlobal'}}</div>
<div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}" <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
data-shortcut="copyPassword">{{{globalShortcuts.copyPassword}}}</button> {{res 'setShCopyPassOnly'}}</div> data-shortcut="copyPassword">{{globalShortcuts.copyPassword}}</button> {{res 'setShCopyPassOnly'}}</div>
<div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}" <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
data-shortcut="copyUser">{{{globalShortcuts.copyUser}}}</button> {{res 'setShCopyUser'}}</div> data-shortcut="copyUser">{{globalShortcuts.copyUser}}</button> {{res 'setShCopyUser'}}</div>
<div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}" <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
data-shortcut="copyUrl">{{{globalShortcuts.copyUrl}}}</button> {{res 'setShCopyUrl'}}</div> data-shortcut="copyUrl">{{globalShortcuts.copyUrl}}</button> {{res 'setShCopyUrl'}}</div>
<div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}" <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
data-shortcut="copyOtp">{{{globalShortcuts.copyOtp}}}</button> {{res 'setShCopyOtp'}}</div> data-shortcut="copyOtp">{{globalShortcuts.copyOtp}}</button> {{res 'setShCopyOtp'}}</div>
<div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}" <div><button class="shortcut btn-silent {{#if globalIsLarge}}shortcut-large{{/if}}"
data-shortcut="restoreApp">{{{globalShortcuts.restoreApp}}}</button> {{#res 'setShRestoreApp'}}KeeWeb{{/res}}</div> data-shortcut="restoreApp">{{globalShortcuts.restoreApp}}</button> {{#res 'setShRestoreApp'}}KeeWeb{{/res}}</div>
{{/if}} {{/if}}
</div> </div>