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

Remove fa- icons

Browse Source
This commit is contained in:
Julius Haertl
2016-08-15 13:45:00 +02:00
parent 6a74437db8
commit f3cc6a0529
4 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
css/style.css
View File

@@ -446,9 +446,10 @@
height:32px; height:32px;
margin-right: 3px; margin-right: 3px;
} }
.avatardiv .fa-group { .avatardiv .icon-group {
padding: 7px; margin: 7px;
opacity: 0.5; opacity: 0.5;
display:block !important;
} }
/* color selector */ /* color selector */
@@ -538,8 +539,6 @@ button:hover {
/* board detail */ /* board detail */
#board-detail-labels { #board-detail-labels {
padding: 10px; padding: 10px;
} }
#board-detail-labels ul li { #board-detail-labels ul li {
display: block; display: block;
@@ -555,16 +554,22 @@ button:hover {
} }
#board-detail-labels ul li .label-title { #board-detail-labels ul li .label-title {
float:left; float:left;
width:90%; width:88%;
font-size:10pt; font-size:10pt;
padding:5px; padding:5px;
border:none; border:none;
margin-right:2px; margin-right:2px;
} }
#board-detail-labels ul li .fa { #board-detail-labels ul li a.icon {
float:right; float:right;
padding:5px; padding:5px;
} }
.label-create {
width:88%;
}
.label-create .icon {
margin-bottom:-3px;
}
#board-detail-labels .color { #board-detail-labels .color {
width:28px; width:28px;
@@ -705,3 +710,15 @@ margin-bottom:2px; width:100%;
.shareOption { .shareOption {
margin-top:4px; margin-top:4px;
} }
.app-deck .icon {
display: inline-block;
}
.icon-group {
background-image: url('../../../settings/img/users.svg');
}
.icon-archive {
background-image: url('../img/archive.svg');
}

1
js/public/app.js
View File

@@ -277,6 +277,7 @@ app.controller('BoardController', ["$rootScope", "$scope", "$stateParams", "Stat
$scope.labelUpdate = function(label) { $scope.labelUpdate = function(label) {
label.edit = false; label.edit = false;
LabelService.update(label); LabelService.update(label);
console.log(label);
} }
$scope.aclAdd = function(sharee) { $scope.aclAdd = function(sharee) {

6
templates/part.board.mainView.php
View File

@@ -68,13 +68,13 @@
<a class="menuitem action action-rename permanent" <a class="menuitem action action-rename permanent"
data-action="Archive" data-action="Archive"
ng-click="cardArchive(c); $event.stopPropagation();"><span ng-click="cardArchive(c); $event.stopPropagation();"><span
class="fa fa-archive"></span><span><?php p($l->t('Archive')); ?></span></a> class="icon icon-archive"></span><span><?php p($l->t('Archive')); ?></span></a>
</li> </li>
<li ng-if="filter==='archive'"> <li ng-if="filter==='archive'">
<a class="menuitem action action-rename permanent" <a class="menuitem action action-rename permanent"
data-action="Unarchive" data-action="Unarchive"
ng-click="cardUnarchive(c); $event.stopPropagation();"><span ng-click="cardUnarchive(c); $event.stopPropagation();"><span
class="fa fa-archive"></span><span><?php p($l->t('Unarchive')); ?></span></a> class="icon icon-archive"></span><span><?php p($l->t('Unarchive')); ?></span></a>
</li> </li>
<li> <li>
<a class="menuitem action action-delete permanent" <a class="menuitem action action-delete permanent"
@@ -105,7 +105,7 @@
ng-blur="s.status.addCard=false" required/> ng-blur="s.status.addCard=false" required/>
</h3> </h3>
</form> </form>
<div class="fa fa-plus" ng-if="!s.status.addCard" <div class="icon icon-add" ng-if="!s.status.addCard"
ng-click="s.status.addCard=!s.status.addCard"></div> ng-click="s.status.addCard=!s.status.addCard"></div>
</div> </div>
</div> </div>

32
templates/part.board.sidebarView.php
View File

@@ -19,11 +19,11 @@
<ui-select ng-model="status.addSharee" theme="bootstrap" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)"> <ui-select ng-model="status.addSharee" theme="bootstrap" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)">
<ui-select-match placeholder="<?php p($l->t('Select users...')); ?>"> <ui-select-match placeholder="<?php p($l->t('Select users...')); ?>">
<span><i class="fa fa-{{$item.type}}"></i> {{ $item.participant }}</span> <span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant }}</span>
</ui-select-match> </ui-select-match>
<!-- FIXME: filter by selected or add multiple //--> <!-- FIXME: filter by selected or add multiple //-->
<ui-select-choices repeat="sharee in boardservice.sharees | filter: board.sharees | filter: $select.search track by $index"> <ui-select-choices repeat="sharee in boardservice.sharees | filter: board.sharees | filter: $select.search track by $index">
<span><i class="fa fa-{{sharee.type}}"></i> {{ sharee.participant }}</span> <span><i class="icon icon-{{sharee.type}}"></i> {{ sharee.participant }}</span>
</ui-select-choices> </ui-select-choices>
<ui-select-no-choice> <ui-select-no-choice>
<?php p($l->t('Dang! We couldn\'t find any choices...')); ?> <?php p($l->t('Dang! We couldn\'t find any choices...')); ?>
@@ -41,7 +41,7 @@
<li ng-repeat="acl in boardservice.getCurrent().acl track by $index"> <li ng-repeat="acl in boardservice.getCurrent().acl track by $index">
<span class="icon-loading-small" style="display:none;"></span> <span class="icon-loading-small" style="display:none;"></span>
<div class="avatardiv" avatar displayname="{{ acl.participant }}" ng-if="acl.type=='user'"></div> <div class="avatardiv" avatar displayname="{{ acl.participant }}" ng-if="acl.type=='user'"></div>
<div class="avatardiv" ng-if="acl.type=='group'"><i class="fa fa-{{acl.type}}"></i></div> <div class="avatardiv" ng-if="acl.type=='group'"><i class="icon icon-{{acl.type}}"></i></div>
<span class="has-tooltip username"> <span class="has-tooltip username">
{{ acl.participant }}</span> {{ acl.participant }}</span>
@@ -66,33 +66,37 @@
<ul class="labels"> <ul class="labels">
<li ng-repeat="label in boardservice.getCurrent().labels"> <li ng-repeat="label in boardservice.getCurrent().labels">
<span class="label-title" style="background-color:#{{label.color}}; color:{{ textColor(label.color) }};" ng-if="!label.edit" ng-click="label.edit=true"> <span class="label-title" style="background-color:#{{label.color}}; color:{{ label.color|textColorFilter }};" ng-if="!label.edit" ng-click="label.edit=true">
<span ng-if="label.title">{{ label.title }}</span><i ng-if="!label.title"><br /></i> <span ng-if="label.title">{{ label.title }}</span><i ng-if="!label.title"><br /></i>
</span> </span>
<span class="label-title" style="background-color:#{{label.color}}; color:{{ textColor(label.color) }}; width:188px;" ng-if="label.edit"> <span class="label-title" style="background-color:#{{label.color}}; color:{{ textColor(label.color) }}; width:178px;" ng-if="label.edit">
<input type="text" placeholder="" ng-model="label.title" class="input-inline" style="background-color:#{{label.color}}; color:{{ textColor(label.color) }};" /> <form ng-submit="labelUpdate(label)">
<input type="text" ng-model="label.title" class="input-inline" style="background-color:#{{label.color}}; color:{{ label.color|textColorFilter }};" autofocus-on-insert />
</form>
</span> </span>
<div class="colorselect" ng-if="label.edit"> <div class="colorselect" ng-if="label.edit">
<div class="color" ng-repeat="c in defaultColors" style="background-color:#{{ c }};" ng-click="label.color=c" ng-class="{'selected': (c == label.color) }"><br /></div> <div class="color" ng-repeat="c in defaultColors" style="background-color:#{{ c }};" ng-click="label.color=c" ng-class="{'selected': (c == label.color) }"><br /></div>
</div> </div>
<a class="fa fa-save" ng-click="labelUpdate(label)" ng-if="label.edit"> </a> <a ng-click="labelDelete(label)" class="icon"><i class="icon icon-delete" ></i></a>
<a class="fa fa-edit" ng-click="label.edit=true" ng-if="!label.edit"> </a> <a ng-click="labelUpdate(label)" ng-if="label.edit" class="icon"><i class="icon icon-checkmark" ></i></a>
<a class="fa fa-remove" ng-click="labelDelete(label)"> </a> <a ng-click="label.edit=true" ng-if="!label.edit" class="icon"><i class="icon icon-rename" ></i></a>
</li> </li>
<li ng-if="status.createLabel"> <li ng-if="status.createLabel">
<form ng-submit="labelCreate(newLabel)"> <form ng-submit="labelCreate(newLabel)">
<span class="label-title" style="background-color:#{{newLabel.color}}; color:{{ textColor(newLabel.color) }}; width:188px;"> <span class="label-title" style="background-color:#{{newLabel.color}}; color:{{ textColor(newLabel.color) }}; width:178px;">
<input type="text" class="input-inline" ng-model="newLabel.title" style="color:{{ textColor(newLabel.color) }};" autofocus-on-insert /> <input type="text" class="input-inline" ng-model="newLabel.title" style="color:{{ newLabel.color|textColorFilter }};" autofocus-on-insert />
</span> </span>
<div class="colorselect"> <div class="colorselect">
<div class="color" ng-repeat="c in defaultColors" style="background-color:#{{ c }};" ng-click="newLabel.color=c" ng-class="{'selected': (c == newLabel.color) }"><br /></div> <div class="color" ng-repeat="c in defaultColors" style="background-color:#{{ c }};" ng-click="newLabel.color=c" ng-class="{'selected': (c == newLabel.color) }"><br /></div>
</div> </div>
<a class="fa fa-save" ng-click="labelCreate(newLabel)"> </a> <a ng-click="labelCreate(newLabel)" class="icon"><i class="icon icon-checkmark" ></i></a>
<a ng-click="status.createLabel=false" class="icon icon-close"></a>
</form> </form>
</li> </li>
<li ng-if="!status.createLabel"> <li ng-if="!status.createLabel" class="label-create">
<a ng-click="status.createLabel=true"><span class="fa fa-plus"> </span> <?php p($l->t('Create a new label')); ?></a> <a ng-click="status.createLabel=true"><span class="icon icon-add"> </span> <?php p($l->t('Create a new label')); ?></a>
</li> </li>
</ul> </ul>