mirror of
https://github.com/laurent22/joplin.git
synced 2024-11-24 08:12:24 +02:00
Merge branch 'master' of github.com:laurent22/joplin
This commit is contained in:
commit
5522d11eed
@ -390,6 +390,7 @@ class MainScreenComponent extends React.Component {
|
||||
};
|
||||
|
||||
if (isNoteListVisible === false) {
|
||||
this.styles_.noteList.width = 0;
|
||||
this.styles_.noteList.display = 'none';
|
||||
this.styles_.verticalResizer.display = 'none';
|
||||
}
|
||||
|
@ -239,6 +239,14 @@ class NoteTextComponent extends React.Component {
|
||||
this.selectionRange_ = null;
|
||||
} else {
|
||||
this.selectionRange_ = ranges[0];
|
||||
if (process.platform === 'linux') {
|
||||
const textRange = this.textOffsetSelection();
|
||||
if (textRange.start != textRange.end) {
|
||||
clipboard.writeText(this.state.note.body.slice(
|
||||
Math.min(textRange.start, textRange.end),
|
||||
Math.max(textRange.end, textRange.start)), 'selection');
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -22,6 +22,13 @@ module.exports = function(style, options) {
|
||||
strong {
|
||||
color: ${style.colorBright};
|
||||
}
|
||||
kbd {
|
||||
border: 1px solid ${style.htmlCodeBorderColor};
|
||||
box-shadow: inset 0 -1px 0 ${style.htmlCodeBorderColor};
|
||||
padding: 2px 4px;
|
||||
border-radius: 3px;
|
||||
background-color: ${style.htmlCodeBackgroundColor};
|
||||
}
|
||||
::-webkit-scrollbar {
|
||||
width: 7px;
|
||||
height: 7px;
|
||||
|
Loading…
Reference in New Issue
Block a user