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(' ')} > -