From bad4cc12b4037a67555cef04627812495d153f49 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 25 Jan 2021 17:23:13 +0100 Subject: [PATCH 1/7] Header, Quick Access Navigation now scrollable --- client/components/main/header.styl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/components/main/header.styl b/client/components/main/header.styl index d80938613..77a2dd9e8 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -115,11 +115,11 @@ ul transition: opacity 0.2s margin: 4px 0 0 5px - overflow: hidden + overflow-x: auto + overflow-y: hidden li - display: block - float: left + display: inline width: auto color: darken(white, 15%) padding: 2px 5px 0 @@ -191,7 +191,7 @@ ul width: calc(100% - 60px) - overflow: ellipsis + white-space: nowrap padding: 10px margin: -10px From 54a55a4a2319f44fd64eec08d937864273e13543 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 25 Jan 2021 17:55:35 +0100 Subject: [PATCH 2/7] Header, Home-Button is now at the left of the Quick Access and not scrolled anymore --- client/components/main/header.jade | 8 ++++---- client/components/main/header.styl | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/components/main/header.jade b/client/components/main/header.jade index dc8f4455b..efea6d38b 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -7,11 +7,11 @@ template(name="header") if currentUser #header-quick-access(class=currentBoard.colorClass) if isMiniScreen - ul - li - a(href="{{pathFor 'home'}}") - span.fa.fa-home + span + a(href="{{pathFor 'home'}}") + span.fa.fa-home + ul if currentList each currentBoard.lists li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}") diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 77a2dd9e8..1af5db99d 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -205,9 +205,11 @@ padding: 12px 10px margin: -10px 0px - .fa-home + span + .fa-home font-size: 26px margin-top: -2px + margin-right: 5px #header-new-board-icon display: none From 71483e8b04cb34357b47596d31bc44b194b8976b Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Mon, 25 Jan 2021 23:51:51 +0100 Subject: [PATCH 3/7] Header, Notification doesn't overlap the avatar anymore at mobile view --- client/components/main/header.styl | 1 - 1 file changed, 1 deletion(-) diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 1af5db99d..6651cc225 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -215,7 +215,6 @@ display: none #header-user-bar - position: absolute right: 0px padding: 10px margin: -10px 0 -10px -10px From e6d42f21a2625e9e0ed380835c0345bb4fe05db2 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 26 Jan 2021 17:30:58 +0100 Subject: [PATCH 4/7] Header, improve layout at Quick Access and Notifications on mobile view --- client/components/main/header.styl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 6651cc225..95023288e 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -194,6 +194,7 @@ white-space: nowrap padding: 10px margin: -10px + margin-right: 10px li height: 100% @@ -209,7 +210,7 @@ .fa-home font-size: 26px margin-top: -2px - margin-right: 5px + margin-right: 20px #header-new-board-icon display: none @@ -217,7 +218,7 @@ #header-user-bar right: 0px padding: 10px - margin: -10px 0 -10px -10px + margin: -8px 0 -10px -10px .announcement .viewer display: inline-block From d2d4c19196ee61a36369021585ac5ed9d783de2a Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 26 Jan 2021 21:31:28 +0100 Subject: [PATCH 5/7] Header, Scrollbar now also at desktop version if needed --- client/components/main/header.jade | 8 ++++---- client/components/main/header.styl | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/client/components/main/header.jade b/client/components/main/header.jade index efea6d38b..e44789c64 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -32,11 +32,11 @@ template(name="header") img(src="{{currentSetting.customTopLeftCornerLogoImageUrl}}" height="{{#if currentSetting.customTopLeftCornerLogoHeight}}#{currentSetting.customTopLeftCornerLogoHeight}{{else}}27{{/if}}" width="auto" margin="0" padding="0") unless currentSetting.customTopLeftCornerLogoImageUrl img(src="{{pathFor '/logo-header.png'}}" alt="") + span + a(href="{{pathFor 'home'}}") + span.fa.fa-home + | {{_ 'all-boards'}} ul - li - a(href="{{pathFor 'home'}}") - span.fa.fa-home - | {{_ 'all-boards'}} li.separator - //li // a(href="{{pathFor 'public'}}") diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 95023288e..d26e7e434 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -100,6 +100,7 @@ font-size: 12px display: flex z-index: 21 + padding: 10px 0px #header-user-bar, #header-new-board-icon, @@ -114,9 +115,11 @@ ul transition: opacity 0.2s - margin: 4px 0 0 5px overflow-x: auto overflow-y: hidden + white-space: nowrap + padding: 10px + margin: -10px li display: inline @@ -186,14 +189,10 @@ #header-quick-access transition: background-color 0.4s width: 100% - padding: 10px 0px z-index: 30 ul width: calc(100% - 60px) - white-space: nowrap - padding: 10px - margin: -10px margin-right: 10px li From 282505cde2265b71f9da5c174f623d94e78e2686 Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Wed, 27 Jan 2021 12:17:57 +0100 Subject: [PATCH 6/7] Header, Quick Access, Desktop and Mobile have now the same view --- client/components/main/header.jade | 2 -- client/components/main/header.styl | 11 ++++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/client/components/main/header.jade b/client/components/main/header.jade index e44789c64..7585c3b97 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -37,13 +37,11 @@ template(name="header") span.fa.fa-home | {{_ 'all-boards'}} ul - li.separator - //li // a(href="{{pathFor 'public'}}") // span.fa.fa-globe // | {{_ 'public'}} each currentUser.starredBoards - li.separator - li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") a(href="{{pathFor 'board' id=_id slug=slug}}") = title diff --git a/client/components/main/header.styl b/client/components/main/header.styl index d26e7e434..8e02f8fc1 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -125,7 +125,12 @@ display: inline width: auto color: darken(white, 15%) - padding: 2px 5px 0 + padding: 12px 0px + margin: -10px 0px + + a + padding: 12px 10px + margin: -10px 0px &.current color: darken(white, 5%) @@ -197,13 +202,9 @@ li height: 100% - padding: 12px 0px - margin: -10px 0px a height: 100% - padding: 12px 10px - margin: -10px 0px span .fa-home From 4effccf96e1259cfbb494bfaf7776d2fcd2e6dbf Mon Sep 17 00:00:00 2001 From: Martin Filser Date: Tue, 26 Jan 2021 23:26:14 +0100 Subject: [PATCH 7/7] Header, Quick Access, show boards at mobile view --- client/components/main/header.jade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/components/main/header.jade b/client/components/main/header.jade index 7585c3b97..5eb4995c3 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -17,6 +17,11 @@ template(name="header") li(class="{{#if $.Session.equals 'currentList' _id}}current{{/if}}") a.js-select-list = title + else + each currentUser.starredBoards + li(class="{{#if $.Session.equals 'currentBoard' _id}}current{{/if}}") + a(href="{{pathFor 'board' id=_id slug=slug}}") + = title #header-new-board-icon else //-