From 29c6b3d0c6f252089103da5856d46c4de83e50b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 3 Oct 2017 18:41:37 +0200 Subject: [PATCH 01/14] Frontend: Update app menu to fit new NC13 flex layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/nc11.scss | 15 +++++++++++++++ css/style.scss | 34 ++++++++++++---------------------- templates/part.navigation.php | 12 +++++++++--- 3 files changed, 36 insertions(+), 25 deletions(-) create mode 100644 css/nc11.scss diff --git a/css/nc11.scss b/css/nc11.scss new file mode 100644 index 000000000..78fe2a017 --- /dev/null +++ b/css/nc11.scss @@ -0,0 +1,15 @@ +// maybe keep those just for nc11/12 support? +.app-navigation-entry-utils { + .app-navigation-entry-utils-menu-button { + display: block !important; // TODO: is this needed? + } + + .app-navigation-entry-utils-menu-share { + display: flex !important; + padding: 14px; + opacity: 0.5; + } +} +.app-navigation-entry-menu ul { + flex-direction: row; +} \ No newline at end of file diff --git a/css/style.scss b/css/style.scss index 0c9dcaeda..86bc9346d 100644 --- a/css/style.scss +++ b/css/style.scss @@ -82,17 +82,7 @@ input.input-inline { } #app-navigation { - .app-navigation-entry-edit { - height: auto; - - .colorselect div{ - height: 32px; - } - form { - display: flex; - } - } - + /** menu */ .board-bullet { position: absolute; margin-left: 17px; @@ -103,21 +93,21 @@ input.input-inline { border-radius: 50%; cursor: pointer; } + .app-navigation-entry-utils-menu-share i { + height: 100%; + width: 100%; + } + .app-navigation-entry-edit { + height: auto; - .app-navigation-entry-utils { - .app-navigation-entry-utils-menu-button { - display: block !important; // TODO: is this needed? + .colorselect div{ + height: 32px; } - - .app-navigation-entry-utils-menu-share { - display: flex !important; - padding: 14px; - opacity: 0.5; + form { + display: flex; } } - .app-navigation-entry-menu ul { - flex-direction: row; - } + } /** diff --git a/templates/part.navigation.php b/templates/part.navigation.php index 46615fff5..cc2ad7468 100644 --- a/templates/part.navigation.php +++ b/templates/part.navigation.php @@ -5,9 +5,10 @@
  • t('Shared boards')); ?>
  • + {{ b.title }} -
    +
    • t('Shared with you')); ?>
      • @@ -15,10 +16,15 @@
      -
      • -
      • +
    • + +
      • +
    • + +
    +
    From 8dd3b4a2785038023190484d82dc6097f4838ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 25 Oct 2017 12:37:12 +0200 Subject: [PATCH 02/14] Navigation: make editing work again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/style.scss | 9 +++++++-- templates/part.navigation.php | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/css/style.scss b/css/style.scss index 86bc9346d..b18977a6d 100644 --- a/css/style.scss +++ b/css/style.scss @@ -97,9 +97,14 @@ input.input-inline { height: 100%; width: 100%; } - .app-navigation-entry-edit { - height: auto; + li { + transition: height 250ms ease-in-out, opacity 250ms ease-in-out, z-index 250ms ease-in-out; + } + .editing { + height: 82px; + } + .app-navigation-entry-edit { .colorselect div{ height: 32px; } diff --git a/templates/part.navigation.php b/templates/part.navigation.php index cc2ad7468..8eef2b7f2 100644 --- a/templates/part.navigation.php +++ b/templates/part.navigation.php @@ -4,11 +4,11 @@
  • t('Archived boards')); ?>
  • t('Shared boards')); ?>
    • -
  • +
  • - - {{ b.title }} -
    + + {{ b.title }} +
    • t('Shared with you')); ?>
      • @@ -25,7 +25,7 @@
    -
    +
    From f2b4f0585edf8ff46f0f7090e0078d0443d20878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 26 Oct 2017 11:19:00 +0200 Subject: [PATCH 03/14] Refactor boardlist loading process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- js/controller/ListController.js | 103 ++++++++++++++++++++------------ js/service/StatusService.js | 8 ++- templates/part.boardlist.php | 7 ++- 3 files changed, 77 insertions(+), 41 deletions(-) diff --git a/js/controller/ListController.js b/js/controller/ListController.js index e9ffe5f43..de026b5a9 100644 --- a/js/controller/ListController.js +++ b/js/controller/ListController.js @@ -22,7 +22,8 @@ /* global app angular */ -app.controller('ListController', function ($scope, $location, $filter, BoardService, $element, $timeout, $stateParams, $state) { +app.controller('ListController', function ($scope, $location, $filter, BoardService, $element, $timeout, $stateParams, $state, StatusService) { + function calculateNewColor() { var boards = BoardService.getAll(); var boardKeys = Object.keys(boards); @@ -53,44 +54,67 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ }; $scope.colors = ['0082c9', '00c9c6','00c906', 'c92b00', 'F1DB50', '7C31CC', '3A3B3D', 'CACBCD']; $scope.boardservice = BoardService; - $scope.newBoard.color = calculateNewColor(); $scope.updatingBoard = null; - // FIXME: not nice, but we want to load this only once - if($element.attr('id') === 'app-navigation') { - BoardService.fetchAll().then(function(data) { - $scope.filterData(); - }, function (error) { - // TODO: show error when loading fails - }); - } - $scope.filterData = function () { - angular.copy($scope.boardservice.getData(), $scope.boardservice.sorted); - angular.copy($scope.boardservice.sorted, $scope.boardservice.sidebar); - $scope.boardservice.sidebar = $filter('orderBy')($scope.boardservice.sidebar, 'title'); - $scope.boardservice.sidebar = $filter('cardFilter')($scope.boardservice.sidebar, {archived: false}); - - if ($scope.status.filter === 'archived') { - var filter = {}; - filter[$scope.status.filter] = true; - $scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, filter); - } else if ($scope.status.filter === 'shared') { - $scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false}); - $scope.boardservice.sorted = $filter('boardFilterAcl')($scope.boardservice.sorted); + var finishedLoading = function() { + filterData(); + $scope.newBoard.color = calculateNewColor(); + }; + + var filterData = function () { + if($element.attr('id') === 'app-navigation') { + $scope.boardservice.sidebar = $scope.boardservice.getData(); + $scope.boardservice.sidebar = $filter('orderBy')($scope.boardservice.sidebar, 'title'); + $scope.boardservice.sidebar = $filter('cardFilter')($scope.boardservice.sidebar, {archived: false}); } else { - $scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false}); + $scope.boardservice.sorted = $scope.boardservice.getData(); + if ($scope.status.filter === 'archived') { + var filter = {}; + filter[$scope.status.filter] = true; + $scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, filter); + } else if ($scope.status.filter === 'shared') { + $scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false}); + $scope.boardservice.sorted = $filter('boardFilterAcl')($scope.boardservice.sorted); + } else { + $scope.boardservice.sorted = $filter('cardFilter')($scope.boardservice.sorted, {archived: false}); + } + $scope.boardservice.sorted = $filter('orderBy')($scope.boardservice.sorted, ['deletedAt', 'title']); } - $scope.boardservice.sorted = $filter('orderBy')($scope.boardservice.sorted, ['deletedAt', 'title']); }; - $scope.$watchCollection(function(){ - return $state.params; - }, function(){ - $scope.status.filter = $state.params.filter; - $scope.filterData(); - }); - + var initialize = function () { + $scope.statusservice = StatusService.listStatus; + + if($element.attr('id') === 'app-navigation') { + $scope.statusservice.retainWaiting(); + BoardService.fetchAll().then(function(data) { + finishedLoading(); + $scope.statusservice.releaseWaiting(); + BoardService.loaded = true; + }, function (error) { + $scope.statusservice.setError('Error occured', error); + }); + } else { + /* Watch for data change of boardservice when boards are fetched */ + var boardDataWatch = $scope.$watch(function () { + return $scope.boardservice.data; + }, function () { + if (BoardService.loaded === true) { + boardDataWatch(); + finishedLoading(); + } + }, true); + } + /* Watch for board filter change */ + $scope.$watchCollection(function(){ + return $state.params; + }, function(){ + $scope.status.filter = $state.params.filter; + filterData(); + }); + }; + initialize(); $scope.selectColor = function(color) { $scope.newBoard.color = color; @@ -113,7 +137,7 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ $scope.newBoard = {}; $scope.newBoard.color = calculateNewColor(); $scope.status.addBoard=false; - $scope.filterData(); + filterData(); }, function(error) { $scope.status.createBoard = 'Unable to insert board: ' + error.message; }); @@ -121,8 +145,8 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ $scope.boardUpdate = function(board) { BoardService.update(board).then(function(data) { - $scope.filterData(); board.status.edit = false; + filterData(); }); }; @@ -133,33 +157,34 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ $scope.boardUpdateReset = function(board) { board.title = $scope.updatingBoard.title; board.color = $scope.updatingBoard.color; - $scope.filterData(); + console.log(board); + filterData(); board.status.edit = false; }; $scope.boardArchive = function (board) { board.archived = true; BoardService.update(board).then(function(data) { - $scope.filterData(); + filterData(); }); }; $scope.boardUnarchive = function (board) { board.archived = false; BoardService.update(board).then(function(data) { - $scope.filterData(); + filterData(); }); }; $scope.boardDelete = function(board) { BoardService.delete(board.id).then(function (data) { - $scope.filterData(); + filterData(); }); }; $scope.boardDeleteUndo = function (board) { BoardService.deleteUndo(board.id).then(function (data) { - $scope.filterData(); + filterData(); }); }; diff --git a/js/service/StatusService.js b/js/service/StatusService.js index 4ccc3691e..c4ad30872 100644 --- a/js/service/StatusService.js +++ b/js/service/StatusService.js @@ -48,7 +48,11 @@ app.factory('StatusService', function () { StatusService.prototype.releaseWaiting = function () { if (this.counter > 0) +<<<<<<< HEAD {this.counter--;} +======= + this.counter--; +>>>>>>> Refactor boardlist loading process if (this.counter <= 0) { this.active = false; this.counter = 0; @@ -70,7 +74,9 @@ app.factory('StatusService', function () { return { getInstance: function () { return new StatusService(); - } + }, + /* Shared StatusService instance between both ListController instances */ + listStatus: new StatusService() }; }); diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php index f33748fa8..ec0e6db56 100644 --- a/templates/part.boardlist.php +++ b/templates/part.boardlist.php @@ -1,10 +1,15 @@ +
    +
    +
    t('Status')); ?>
    +

    {{ statusservice.title }}

    +

    {{ statusservice.text }}

    +
    From 7f1ea3bfcc9e2b818e9e1e8b991cbc904a2fe6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 26 Oct 2017 11:19:46 +0200 Subject: [PATCH 04/14] Performance optimizations in list template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- templates/part.boardlist.php | 11 +++++------ templates/part.navigation.php | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php index ec0e6db56..23c7ad224 100644 --- a/templates/part.boardlist.php +++ b/templates/part.boardlist.php @@ -26,16 +26,15 @@ -
    +
    {{ b.title }}
    - +
    -

    +

    @@ -101,9 +100,9 @@ class="ng-pristine ng-valid" ng-submit="boardCreate()"> + autofocus-on-insert ng-model="newBoard.title" maxlength="100" ng-model-options="{ debounce: 250 }">
    -
    diff --git a/templates/part.navigation.php b/templates/part.navigation.php index 8eef2b7f2..4b78d27d1 100644 --- a/templates/part.navigation.php +++ b/templates/part.navigation.php @@ -4,9 +4,9 @@
  • t('Archived boards')); ?>
  • t('Shared boards')); ?>
    • -
  • +
  • - + {{ b.title }}
      @@ -14,10 +14,10 @@
    -
    +
    • - +
    • @@ -27,27 +27,27 @@
      - +
      -
      +
      • -
    • - +
    • + t('Create a new board')); ?>
      - + -
      -

      -
      +
      +

      +
      • From 812eedb801a282137872e966b198404cfa0c959b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 26 Oct 2017 11:25:09 +0200 Subject: [PATCH 05/14] Fix board updating reset MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- js/controller/ListController.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/js/controller/ListController.js b/js/controller/ListController.js index de026b5a9..419572ce4 100644 --- a/js/controller/ListController.js +++ b/js/controller/ListController.js @@ -56,12 +56,6 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ $scope.boardservice = BoardService; $scope.updatingBoard = null; - - var finishedLoading = function() { - filterData(); - $scope.newBoard.color = calculateNewColor(); - }; - var filterData = function () { if($element.attr('id') === 'app-navigation') { $scope.boardservice.sidebar = $scope.boardservice.getData(); @@ -83,6 +77,11 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ } }; + var finishedLoading = function() { + filterData(); + $scope.newBoard.color = calculateNewColor(); + }; + var initialize = function () { $scope.statusservice = StatusService.listStatus; @@ -151,13 +150,12 @@ app.controller('ListController', function ($scope, $location, $filter, BoardServ }; $scope.boardUpdateBegin = function(board) { - $scope.updatingBoard = board; + $scope.updatingBoard = angular.copy(board); }; $scope.boardUpdateReset = function(board) { board.title = $scope.updatingBoard.title; board.color = $scope.updatingBoard.color; - console.log(board); filterData(); board.status.edit = false; }; From 38febfaa1c1159c584fedc53705ff81058cceafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Nov 2017 20:28:57 +0100 Subject: [PATCH 06/14] Fix menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/style.scss | 9 ++++----- templates/part.navigation.php | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/css/style.scss b/css/style.scss index b18977a6d..0c2a43ba8 100644 --- a/css/style.scss +++ b/css/style.scss @@ -75,11 +75,6 @@ input.input-inline { /** * Navigation sidebar */ -.app-navigation-entry-menu { - ul { - flex-direction: row; - } -} #app-navigation { /** menu */ @@ -103,6 +98,10 @@ input.input-inline { } .editing { height: 82px; + + .icon-add { + background-position: 14px 14px; + } } .app-navigation-entry-edit { .colorselect div{ diff --git a/templates/part.navigation.php b/templates/part.navigation.php index 4b78d27d1..9e207d0c7 100644 --- a/templates/part.navigation.php +++ b/templates/part.navigation.php @@ -10,17 +10,25 @@ {{ b.title }}
        -
      • t('Shared with you')); ?>
      -
      +
      From 2cbeea03d096bce0ccb5aaf4160bd42b0aa8fcd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Nov 2017 20:57:54 +0100 Subject: [PATCH 07/14] Move variables to legacy scss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/legacy.scss | 15 ++++++++++++++- css/style.scss | 13 ------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/css/legacy.scss b/css/legacy.scss index e99022075..9206113f1 100644 --- a/css/legacy.scss +++ b/css/legacy.scss @@ -20,5 +20,18 @@ * */ -@import '../../../core/css/variables.scss'; + +/** + * Variables + */ +$color-main-background: #fff; +$color-primary-text: #fff; +$color-error: #e9322d; +$color-warning: #fbd850; +$color-warning-light: nc-lighten($color-warning, 15%); +$color-success: #46ba61; +$color-lightgrey: nc-darken($color-main-background, 4%); +$color-grey: nc-darken($color-main-background, 7%); +$color-darkgrey: nc-darken($color-main-background, 32%); + @import 'style.scss'; diff --git a/css/style.scss b/css/style.scss index 0c2a43ba8..5a02b7192 100644 --- a/css/style.scss +++ b/css/style.scss @@ -22,19 +22,6 @@ * */ -/** - * Variables - */ -$color-main-background: #fff; -$color-primary-text: #fff; -$color-error: #e9322d; -$color-warning: #fbd850; -$color-warning-light: nc-lighten($color-warning, 15%); -$color-success: #46ba61; -$color-lightgrey: nc-darken($color-main-background, 4%); -$color-grey: nc-darken($color-main-background, 7%); -$color-darkgrey: nc-darken($color-main-background, 32%); - /** * General styles */ From dcc12140d35ea0f0daa17e88d311bf6ef6a66b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Nov 2017 20:59:19 +0100 Subject: [PATCH 08/14] Add fix for nc<13 app menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/comp-appnav.scss | 45 ++++++++++++++++++++++++++++++++++++++++++++ css/nc11.scss | 15 --------------- css/style.scss | 2 ++ 3 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 css/comp-appnav.scss delete mode 100644 css/nc11.scss diff --git a/css/comp-appnav.scss b/css/comp-appnav.scss new file mode 100644 index 000000000..49b0b2543 --- /dev/null +++ b/css/comp-appnav.scss @@ -0,0 +1,45 @@ +/* + * @copyright Copyright (c) 2017 Julius Härtl + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +/** + * Hotfix for support Date: Wed, 8 Nov 2017 21:05:19 +0100 Subject: [PATCH 09/14] CSS: Move icons to separate file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/icons.scss | 42 ++++++++++++++++++++++++++++++++++++++++++ css/style.scss | 45 ++------------------------------------------- 2 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 css/icons.scss diff --git a/css/icons.scss b/css/icons.scss new file mode 100644 index 000000000..efa315e08 --- /dev/null +++ b/css/icons.scss @@ -0,0 +1,42 @@ +/** + * Custom icons + */ +.icon-deck { + background-image: url('../img/deck-dark.svg'); +} + +.icon-group { + background-image: url('../../../settings/img/users.svg'); +} + +.icon-help { + background-image: url('../../../settings/img/help.svg'); +} + +.icon-add-white { + background-image: url('../img/add-white.svg'); +} + +.icon-archive { + background-image: url('../img/archive.svg'); +} + +.icon-archive-white { + background-image: url('../img/archive-white.svg'); +} + +.icon-details { + background-image: url('../img/details.svg'); +} + +.icon-details-white { + background-image: url('../img/details-white.svg'); +} + +.icon-home { + background-image: url('../../../core/img/places/home.svg'); +} + +.icon-badge { + background-image: url('../../../core/img/places/calendar-dark.svg'); +} \ No newline at end of file diff --git a/css/style.scss b/css/style.scss index dd2632d03..0cd713019 100644 --- a/css/style.scss +++ b/css/style.scss @@ -1147,48 +1147,6 @@ input.input-inline { } } -/** - * Custom icons - */ -.icon-deck { - background-image: url('../img/deck-dark.svg'); -} - -.icon-group { - background-image: url('../../../settings/img/users.svg'); -} - -.icon-help { - background-image: url('../../../settings/img/help.svg'); -} - -.icon-add-white { - background-image: url('../img/add-white.svg'); -} - -.icon-archive { - background-image: url('../img/archive.svg'); -} - -.icon-archive-white { - background-image: url('../img/archive-white.svg'); -} - -.icon-details { - background-image: url('../img/details.svg'); -} - -.icon-details-white { - background-image: url('../img/details-white.svg'); -} - -.icon-home { - background-image: url('../../../core/img/places/home.svg'); -} - -.icon-badge { - background-image: url('../../../core/img/places/calendar-dark.svg'); -} /** * Hotfix for https://github.com/angular-ui/ui-select/issues/1652 @@ -1197,4 +1155,5 @@ input.input-inline { opacity: 1 !important; } -@import 'comp-appnav.scss'; \ No newline at end of file +@import 'comp-appnav.scss'; +@import 'icons.scss'; \ No newline at end of file From 4e1fbcb8d14c157af7af8e2586c48c2b58d9f5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Nov 2017 21:19:55 +0100 Subject: [PATCH 10/14] CSS: restore variables that are not part of the server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/style.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/css/style.scss b/css/style.scss index 0cd713019..500c32aa6 100644 --- a/css/style.scss +++ b/css/style.scss @@ -22,6 +22,11 @@ * */ +$color-warning-light: nc-lighten($color-warning, 15%); +$color-lightgrey: nc-darken($color-main-background, 4%); +$color-grey: nc-darken($color-main-background, 7%); +$color-darkgrey: nc-darken($color-main-background, 32%); + /** * General styles */ From a7a960b936377677400d0e401a54b98cc9146450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 8 Nov 2017 21:48:37 +0100 Subject: [PATCH 11/14] Fix popovermenus on 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/style.scss | 7 +------ js/directive/appPopoverMenuUtils.js | 7 ------- templates/part.boardlist.php | 5 +++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/css/style.scss b/css/style.scss index 500c32aa6..7b18067d2 100644 --- a/css/style.scss +++ b/css/style.scss @@ -496,8 +496,6 @@ input.input-inline { z-index: 999; opacity: 1; display: block; - margin-top: 25px; - margin-right: 0px; &.hidden { display: none; @@ -834,6 +832,7 @@ input.input-inline { button { opacity: 0.5; + padding: 22px; } &:hover button { @@ -852,10 +851,6 @@ input.input-inline { opacity: 0.5; } - .popovermenu { - margin-top: 5px; - } - .board-edit-controls { display: flex; } diff --git a/js/directive/appPopoverMenuUtils.js b/js/directive/appPopoverMenuUtils.js index 2f47063a5..d466bd1d5 100644 --- a/js/directive/appPopoverMenuUtils.js +++ b/js/directive/appPopoverMenuUtils.js @@ -28,13 +28,7 @@ app.directive('appPopoverMenuUtils', function () { var menu = elm.find('.popovermenu'); var button = elm.find('button'); button.click(function (e) { - $('.popovermenu').addClass('hidden'); menu.toggleClass('hidden'); - if(!menu.hasClass('hidden')) { - button.css('display','block'); - } else { - button.css('display',''); - } e.stopPropagation(); }); scope.$on('documentClicked', function (scope, event) { @@ -42,7 +36,6 @@ app.directive('appPopoverMenuUtils', function () { if (event.target !== button && !$(event.target).hasClass('no-close')) { menu.addClass('hidden'); } - button.css('display',''); }); } }; diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php index 23c7ad224..0a373449b 100644 --- a/templates/part.boardlist.php +++ b/templates/part.boardlist.php @@ -46,9 +46,10 @@
      -
      - +