aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/services/content
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2020-02-23 21:55:58 +0100
committerLibravatar vantezzen <hello@vantezzen.io>2020-02-23 21:55:58 +0100
commiteb3acd97acc62d84d3d4548a9089e0101d5780e1 (patch)
tree12b6211548832a6aff428b4d4287811a5b403bfd /src/components/services/content
parentFix warning about missing actions in PublishDebugLogModal (diff)
downloadferdium-app-eb3acd97acc62d84d3d4548a9089e0101d5780e1.tar.gz
ferdium-app-eb3acd97acc62d84d3d4548a9089e0101d5780e1.tar.zst
ferdium-app-eb3acd97acc62d84d3d4548a9089e0101d5780e1.zip
#270 Add more navigation bar behaviour settings
Diffstat (limited to 'src/components/services/content')
-rw-r--r--src/components/services/content/ServiceView.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 860863d26..f6832038a 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -135,9 +135,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
135 } = this.props; 135 } = this.props;
136 136
137 const { 137 const {
138 showServiceNavigationBar, 138 navigationBarBehaviour,
139 } = stores.settings.app; 139 } = stores.settings.app;
140 140
141 const showNavBar = navigationBarBehaviour === 'always' || (navigationBarBehaviour === 'custom' && service.recipe.id === CUSTOM_WEBSITE_ID);
142
141 const webviewClasses = classnames({ 143 const webviewClasses = classnames({
142 services__webview: true, 144 services__webview: true,
143 'services__webview-wrapper': true, 145 'services__webview-wrapper': true,
@@ -193,7 +195,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends
193 <> 195 <>
194 {!service.isHibernating ? ( 196 {!service.isHibernating ? (
195 <> 197 <>
196 {(service.recipe.id === CUSTOM_WEBSITE_ID || showServiceNavigationBar) && ( 198 {showNavBar && (
197 <WebControlsScreen service={service} /> 199 <WebControlsScreen service={service} />
198 )} 200 )}
199 <ServiceWebview 201 <ServiceWebview