diff --git a/app/renderer/components/bookmarks/bookmarksToolbar.js b/app/renderer/components/bookmarks/bookmarksToolbar.js
index 4fae66b055f..1a7b169b987 100644
--- a/app/renderer/components/bookmarks/bookmarksToolbar.js
+++ b/app/renderer/components/bookmarks/bookmarksToolbar.js
@@ -211,13 +211,14 @@ const styles = StyleSheet.create({
boxSizing: 'border-box',
display: 'flex',
flex: 1,
- padding: `${globalStyles.spacing.navbarMenubarMargin} ${globalStyles.spacing.bookmarksToolbarPadding}`
+ padding: `0 ${globalStyles.spacing.bookmarksToolbarPadding}`,
+ margin: `${globalStyles.spacing.navbarMenubarMargin} 0`
},
bookmarksToolbar__allowDragging: {
WebkitAppRegion: 'drag'
},
bookmarksToolbar__showOnlyFavicon: {
- padding: `${globalStyles.spacing.navbarMenubarMargin} 0 ${globalStyles.spacing.tabPagesHeight} ${globalStyles.spacing.bookmarksToolbarPadding}`
+ padding: `0 0 0 ${globalStyles.spacing.bookmarksToolbarPadding}`
},
bookmarksToolbar__bookmarkButton: {
boxSizing: 'border-box',
diff --git a/app/renderer/components/main/main.js b/app/renderer/components/main/main.js
index 14294044d7d..211510e5954 100644
--- a/app/renderer/components/main/main.js
+++ b/app/renderer/components/main/main.js
@@ -607,7 +607,11 @@ class Main extends React.Component {
?
: null
}
-
@@ -690,18 +694,22 @@ class Main extends React.Component {
?
: null
}
-
- {
- this.props.showTabPages
- ?
- : null
- }
-
+ {
+ this.props.isSinglePage
+ ? null
+ :
+ {
+ this.props.showTabPages
+ ?
+ : null
+ }
+
+ }
{
this.props.showNotificationBar
diff --git a/app/renderer/components/styles/commonStyles.js b/app/renderer/components/styles/commonStyles.js
index 0ffa4b810fa..33cde3f0455 100644
--- a/app/renderer/components/styles/commonStyles.js
+++ b/app/renderer/components/styles/commonStyles.js
@@ -142,6 +142,7 @@ const styles = StyleSheet.create({
// notificationBar
notificationBar: {
+ '-webkit-app-region': 'no-drag',
display: 'inline-block',
boxSizing: 'border-box',
width: '100%',
diff --git a/less/navigationBar.less b/less/navigationBar.less
index 222cf274e4e..2ec09a9246e 100644
--- a/less/navigationBar.less
+++ b/less/navigationBar.less
@@ -359,7 +359,7 @@
// Styles had to be reworked to properly position the new caption buttons for Windows
.navbarCaptionButtonContainer {
display: flex;
- //border-bottom: 1px solid #bbb;
+ margin-bottom: @navbarMenubarMargin;
&.allowDragging {
-webkit-app-region: drag;
diff --git a/less/tabs.less b/less/tabs.less
index 9ebbdf0e37f..c0d429e2f11 100644
--- a/less/tabs.less
+++ b/less/tabs.less
@@ -143,7 +143,7 @@
display: flex;
justify-content: center;
height: @tabPagesHeight;
- padding: @tabPagesHeight 0 @navbarMenubarMargin 0;
+ margin: @navbarMenubarMargin 0 @navbarMenubarMargin 0;
position: relative;
z-index: @zindexTabs;
@@ -154,11 +154,6 @@
}
}
- &.singlePage {
- margin: 0;
- padding: 0;
- }
-
>div {
display: flex
}
diff --git a/less/window.less b/less/window.less
index a55ee98fa55..bd0962014a8 100644
--- a/less/window.less
+++ b/less/window.less
@@ -41,6 +41,9 @@ html,
.top {
background: linear-gradient(to bottom, #eaeaea, #f2f2f4);
+ &.allowDragging {
+ -webkit-app-region: drag;
+ }
}
.mainContainer {