open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use a typical OS order for #help-popup buttons

Browse Source 
* horizontally centered in Windows
* right-aligned otherwise
This commit is contained in:
tophf 2018-07-22 19:55:27 +03:00
parent 87da06037f
commit 126d909ca7
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
edit/edit.css
View File

@ -564,10 +564,11 @@ body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar
top: .5em; top: .5em;
} }
#help-popup .saved-message { #help-popup .saved-message {
display: none; /* display: none; */
color: #090; color: #090;
margin-left: 10px; /* margin-left: 10px; */
font-weight: bold; font-weight: bold;
position: absolute;
} }
#help-popup .saved-message.show { #help-popup .saved-message.show {
display: inline-block; display: inline-block;
@ -590,13 +591,19 @@ body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar
padding-right: 0.5rem; padding-right: 0.5rem;
} }
#help-popup .buttons {
text-align: center;
}
.non-windows #help-popup .buttons {
direction: rtl;
text-align: right;
}
#help-popup button[name^="import"] { #help-popup button[name^="import"] {
line-height: 1.5rem; line-height: 1.5rem;
padding: 0 0.5rem; padding: 0 0.5rem;
margin: 0.5rem 0 0 0.5rem; margin: 0.5rem 0 0 0.5rem;
pointer-events: none; pointer-events: none;
opacity: 0.5; opacity: 0.5;
float: right;
} }
#help-popup.ready button[name^="import"] { #help-popup.ready button[name^="import"] {
pointer-events: all; pointer-events: all;

14
edit/edit.js
View File

@ -427,19 +427,19 @@ function toMozillaFormat() {
function fromMozillaFormat() { function fromMozillaFormat() {
const popup = showCodeMirrorPopup(t('styleFromMozillaFormatPrompt'), const popup = showCodeMirrorPopup(t('styleFromMozillaFormatPrompt'),
$create([ $create('.buttons', [
$create('button', {
name: 'import-append',
textContent: t('importAppendLabel'),
title: 'Ctrl-Enter:\n' + t('importAppendTooltip'),
onclick: doImport,
}),
$create('button', { $create('button', {
name: 'import-replace', name: 'import-replace',
textContent: t('importReplaceLabel'), textContent: t('importReplaceLabel'),
title: 'Ctrl-Shift-Enter:\n' + t('importReplaceTooltip'), title: 'Ctrl-Shift-Enter:\n' + t('importReplaceTooltip'),
onclick: () => doImport({replaceOldStyle: true}), onclick: () => doImport({replaceOldStyle: true}),
}), }),
$create('button', {
name: 'import-append',
textContent: t('importAppendLabel'),
title: 'Ctrl-Enter:\n' + t('importAppendTooltip'),
onclick: doImport,
}),
])); ]));
const contents = $('.contents', popup); const contents = $('.contents', popup);
contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild); contents.insertBefore(popup.codebox.display.wrapper, contents.firstElementChild);

2
edit/lint.js
View File

@ -448,10 +448,12 @@ function setupLinterPopup(config) {
t('linterRulesLink')), t('linterRulesLink')),
linter === 'csslint' ? ' ' + t('linterCSSLintSettings') : '', linter === 'csslint' ? ' ' + t('linterCSSLintSettings') : '',
]), ]),
$create('.buttons', [
$create('button.save', {onclick: save, title: 'Ctrl-Enter'}, t('styleSaveLabel')), $create('button.save', {onclick: save, title: 'Ctrl-Enter'}, t('styleSaveLabel')),
$create('button.cancel', {onclick: cancel}, t('confirmClose')), $create('button.cancel', {onclick: cancel}, t('confirmClose')),
$create('button.reset', {onclick: reset, title: t('linterResetMessage')}, t('genericResetLabel')), $create('button.reset', {onclick: reset, title: t('linterResetMessage')}, t('genericResetLabel')),
$create('span.saved-message', t('genericSavedMessage')), $create('span.saved-message', t('genericSavedMessage')),
]),
]); ]);
} }