self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Laurent Cozic 2020-03-15 10:19:46 +00:00
commit 8e5762c3a3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ElectronClient/gui/Header.jsx
View File

@ -100,7 +100,7 @@ class HeaderComponent extends React.Component {
} }
determineButtonLabelState() { determineButtonLabelState() {
const mediaQuery = window.matchMedia(`(max-width: ${550 * this.props.zoomFactor}px)`); const mediaQuery = window.matchMedia(`(max-width: ${780 * this.props.zoomFactor}px)`);
const showButtonLabels = !mediaQuery.matches; const showButtonLabels = !mediaQuery.matches;
if (this.state.showButtonLabels !== showButtonLabels) { if (this.state.showButtonLabels !== showButtonLabels) {
@ -266,6 +266,7 @@ class HeaderComponent extends React.Component {
fontSize: theme.fontSize, fontSize: theme.fontSize,
boxSizing: 'border-box', boxSizing: 'border-box',
cursor: 'default', cursor: 'default',
whiteSpace: 'nowrap',
}; };
if (showBackButton) { if (showBackButton) {

2
ReactNativeClient/lib/components/global-style.js
View File

@ -140,7 +140,7 @@ function themeStyle(theme) {
output.raisedHighlightedColor = '#ffffff'; output.raisedHighlightedColor = '#ffffff';
output.htmlColor = 'rgb(220,220,220)'; output.htmlColor = 'rgb(220,220,220)';
output.htmlBackgroundColor = 'rgb(29,32,36)'; output.htmlBackgroundColor = 'rgb(0,0,0)';
output.htmlLinkColor = 'rgb(166,166,255)'; output.htmlLinkColor = 'rgb(166,166,255)';
output.htmlDividerColor = '#3D444E'; output.htmlDividerColor = '#3D444E';