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

overflow y on control-sidebar sections

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-12 22:42:12 -04:00
parent 1efcd69148
commit 641c76ae62
2 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,46 +267,50 @@
<h3 class="control-sidebar-heading"> <h3 class="control-sidebar-heading">
<i class="fa fa-tag fa-fw"></i> Types <i class="fa fa-tag fa-fw"></i> Types
</h3> </h3>
<ul class="control-sidebar-menu"> <div class="control-sidebar-section">
<li> <ul class="control-sidebar-menu">
<a href="#" stop-click ng-click="filterType(constants.cipherType.login)"> <li>
<i class="fa fa-check fa-fw" ng-if="constants.cipherType.login === typeFilter"></i> <a href="#" stop-click ng-click="filterType(constants.cipherType.login)">
<i class="fa fa-globe fa-fw" ng-if="constants.cipherType.login !== typeFilter"></i> Login <i class="fa fa-check fa-fw" ng-if="constants.cipherType.login === typeFilter"></i>
</a> <i class="fa fa-globe fa-fw" ng-if="constants.cipherType.login !== typeFilter"></i> Login
</li> </a>
<li> </li>
<a href="#" stop-click ng-click="filterType(constants.cipherType.card)"> <li>
<i class="fa fa-check fa-fw" ng-if="constants.cipherType.card === typeFilter"></i> <a href="#" stop-click ng-click="filterType(constants.cipherType.card)">
<i class="fa fa-credit-card fa-fw" ng-if="constants.cipherType.card !== typeFilter"></i> Card <i class="fa fa-check fa-fw" ng-if="constants.cipherType.card === typeFilter"></i>
</a> <i class="fa fa-credit-card fa-fw" ng-if="constants.cipherType.card !== typeFilter"></i> Card
</li> </a>
<li> </li>
<a href="#" stop-click ng-click="filterType(constants.cipherType.identity)"> <li>
<i class="fa fa-check fa-fw" ng-if="constants.cipherType.identity === typeFilter"></i> <a href="#" stop-click ng-click="filterType(constants.cipherType.identity)">
<i class="fa fa-id-card-o fa-fw" ng-if="constants.cipherType.identity !== typeFilter"></i> Identity <i class="fa fa-check fa-fw" ng-if="constants.cipherType.identity === typeFilter"></i>
</a> <i class="fa fa-id-card-o fa-fw" ng-if="constants.cipherType.identity !== typeFilter"></i> Identity
</li> </a>
<li> </li>
<a href="#" stop-click ng-click="filterType(constants.cipherType.secureNote)"> <li>
<i class="fa fa-check fa-fw" ng-if="constants.cipherType.secureNote === typeFilter"></i> <a href="#" stop-click ng-click="filterType(constants.cipherType.secureNote)">
<i class="fa fa-sticky-note-o fa-fw" ng-if="constants.cipherType.secureNote !== typeFilter"></i> Secure Note <i class="fa fa-check fa-fw" ng-if="constants.cipherType.secureNote === typeFilter"></i>
</a> <i class="fa fa-sticky-note-o fa-fw" ng-if="constants.cipherType.secureNote !== typeFilter"></i> Secure Note
</li> </a>
</ul> </li>
</ul>
</div>
<h3 class="control-sidebar-heading"> <h3 class="control-sidebar-heading">
<i class="fa fa-folder fa-fw"></i> Folders <i class="fa fa-folder fa-fw"></i> Folders
</h3> </h3>
<div ng-show="loading && !vaultFolders.length"> <div ng-show="loading && !vaultFolders.length">
<p>Loading...</p> <p>Loading...</p>
</div> </div>
<ul class="control-sidebar-menu" ng-show="!loading && vaultFolders.length"> <div class="control-sidebar-section">
<li ng-repeat="folder in vaultFolders track by folder.id"> <ul class="control-sidebar-menu" ng-show="!loading && vaultFolders.length">
<a href="#" stop-click ng-click="filterFolder(folder)"> <li ng-repeat="folder in vaultFolders track by folder.id">
<i class="fa fa-check fa-fw" ng-if="folder.id === folderIdFilter"></i> <a href="#" stop-click ng-click="filterFolder(folder)">
<i class="fa fa-caret-right fa-fw" ng-if="folder.id !== folderIdFilter"></i> <i class="fa fa-check fa-fw" ng-if="folder.id === folderIdFilter"></i>
{{folder.name}} <i class="fa fa-caret-right fa-fw" ng-if="folder.id !== folderIdFilter"></i>
</a> {{folder.name}}
</li> </a>
</ul> </li>
</ul>
</div>
</div> </div>
</aside> </aside>

8
src/less/vault.less
View File

@ -159,6 +159,7 @@ body.skin-blue {
li a { li a {
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
white-space: nowrap;
} }
li.active a { li.active a {
@ -166,6 +167,13 @@ body.skin-blue {
} }
} }
.control-sidebar-section {
max-height: 350px;
overflow-y: auto;
padding-right: 15px;
margin-right: -15px;
}
.control-sidebar-open { .control-sidebar-open {
@media (min-width: @screen-sm) { @media (min-width: @screen-sm) {
.main-footer { .main-footer {