diff --git a/app/components/commander/index.hbs b/app/components/commander/index.hbs index 533590e6f7edf0101b62323ee27ce90f3deeebce..c64291d6bd3200b2144b6feffb1274e756feacea 100644 --- a/app/components/commander/index.hbs +++ b/app/components/commander/index.hbs @@ -1,4 +1,4 @@ -<div class="panel commander col"> +<div class="panel commander col m-2 p-2"> <div class="d-flex justify-content-between"> <Commander::ActionButtons @openNewFolderModal={{this.openNewFolderModal}} /> diff --git a/app/components/nav/topbar.hbs b/app/components/nav/topbar.hbs index 68e41dcab345fd154f0d60678223b2564d88186d..c93ba5141669bbca63bd44c92d07fd86b15c24c6 100644 --- a/app/components/nav/topbar.hbs +++ b/app/components/nav/topbar.hbs @@ -1,11 +1,11 @@ -<nav class="navbar navbar-expand-lg navbar-light bg-light"> +<nav class="navbar navbar-expand-lg nav-topbar"> <div class="container-fluid"> <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button> <div class="collapse navbar-collapse justify-content-between" id="navbarSupportedContent" > <form class="d-flex"> - <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"> + <input class="form-control me-2" type="search" placeholder="Search for documents, tags..." aria-label="Search"> <button class="btn btn-outline-success" type="submit">Search</button> </form> {{#if this.session.isAuthenticated}} diff --git a/app/styles/app.scss b/app/styles/app.scss index f0a523ab5999c5bdef12e8997fce696d72a50c39..2b510b0892670f2ea94e51a64f43538531a6860f 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -3,6 +3,7 @@ @import "./button"; @import "./node"; @import "./nav/sidebar"; +@import "./nav/topbar"; main { @@ -25,3 +26,11 @@ main { margin: 1rem; } +.central-bar { + background-color: #f8f9fa; +} + + +.commander { + background-color: white; +} diff --git a/app/styles/nav/topbar.scss b/app/styles/nav/topbar.scss new file mode 100644 index 0000000000000000000000000000000000000000..8e5c8cd53dbf76b3648fe76710e9e6a5894bf2ae --- /dev/null +++ b/app/styles/nav/topbar.scss @@ -0,0 +1,8 @@ +.nav-topbar { + background-color: white; + + input { + background-color: #f8f9fa; + border: none; + } +} diff --git a/app/templates/authenticated.hbs b/app/templates/authenticated.hbs index b0446718440beed7eacb8f7eee30907594c8f1b8..e125124f2f65c9da384d616311cb9d5d32ecd8e6 100644 --- a/app/templates/authenticated.hbs +++ b/app/templates/authenticated.hbs @@ -1,8 +1,8 @@ <main> <Nav::Sidebar /> - <div class="w-100"> + <div class="w-100 central-bar"> <Nav::Topbar /> - <div class="container-fluid p-3"> + <div class="container-fluid mx-2 my-1"> {{outlet}} </div> </div> diff --git a/app/templates/authenticated/nodes.hbs b/app/templates/authenticated/nodes.hbs index 171f6ec5caf6fdc53ab4bef8e6811d8b7c39e241..81f376e2144501bc50ebf7e5042d7dee319bc539 100644 --- a/app/templates/authenticated/nodes.hbs +++ b/app/templates/authenticated/nodes.hbs @@ -12,6 +12,6 @@ @extranode={{this.mainnode}} @onPanelToggle={{this.onPanelToggle}} @dualPanelMode={{this.dualpanel_mode}} - @hint="right" /> + @hint="right" /> {{/if}} </div>