summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gui/src/renderer/components/AdvancedSettingsStyles.tsx2
-rw-r--r--gui/src/renderer/components/CustomScrollbars.tsx4
-rw-r--r--gui/src/renderer/components/PreferencesStyles.tsx1
3 files changed, 5 insertions, 2 deletions
diff --git a/gui/src/renderer/components/AdvancedSettingsStyles.tsx b/gui/src/renderer/components/AdvancedSettingsStyles.tsx
index fdb9c011e9..421cb86a64 100644
--- a/gui/src/renderer/components/AdvancedSettingsStyles.tsx
+++ b/gui/src/renderer/components/AdvancedSettingsStyles.tsx
@@ -32,7 +32,7 @@ export default {
marginBottom: 20,
}),
advanced_settings__wgkeys_cell: Styles.createViewStyle({
- marginBottom: 20,
+ marginBottom: 22,
}),
advanced_settings__wg_no_key: Styles.createTextStyle({
fontFamily: 'Open Sans',
diff --git a/gui/src/renderer/components/CustomScrollbars.tsx b/gui/src/renderer/components/CustomScrollbars.tsx
index 544dd58604..08e996c250 100644
--- a/gui/src/renderer/components/CustomScrollbars.tsx
+++ b/gui/src/renderer/components/CustomScrollbars.tsx
@@ -176,6 +176,7 @@ export default class CustomScrollbars extends React.Component<IProps, IState> {
onScroll: _onScroll,
fillContainer,
children,
+ className,
...otherProps
} = this.props;
const showScrollbars = this.state.canScroll && this.state.showScrollIndicators;
@@ -185,9 +186,10 @@ export default class CustomScrollbars extends React.Component<IProps, IState> {
const thumbWideClass = this.state.isWide ? ' custom-scrollbars__thumb--wide' : '';
const trackClass =
showScrollbars && this.state.showTrack ? ' custom-scrollbars__track--visible' : '';
+ const classNames = className ? `${className} custom-scrollbars` : 'custom-scrollbars';
return (
- <div {...otherProps} className="custom-scrollbars">
+ <div {...otherProps} className={classNames}>
<div className={`custom-scrollbars__track ${trackClass}`} ref={this.trackRef} />
<div
className={`custom-scrollbars__thumb ${thumbWideClass} ${thumbActiveClass} ${thumbAnimationClass}`}
diff --git a/gui/src/renderer/components/PreferencesStyles.tsx b/gui/src/renderer/components/PreferencesStyles.tsx
index 47a37e8b4c..73c9691f7f 100644
--- a/gui/src/renderer/components/PreferencesStyles.tsx
+++ b/gui/src/renderer/components/PreferencesStyles.tsx
@@ -13,6 +13,7 @@ export default {
preferences__content: Styles.createViewStyle({
flexDirection: 'column',
flex: 1,
+ marginBottom: 2,
}),
preferences__separator: Styles.createViewStyle({
height: 1,