Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

cleanup styles and pluralize vault counts

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-18 12:03:06 -04:00
parent 0e36abe1ad
commit 799fbeba72
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/organization/views/organizationDashboard.html
View File

@ -1,7 +1,7 @@
<section class="content-header"> <section class="content-header">
<h1> <h1>
Dashboard Dashboard
<small>Some org</small> <small>{{orgProfile.name}}</small>
</h1> </h1>
</section> </section>
<section class="content"> <section class="content">

1
src/app/vault/vaultController.js
View File

@ -4,6 +4,7 @@
.controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr, .controller('vaultController', function ($scope, $uibModal, apiService, $filter, cryptoService, authService, toastr,
cipherService, $q, $localStorage, $timeout, $rootScope) { cipherService, $q, $localStorage, $timeout, $rootScope) {
$scope.loading = true; $scope.loading = true;
$scope.logins = [];
$scope.favoriteCollapsed = $localStorage.collapsedFolders && 'favorite' in $localStorage.collapsedFolders; $scope.favoriteCollapsed = $localStorage.collapsedFolders && 'favorite' in $localStorage.collapsedFolders;
$scope.$on('$viewContentLoaded', function () { $scope.$on('$viewContentLoaded', function () {

13
src/app/vault/views/vault.html
View File

@ -1,7 +1,12 @@
<section class="content-header"> <section class="content-header">
<h1> <h1>
My Vault My Vault
<small>{{vaultFolders.length > 0 ? vaultFolders.length - 1 : 0}} folders, {{logins.length}} logins</small> <small>
<span ng-pluralize
count="vaultFolders.length > 0 ? vaultFolders.length - 1 : 0"
when="{'1': '{} folder', 'other': '{} folders'}"></span>,
<span ng-pluralize count="logins.length" when="{'1': '{} login', 'other': '{} logins'}"></span>
</small>
</h1> </h1>
</section> </section>
<section class="content"> <section class="content">
@ -13,7 +18,8 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"> <h3 class="box-title">
<i class="fa fa-star"></i> <i class="fa fa-star"></i>
Favorites <small>{{favoriteLogins.length}} logins</small> Favorites
<small ng-pluralize count="favoriteLogins.length" when="{'1': '{} login', 'other': '{} logins'}"></small>
</h3> </h3>
<div class="box-tools"> <div class="box-tools">
<div class="btn-group"> <div class="btn-group">
@ -89,7 +95,8 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"> <h3 class="box-title">
<i class="fa" ng-class="{'fa-folder-open': folder.id !== null, 'fa-folder-open-o': folder.id === null}"></i> <i class="fa" ng-class="{'fa-folder-open': folder.id !== null, 'fa-folder-open-o': folder.id === null}"></i>
{{folder.name}} <small>{{folderLogins.length}} logins</small> {{folder.name}}
<small ng-pluralize count="folderLogins.length" when="{'1': '{} login', 'other': '{} logins'}"></small>
</h3> </h3>
<div class="box-tools"> <div class="box-tools">
<div class="btn-group"> <div class="btn-group">

8
src/app/vault/views/vaultSubvaults.html
View File

@ -1,7 +1,10 @@
<section class="content-header"> <section class="content-header">
<h1> <h1>
Subvaults Subvaults
<small>{{subvaults.length}} subvaults, {{logins.length}} logins</small> <small>
<span ng-pluralize count="subvaults.length" when="{'1': '{} subvault', 'other': '{} subvaults'}"></span>,
<span ng-pluralize count="logins.length" when="{'1': '{} login', 'other': '{} logins'}"></span>
</small>
</h1> </h1>
</section> </section>
<section class="content"> <section class="content">
@ -27,7 +30,8 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"> <h3 class="box-title">
<i class="fa fa-share-alt-square"></i> <i class="fa fa-share-alt-square"></i>
{{subvault.name}} <small>{{subvaultLogins.length}} logins</small> {{subvault.name}}
<small ng-pluralize count="subvaultLogins.length" when="{'1': '{} login', 'other': '{} logins'}"></small>
</h3> </h3>
<div class="box-tools"> <div class="box-tools">
<button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand" <button type="button" class="btn btn-box-tool" data-widget="collapse" title="Collapse/Expand"

4
src/less/vault.less
View File

@ -54,6 +54,10 @@ h1, h2, h3, h4, h5, h6,
.subsection { .subsection {
padding: 10px; padding: 10px;
text-align: center; text-align: center;
ul {
text-align: left;
}
} }
} }