From d282d1d9c71cc508ca49ac206776016bfac246d5 Mon Sep 17 00:00:00 2001
From: mgabdev <>
Date: Tue, 3 Nov 2020 15:04:31 -0600
Subject: [PATCH] Added logoDisabled/Stealth Gab mode for logo in NavigationBar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
• Added:
- logoDisabled/Stealth Gab mode for logo in NavigationBar to turn into Gab "g"
---
app/javascript/gabsocial/components/icon.js | 14 ++++++++++++--
.../components/modal/display_options_modal.js | 11 ++++++++++-
.../navigation_bar/default_navigation_bar.js | 7 +++++--
app/javascript/gabsocial/reducers/settings.js | 1 +
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/app/javascript/gabsocial/components/icon.js b/app/javascript/gabsocial/components/icon.js
index 235f14bb..7f749d7a 100644
--- a/app/javascript/gabsocial/components/icon.js
+++ b/app/javascript/gabsocial/components/icon.js
@@ -1,7 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
import { CX } from '../constants'
-
import Logo from './logo'
import Loading from './loading'
import VerifiedIcon from './verified_icon'
@@ -13,9 +12,19 @@ class Icon extends React.PureComponent {
className,
id,
size,
+ minimizeLogo,
} = this.props
- if (id === 'logo') return
+ if (id === 'logo') {
+ if (minimizeLogo) {
+ return (
+
+
+
+ )
+ }
+ return
+ }
else if (id === 'loading') return
else if (id === 'verified') return
@@ -35,6 +44,7 @@ Icon.propTypes = {
className: PropTypes.string,
id: PropTypes.string.isRequired,
size: PropTypes.string,
+ minimizeLogo: PropTypes.bool,
}
export default Icon
\ No newline at end of file
diff --git a/app/javascript/gabsocial/components/modal/display_options_modal.js b/app/javascript/gabsocial/components/modal/display_options_modal.js
index 9e75fb52..b36e83c9 100644
--- a/app/javascript/gabsocial/components/modal/display_options_modal.js
+++ b/app/javascript/gabsocial/components/modal/display_options_modal.js
@@ -84,7 +84,7 @@ class DisplayOptionsModal extends ImmutablePureComponent {
- Rounded
+ Options
+
+
+
diff --git a/app/javascript/gabsocial/components/navigation_bar/default_navigation_bar.js b/app/javascript/gabsocial/components/navigation_bar/default_navigation_bar.js
index dbbec0a4..64ee919a 100644
--- a/app/javascript/gabsocial/components/navigation_bar/default_navigation_bar.js
+++ b/app/javascript/gabsocial/components/navigation_bar/default_navigation_bar.js
@@ -66,6 +66,7 @@ class DefaultNavigationBar extends ImmutablePureComponent {
tabs,
account,
noActions,
+ logoDisabled,
} = this.props
const navigationContainerClasses = CX({
@@ -148,7 +149,7 @@ class DefaultNavigationBar extends ImmutablePureComponent {
backgroundColor='none'
className={[_s.d, _s.jcCenter, _s.noSelect, _s.noUnderline, _s.h53PX, _s.cursorPointer, _s.px10, _s.mr5].join(' ')}
>
-
+
@@ -201,7 +202,7 @@ class DefaultNavigationBar extends ImmutablePureComponent {
href='/'
className={[_s.h53PX, _s.bgTransparent, _s.outlineNone, _s.cursorPointer, _s.d, _s.jcCenter].join(' ')}
>
-
+
}
{
@@ -257,6 +258,7 @@ const mapStateToProps = (state) => ({
account: makeGetAccount()(state, me),
emailConfirmationResends: state.getIn(['user', 'emailConfirmationResends'], 0),
theme: state.getIn(['settings', 'displayOptions', 'theme'], DEFAULT_THEME),
+ logoDisabled: state.getIn(['settings', 'displayOptions', 'logoDisabled'], false),
})
const mapDispatchToProps = (dispatch) => ({
@@ -290,6 +292,7 @@ DefaultNavigationBar.propTypes = {
emailConfirmationResends: PropTypes.number.isRequired,
noActions: PropTypes.bool,
theme: PropTypes.string,
+ logoDisabled: PropTypes.bool,
}
export default connect(mapStateToProps, mapDispatchToProps)(DefaultNavigationBar)
\ No newline at end of file
diff --git a/app/javascript/gabsocial/reducers/settings.js b/app/javascript/gabsocial/reducers/settings.js
index c6db27d7..8066f14f 100644
--- a/app/javascript/gabsocial/reducers/settings.js
+++ b/app/javascript/gabsocial/reducers/settings.js
@@ -38,6 +38,7 @@ const initialState = ImmutableMap({
fontSize: 'normal',
radiusSmallDisabled: false,
radiusCircleDisabled: false,
+ logoDisabled: false,
theme: 'light',
}),