From 57119868bbb49f47c7d0b51b9952df9bd83d46f5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 14 Sep 2019 05:55:32 +0300 Subject: Revert drag handle changes. Thanks to Keelan ! Related #2704 --- client/components/boards/boardBody.js | 2 +- client/components/cards/minicard.jade | 4 ++-- client/components/cards/minicard.styl | 2 +- client/components/lists/list.js | 8 +++++--- client/components/lists/list.styl | 22 +++++----------------- client/components/lists/listHeader.jade | 3 --- client/components/swimlanes/swimlaneHeader.jade | 1 - client/components/swimlanes/swimlanes.js | 5 ++--- client/components/swimlanes/swimlanes.styl | 8 -------- 9 files changed, 16 insertions(+), 39 deletions(-) (limited to 'client/components') diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 713b6cbc..07cd306a 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -89,7 +89,7 @@ BlazeComponent.extendComponent({ helper.append(list.clone()); return helper; }, - handle: '.js-swimlane-header-handle', + handle: '.js-swimlane-header', items: '.swimlane:not(.placeholder)', placeholder: 'swimlane placeholder', distance: 7, diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 4c166c5c..3806ce41 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -3,8 +3,6 @@ template(name="minicard") class="{{#if isLinkedCard}}linked-card{{/if}}" class="{{#if isLinkedBoard}}linked-board{{/if}}" class="minicard-{{colorClass}}") - .handle - .fa.fa-arrows if cover .minicard-cover(style="background-image: url('{{cover.url}}');") if labels @@ -17,6 +15,8 @@ template(name="minicard") if hiddenMinicardLabelText .minicard-label(class="card-label-{{color}}" title="{{name}}") .minicard-title + .handle + .fa.fa-arrows if $eq 'prefix-with-full-path' currentBoard.presentParentTask .parent-prefix | {{ parentString ' > ' }} diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 9997fd5f..c4172572 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -105,7 +105,7 @@ right: 5px; top: 5px; display:none; - @media only screen { + @media only screen and (max-width: 1199px) { display:block; } .fa-arrows diff --git a/client/components/lists/list.js b/client/components/lists/list.js index 650d1295..c2b39be9 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -31,9 +31,11 @@ BlazeComponent.extendComponent({ const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)'; const $cards = this.$('.js-minicards'); - $('.js-minicards').sortable({ - handle: '.handle', - }); + if (window.matchMedia('(max-width: 1199px)').matches) { + $('.js-minicards').sortable({ + handle: '.handle', + }); + } $cards.sortable({ connectWith: '.js-minicards:not(.js-list-full)', diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index 459481ea..81938c1a 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -84,16 +84,17 @@ padding-left: 10px color: #a6a6a6 + .list-header-menu position: absolute padding: 27px 19px margin-top: 1px top: -7px - right: 3px + right: -7px .list-header-plus-icon color: #a6a6a6 - margin-right: 15px + margin-right: 10px .highlight color: #ce1414 @@ -164,12 +165,7 @@ @media screen and (max-width: 800px) .list-header-menu - position: absolute - padding: 27px 19px - margin-top: 1px - top: -7px - margin-right: 50px - right: -3px + margin-right: 30px .mini-list flex: 0 0 60px @@ -225,17 +221,9 @@ padding: 7px top: 50% transform: translateY(-50%) - margin-right: 27px + right: 17px font-size: 20px - .list-header-menu-handle - position: absolute - padding: 7px - top: 50% - transform: translateY(-50%) - right: 10px - font-size: 24px - .link-board-wrapper display: flex align-items: baseline diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index bbb94445..f930e57a 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -29,10 +29,8 @@ template(name="listHeader") if canSeeAddCard a.js-add-card.fa.fa-plus.list-header-plus-icon a.fa.fa-navicon.js-open-list-menu - a.list-header-menu-handle.handle.fa.fa-arrows.js-list-handle else a.list-header-menu-icon.fa.fa-angle-right.js-select-list - a.list-header-menu-handle.handle.fa.fa-arrows.js-list-handle else if currentUser.isBoardMember if isWatching i.list-header-watch-icon.fa.fa-eye @@ -41,7 +39,6 @@ template(name="listHeader") if canSeeAddCard a.js-add-card.fa.fa-plus.list-header-plus-icon a.fa.fa-navicon.js-open-list-menu - a.list-header-menu-handle.handle.fa.fa-arrows.js-list-handle template(name="editListTitleForm") .list-composer diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade index e50b3a3f..8c6aa5a3 100644 --- a/client/components/swimlanes/swimlaneHeader.jade +++ b/client/components/swimlanes/swimlaneHeader.jade @@ -16,7 +16,6 @@ template(name="swimlaneFixedHeader") unless currentUser.isCommentOnly a.fa.fa-plus.js-open-add-swimlane-menu.swimlane-header-plus-icon a.fa.fa-navicon.js-open-swimlane-menu - a.swimlane-header-menu-handle.handle.fa.fa-arrows.js-swimlane-header-handle template(name="editSwimlaneTitleForm") .list-composer diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 81780a71..e0857003 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -56,7 +56,7 @@ function initSortable(boardComponent, $listsDom) { $listsDom.sortable({ tolerance: 'pointer', helper: 'clone', - handle: '.js-list-handle', + handle: '.js-list-header', items: '.js-list:not(.js-list-composer)', placeholder: 'list placeholder', distance: 7, @@ -156,8 +156,7 @@ BlazeComponent.extendComponent({ 'input', 'textarea', 'p', - '.js-list-handle', - '.js-swimlane-header-handle', + '.js-list-header', ]; if ( $(evt.target).closest(noDragInside.join(',')).length === 0 && diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index 503091ee..1056e1e3 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -50,14 +50,6 @@ margin-left: 5px margin-right: 10px - .swimlane-header-menu-handle - position: absolute - padding: 7px - top: 50% - transform: translateY(-50%) - left: 300px - font-size: 18px - .list-group height: 100% -- cgit v1.2.3-1-g7c22