diff --git a/app/shell-window/ui/navbar.js b/app/shell-window/ui/navbar.js index 5489a99488..fb4ae26a79 100644 --- a/app/shell-window/ui/navbar.js +++ b/app/shell-window/ui/navbar.js @@ -410,10 +410,10 @@ function render (id, page) { ${inpageFinder} ${zoomBtn} ${!isLocationHighlighted ? [ + datBtns, syncfolderMenuNavbarBtn.render(), liveReloadBtn, donateBtn, - datBtns, page ? page.datsiteMenuNavbarBtn.render() : undefined, pageMenuNavbarBtn.render(), bookmarkMenuNavbarBtn.render() diff --git a/app/shell-window/ui/navbar/syncfolder-menu.js b/app/shell-window/ui/navbar/syncfolder-menu.js index 6492531bc0..a85dbf5254 100644 --- a/app/shell-window/ui/navbar/syncfolder-menu.js +++ b/app/shell-window/ui/navbar/syncfolder-menu.js @@ -34,7 +34,7 @@ export class SyncfolderMenuNavbarBtn { // render btn return yo`
- diff --git a/app/stylesheets/shell-window/toolbar-dropdown.less b/app/stylesheets/shell-window/toolbar-dropdown.less index 8320de80a8..82a653cca6 100644 --- a/app/stylesheets/shell-window/toolbar-dropdown.less +++ b/app/stylesheets/shell-window/toolbar-dropdown.less @@ -115,27 +115,8 @@ } } -.syncfolder-dropdown-menu { - margin-right: 4px; - - .btn { - height: 20px; - line-height: 20px; - font-size: 12.5px; - padding: 0 6px; - background: @lime; - color: rgba(0,0,0,0.5); - border-color: #fff; - - &:hover, - &.pressed { - background: darken(@lime, 10%); - } - - &.preview { - background: #E3F2FD; - } - } +.toolbar-input-group .syncfolder-dropdown-menu { + margin-left: 2px; .toolbar-dropdown { margin: 0; diff --git a/app/stylesheets/shell-window/toolbar-input-group.less b/app/stylesheets/shell-window/toolbar-input-group.less index 246297687b..451806df91 100644 --- a/app/stylesheets/shell-window/toolbar-input-group.less +++ b/app/stylesheets/shell-window/toolbar-input-group.less @@ -55,6 +55,11 @@ background: @background-button--active; margin: 2px; border-radius: 2px; + line-height: 1.2; + + &.light { + background: #fff; + } &:hover { background: @background-button--gray;