Moved tags to sublist in appnavigation

Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
This commit is contained in:
Felix Nüsse 2018-10-27 20:28:24 +02:00 committed by fnuesse
parent 8eb1292cff
commit f1158485a8
No known key found for this signature in database
GPG key ID: 2089A3431243E819
5 changed files with 41 additions and 11 deletions

View file

@ -890,7 +890,8 @@
opacity: 1 !important;
z-index: 140; }
.nav-trashbin a.active {
#border-left: 3px solid #0082c9; }
#border-left: 3px solid #0082c9;
}
.nav-trashbin a .fa {
margin-right: 15px; }

View file

@ -110,6 +110,18 @@
}
};
$scope.tagCollapsibleClicked = function () {
if ($scope.tagCollapsibleOpen === true)
$scope.tagCollapsibleOpen = false;
else
$scope.tagCollapsibleOpen = true;
};
$scope.tagCollapsibleState = function () {
return $scope.tagCollapsibleOpen !== false;
};
$rootScope.$on('credentials_loaded', function () {
$rootScope.$broadcast('selected_tags_updated', $scope.selectedTags);
});

View file

@ -63,8 +63,19 @@
display: none;
}
//Overrides transparent entry bullet on hover from server
#app-navigation .collapsible:hover .app-navigation-entry-bullet{
background: var(--color-primary) !important;
}
#app-navigation {
li{
.app-navigation-entry-bullet-color {
background-color: var(--color-primary);
}
.highlight-selected{
background-color: var(--color-primary);
}

View file

@ -68,10 +68,6 @@
}
.app-navigation-entry-bullet-color {
background-color: var(--color-primary);
}
.tab_container {
border: 1px solid #eee;
border-top-color: #0082c9;

View file

@ -126,17 +126,27 @@ style('passman', 'app');
<div id="app-navigation" ng-show="selectedVault" ng-controller="MenuCtrl">
<ul class="with-icon">
<li class="taginput">
<!--<li class="taginput">
<a class="taginput">
<tags-input ng-model="selectedTags" replace-spaces-with-dashes="false">
<auto-complete source="getTags($query)" min-length="0"></auto-complete>
</tags-input>
</a>
</li>
<li ng-repeat="tag in available_tags | orderBy:'text'">
<div ng-if="tagSelected(tag)" class="app-navigation-entry-bullet app-navigation-entry-bullet-color"></div>
<a class="icon-tag svg" ng-click="tagClicked(tag)">{{tag.text}}</a>
</li>
</li>-->
<li class="collapsible open" ng-class="{'open':tagCollapsibleState()}">
<button class="collapse" ng-click="tagCollapsibleClicked()"></button>
<a href="" class="icon-tag" ng-click="tagCollapsibleClicked()">{{ 'Tags' | translate }}</a>
<ul>
<li ng-repeat="tag in available_tags | orderBy:'text'">
<div ng-if="tagSelected(tag)" class="app-navigation-entry-bullet app-navigation-entry-bullet-color"></div>
<a class="icon-tag svg" ng-click="tagClicked(tag)">{{tag.text}}</a>
</li>
</ul>
</li>
<li data-id="trashbin" class="nav-trashbin pinned first-pinned">
<a ng-click="toggleDeleteTime()" ng-class="{'active': delete_time > 0}" class="icon-delete svg">
{{ 'deleted.credentials' | translate }}