self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Merge branch 'master' of github.com:laurent22/joplin

Browse Source
This commit is contained in:
Laurent Cozic 2019-10-31 07:25:39 +00:00
commit 5522d11eed
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ElectronClient/app/gui/MainScreen.jsx
View File

@ -390,6 +390,7 @@ class MainScreenComponent extends React.Component {
}; };
if (isNoteListVisible === false) { if (isNoteListVisible === false) {
this.styles_.noteList.width = 0;
this.styles_.noteList.display = 'none'; this.styles_.noteList.display = 'none';
this.styles_.verticalResizer.display = 'none'; this.styles_.verticalResizer.display = 'none';
} }

8
ElectronClient/app/gui/NoteText.jsx
View File

@ -239,6 +239,14 @@ class NoteTextComponent extends React.Component {
this.selectionRange_ = null; this.selectionRange_ = null;
} else { } else {
this.selectionRange_ = ranges[0]; 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');
}
}
} }
}; };

7
ReactNativeClient/lib/renderers/noteStyle.js
View File

@ -22,6 +22,13 @@ module.exports = function(style, options) {
strong { strong {
color: ${style.colorBright}; 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 { ::-webkit-scrollbar {
width: 7px; width: 7px;
height: 7px; height: 7px;