diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-08-13 12:56:48 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-08-13 12:56:48 +0200 |
| commit | fb8db653c9154dcd4a8b7dc9325c33b2da724cf5 (patch) | |
| tree | 20fe5a54e5ded2ec31da66145dfadb314a13cc72 | |
| parent | 5d8b85c355a4c29d18d8f498db9498f02bc3bab2 (diff) | |
| parent | 7f8328fda17790d91ecb8a03d60bf44c41983c92 (diff) | |
| download | mullvadvpn-fb8db653c9154dcd4a8b7dc9325c33b2da724cf5.tar.xz mullvadvpn-fb8db653c9154dcd4a8b7dc9325c33b2da724cf5.zip | |
Merge branch 'fix-custom-scrollbar-classname' into master
| -rw-r--r-- | gui/src/renderer/components/AdvancedSettingsStyles.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/CustomScrollbars.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/PreferencesStyles.tsx | 1 |
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, |