diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/Sidebar.jsx | 16 | ||||
-rw-r--r-- | src/components/services/tabs/Tabbar.js | 6 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.jsx | 2 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/components/layout/Sidebar.jsx b/src/components/layout/Sidebar.jsx index dd81f4ab5..fef5baf64 100644 --- a/src/components/layout/Sidebar.jsx +++ b/src/components/layout/Sidebar.jsx | |||
@@ -151,7 +151,7 @@ class Sidebar extends Component { | |||
151 | hideNotificationsButton, | 151 | hideNotificationsButton, |
152 | hideSettingsButton, | 152 | hideSettingsButton, |
153 | hideSplitModeButton, | 153 | hideSplitModeButton, |
154 | useVerticalStyle, | 154 | useHorizontalStyle, |
155 | splitMode, | 155 | splitMode, |
156 | } = stores.settings.app; | 156 | } = stores.settings.app; |
157 | const { intl } = this.props; | 157 | const { intl } = this.props; |
@@ -180,7 +180,7 @@ class Sidebar extends Component { | |||
180 | {...this.props} | 180 | {...this.props} |
181 | enableToolTip={() => this.enableToolTip()} | 181 | enableToolTip={() => this.enableToolTip()} |
182 | disableToolTip={() => this.disableToolTip()} | 182 | disableToolTip={() => this.disableToolTip()} |
183 | useVerticalStyle={stores.settings.all.app.useVerticalStyle} | 183 | useHorizontalStyle={stores.settings.all.app.useHorizontalStyle} |
184 | /> | 184 | /> |
185 | <> | 185 | <> |
186 | {numberActiveButtons <= 1 || hideCollapseButton ? null : ( | 186 | {numberActiveButtons <= 1 || hideCollapseButton ? null : ( |
@@ -189,16 +189,14 @@ class Sidebar extends Component { | |||
189 | onClick={() => toggleCollapseMenu()} | 189 | onClick={() => toggleCollapseMenu()} |
190 | className="sidebar__button sidebar__button--hamburger-menu" | 190 | className="sidebar__button sidebar__button--hamburger-menu" |
191 | > | 191 | > |
192 | {isMenuCollapsed && !useVerticalStyle ? ( | 192 | {isMenuCollapsed ? <Icon icon={mdiMenu} size={1.5} /> : null} |
193 | <Icon icon={mdiMenu} size={1.5} /> | ||
194 | ) : null} | ||
195 | 193 | ||
196 | {isMenuCollapsed && useVerticalStyle ? ( | 194 | {!isMenuCollapsed && !useHorizontalStyle ? ( |
197 | <Icon icon={mdiChevronRight} size={1.5} /> | 195 | <Icon icon={mdiChevronDown} size={1.5} /> |
198 | ) : null} | 196 | ) : null} |
199 | 197 | ||
200 | {!isMenuCollapsed ? ( | 198 | {!isMenuCollapsed && useHorizontalStyle ? ( |
201 | <Icon icon={mdiChevronDown} size={1.5} /> | 199 | <Icon icon={mdiChevronRight} size={1.5} /> |
202 | ) : null} | 200 | ) : null} |
203 | </button> | 201 | </button> |
204 | )} | 202 | )} |
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index d9e11df41..f0cb48e5e 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js | |||
@@ -20,7 +20,7 @@ class TabBar extends Component { | |||
20 | updateService: PropTypes.func.isRequired, | 20 | updateService: PropTypes.func.isRequired, |
21 | hibernateService: PropTypes.func.isRequired, | 21 | hibernateService: PropTypes.func.isRequired, |
22 | wakeUpService: PropTypes.func.isRequired, | 22 | wakeUpService: PropTypes.func.isRequired, |
23 | useVerticalStyle: PropTypes.bool.isRequired, | 23 | useHorizontalStyle: PropTypes.bool.isRequired, |
24 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, | 24 | showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, |
25 | showServiceNameSetting: PropTypes.bool.isRequired, | 25 | showServiceNameSetting: PropTypes.bool.isRequired, |
26 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, | 26 | showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, |
@@ -80,13 +80,13 @@ class TabBar extends Component { | |||
80 | toggleAudio, | 80 | toggleAudio, |
81 | toggleDarkMode, | 81 | toggleDarkMode, |
82 | deleteService, | 82 | deleteService, |
83 | useVerticalStyle, | 83 | useHorizontalStyle, |
84 | showMessageBadgeWhenMutedSetting, | 84 | showMessageBadgeWhenMutedSetting, |
85 | showServiceNameSetting, | 85 | showServiceNameSetting, |
86 | showMessageBadgesEvenWhenMuted, | 86 | showMessageBadgesEvenWhenMuted, |
87 | } = this.props; | 87 | } = this.props; |
88 | 88 | ||
89 | const axis = useVerticalStyle ? 'x' : 'y'; | 89 | const axis = useHorizontalStyle ? 'x' : 'y'; |
90 | 90 | ||
91 | return ( | 91 | return ( |
92 | <div> | 92 | <div> |
diff --git a/src/components/settings/settings/EditSettingsForm.jsx b/src/components/settings/settings/EditSettingsForm.jsx index 32a44aa37..cb1d261f8 100644 --- a/src/components/settings/settings/EditSettingsForm.jsx +++ b/src/components/settings/settings/EditSettingsForm.jsx | |||
@@ -712,7 +712,7 @@ class EditSettingsForm extends Component { | |||
712 | 712 | ||
713 | <Select field={form.$('sidebarServicesLocation')} /> | 713 | <Select field={form.$('sidebarServicesLocation')} /> |
714 | 714 | ||
715 | <Toggle field={form.$('useVerticalStyle')} /> | 715 | <Toggle field={form.$('useHorizontalStyle')} /> |
716 | 716 | ||
717 | <Toggle field={form.$('hideCollapseButton')} /> | 717 | <Toggle field={form.$('hideCollapseButton')} /> |
718 | 718 | ||