ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Frontend: Update app menu to fit new NC13 flex layout

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2017-10-03 18:41:37 +02:00
committed by Julius Härtl
parent c519e1b841
commit 91261f2e4e
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
css/nc11.scss Normal file
View File

@@ -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;
}

40
css/style.scss
View File

@@ -82,6 +82,21 @@ input.input-inline {
}
#app-navigation {
/** menu */
.board-bullet {
position: absolute;
margin-left: 17px;
margin-top: 16px;
width: 12px;
height: 12px;
border: none;
border-radius: 50%;
cursor: pointer;
}
.app-navigation-entry-utils-menu-share i {
height: 100%;
width: 100%;
}
.app-navigation-entry-edit {
height: auto;
@@ -93,31 +108,6 @@ input.input-inline {
}
}
.board-bullet {
position: absolute;
margin-left: 17px;
margin-top: 16px;
width: 12px;
height: 12px;
border: none;
border-radius: 50%;
cursor: pointer;
}
.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;
}
}
/**

12
templates/part.navigation.php
View File

@@ -5,9 +5,10 @@
<li ng-class="{active: status.filter === 'shared'}"><a ui-sref="list({ filter: 'shared' })" class="icon-share"><?php p($l->t('Shared boards')); ?></a></li>
<li class="with-icon with-menu" ng-class="{active: b.id === boardservice.getCurrent().id}" data-ng-repeat="b in boardservice.sidebar" ng-if="b.deletedAt == 0">
<span class="board-bullet" ng-style="{'background-color':'#{{b.color}}'}" ng-if="!b.status.edit"> </span>
<a href="#!/board/{{b.id}}/" ng-if="!b.status.edit">{{ b.title }}</a>
<div class="app-navigation-entry-utils" ng-show="!b.status.edit" style="position:absolute;">
<div class="app-navigation-entry-utils" ng-show="!b.status.edit">
<ul>
<li class="app-navigation-entry-utils-menu-share svg" ng-if="b.shared>0"><i class="icon icon-share" title="<?php p($l->t('Shared with you')); ?>"><span class="hidden-visually"><?php p($l->t('Shared with you')); ?></span></i></li>
<li class="app-navigation-entry-utils-menu-button svg" ng-show="!status.deleteUndo[b.id]"><button class="icon-more" title="<?php p($l->t('View more')); ?>"><span class="hidden-visually"><?php p($l->t('View more')); ?></span></button></li>
@@ -15,10 +16,15 @@
</div>
<div class="app-navigation-entry-menu app-navigation-noclose" ng-show="!b.status.edit">
<ul>
<li ng-show="boardservice.canManage(b)"><button class="icon-rename svg" title="<?php p($l->t('Edit board')); ?>" ng-click="b.status.edit=true"></button></li>
<li ng-show="boardservice.canManage(b)"><button class="icon-archive svg" title="<?php p($l->t('Move board to archive')); ?>" ng-click="boardArchive(b)"></button></li>
<li ng-show="boardservice.canManage(b)">
<button class="icon-rename svg" title="<?php p($l->t('Edit board')); ?>" ng-click="b.status.edit=true"></button>
</li>
<li ng-show="boardservice.canManage(b)">
<button class="icon-archive svg" title="<?php p($l->t('Move board to archive')); ?>" ng-click="boardArchive(b)"></button>
</li>
</ul>
</div>
<div class="app-navigation-entry-edit" ng-show="b.status.edit">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)">
<input id="newTitle" class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100">