devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

folder and collection icons. no folder group fix

This commit is contained in:
Kyle Spearrin 2017-11-24 12:33:38 -05:00
parent 95022337ea
commit 9581988b8a
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/popup/app/vault/vaultViewGroupingController.js
View File

@ -17,15 +17,15 @@ angular
id: null, id: null,
name: i18nService.noneFolder name: i18nService.noneFolder
}; };
$scope.folderGrouping = false; $scope.folderGrouping = true;
$scope.collectionGrouping = false; $scope.collectionGrouping = false;
if (state.folderId && state.folderId !== '0') { if (state.folderId && state.folderId !== '0') {
$scope.grouping.id = state.folderId; $scope.grouping.id = state.folderId;
$scope.folderGrouping = true;
} }
else if (state.collectionId && state.collectionId !== '0') { else if (state.collectionId && state.collectionId !== '0') {
$scope.grouping.id = state.collectionId; $scope.grouping.id = state.collectionId;
$scope.folderGrouping = false;
$scope.collectionGrouping = true; $scope.collectionGrouping = true;
} }

30
src/popup/app/vault/views/vault.html
View File

@ -41,11 +41,17 @@
<div class="list-section-items"> <div class="list-section-items">
<a href="#" stop-click ng-click="viewGrouping(folder, true)" class="list-section-item" <a href="#" stop-click ng-click="viewGrouping(folder, true)" class="list-section-item"
ng-repeat="folder in vaultFolders | orderBy: folderSort track by $index"> ng-repeat="folder in vaultFolders | orderBy: folderSort track by $index">
<i class="fa fa-fw text-muted" <div class="pull-right">
ng-class="{'fa-folder-open': folder.id, 'fa-folder-open-o': !folder.id}"></i> <i class="fa fa-chevron-right fa-lg"></i>
{{folder.name}} <span class="item-sub-label" ng-if="showGroupingCounts">{{folder.itemCount}}</span>
<i class="fa fa-chevron-right fa-lg"></i> </div>
<span class="item-sub-label" ng-if="showGroupingCounts">{{folder.itemCount}}</span> <div class="icon single-line">
<i class="fa fa-fw fa-lg"
ng-class="{'fa-folder-open': folder.id, 'fa-folder-open-o': !folder.id}"></i>
</div>
<span class="text">
{{folder.name}}
</span>
</a> </a>
</div> </div>
</div> </div>
@ -57,10 +63,16 @@
<div class="list-section-items"> <div class="list-section-items">
<a href="#" stop-click ng-click="viewGrouping(collection, false)" class="list-section-item" <a href="#" stop-click ng-click="viewGrouping(collection, false)" class="list-section-item"
ng-repeat="collection in vaultCollections | orderBy: ['name'] track by $index"> ng-repeat="collection in vaultCollections | orderBy: ['name'] track by $index">
<i class="fa fa-cube fa-fw text-muted"></i> <div class="pull-right">
{{collection.name}} <i class="fa fa-chevron-right fa-lg"></i>
<i class="fa fa-chevron-right fa-lg"></i> <span class="item-sub-label" ng-if="showGroupingCounts">{{collection.itemCount}}</span>
<span class="item-sub-label" ng-if="showGroupingCounts">{{collection.itemCount}}</span> </div>
<div class="icon single-line">
<i class="fa fa-fw fa-lg fa-cube"></i>
</div>
<span class="text">
{{collection.name}}
</span>
</a> </a>
</div> </div>
</div> </div>

10
src/popup/less/components.less
View File

@ -1,4 +1,4 @@
@import (reference) "variables.less"; @import (reference) "variables.less";
@import (reference) "mixins.less"; @import (reference) "mixins.less";
.header { .header {
@ -364,10 +364,14 @@
max-height: 20px; max-height: 20px;
max-width: 20px; max-width: 20px;
} }
&.single-line {
height: initial;
display: block;
text-align: center;
}
} }
.action-buttons { .action-buttons {
float: right; float: right;