From 5192f4a3264a3f6772a97e055089606896182406 Mon Sep 17 00:00:00 2001 From: deniszulic Date: Mon, 1 May 2023 01:08:45 +0200 Subject: [PATCH 1/2] xmark added --- client/components/sidebar/sidebar.css | 7 +++++++ client/components/sidebar/sidebar.jade | 1 + client/components/sidebar/sidebar.js | 11 +++++++++++ 3 files changed, 19 insertions(+) diff --git a/client/components/sidebar/sidebar.css b/client/components/sidebar/sidebar.css index c25e9bbac..4d0488b95 100644 --- a/client/components/sidebar/sidebar.css +++ b/client/components/sidebar/sidebar.css @@ -14,6 +14,12 @@ box-shadow: -10px 0px 5px -10px #b3b3b3; z-index: 10; } +.sidebar-xmark { + position: absolute; + right: 10px; + top: 5px; + font-size: 25px; +} .sidebar .sidebar-content { padding: 12px; margin-bottom: 1.6em; @@ -24,6 +30,7 @@ left: 0; overflow-x: hidden; overflow-y: auto; + width: 90%; } .sidebar .sidebar-content .hide-btn { display: none; diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index fcc9a5f66..e99356aa9 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -5,6 +5,7 @@ template(name="sidebar") // title="{{showTongueTitle}}") // i.fa.fa-navicon .sidebar-shadow + a.sidebar-xmark.js-close-sidebar ✕ .sidebar-content.js-board-sidebar-content //a.hide-btn.js-hide-sidebar // i.fa.fa-navicon diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index ad18303e1..6bb4e5290 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -42,6 +42,14 @@ BlazeComponent.extendComponent({ } }, + close() { + if (this._isOpen.get()) { + this._isOpen.set(false); + EscapeActions.executeUpTo('detailsPane'); + this.toggle() + } + }, + hide() { if (this._isOpen.get()) { this._isOpen.set(false); @@ -125,6 +133,9 @@ BlazeComponent.extendComponent({ 'click .js-shortcuts'() { FlowRouter.go('shortcuts'); }, + 'click .js-close-sidebar'() { + Sidebar.toggle() + }, }, ]; }, From e127c33bae31709f863f0675c8ca9137359980d3 Mon Sep 17 00:00:00 2001 From: deniszulic Date: Mon, 1 May 2023 01:18:19 +0200 Subject: [PATCH 2/2] junk removed --- client/components/sidebar/sidebar.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 6bb4e5290..e49e2eda5 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -42,14 +42,6 @@ BlazeComponent.extendComponent({ } }, - close() { - if (this._isOpen.get()) { - this._isOpen.set(false); - EscapeActions.executeUpTo('detailsPane'); - this.toggle() - } - }, - hide() { if (this._isOpen.get()) { this._isOpen.set(false);