From c2e1c4c1e1f3d5fa10c091eeebf3bc5ced3bfd91 Mon Sep 17 00:00:00 2001 From: Anjula Karunarathne Date: Sun, 15 Mar 2020 09:49:24 +0000 Subject: [PATCH 1/2] Desktop: Fixes #2700: Fix button label wrapping in toolbar (#2708) --- ElectronClient/gui/Header.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ElectronClient/gui/Header.jsx b/ElectronClient/gui/Header.jsx index de9787e06..6787d3896 100644 --- a/ElectronClient/gui/Header.jsx +++ b/ElectronClient/gui/Header.jsx @@ -100,7 +100,7 @@ class HeaderComponent extends React.Component { } 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; if (this.state.showButtonLabels !== showButtonLabels) { @@ -266,6 +266,7 @@ class HeaderComponent extends React.Component { fontSize: theme.fontSize, boxSizing: 'border-box', cursor: 'default', + whiteSpace: 'nowrap', }; if (showBackButton) { From 50a811720ff180d939b4a7ae83c3b65a8186514a Mon Sep 17 00:00:00 2001 From: Rahul Mohata <54268438+Rahulm2310@users.noreply.github.com> Date: Sun, 15 Mar 2020 15:43:44 +0530 Subject: [PATCH 2/2] Mobile: Fixes #2695: Fixed colour of background in OLED dark theme (#2757) --- ReactNativeClient/lib/components/global-style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactNativeClient/lib/components/global-style.js b/ReactNativeClient/lib/components/global-style.js index c6300a1fb..6b2920a64 100644 --- a/ReactNativeClient/lib/components/global-style.js +++ b/ReactNativeClient/lib/components/global-style.js @@ -140,7 +140,7 @@ function themeStyle(theme) { output.raisedHighlightedColor = '#ffffff'; 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.htmlDividerColor = '#3D444E';