Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-27 12:36:14 +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

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

@ -267,6 +267,7 @@
<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>
<div class="control-sidebar-section">
<ul class="control-sidebar-menu"> <ul class="control-sidebar-menu">
<li> <li>
<a href="#" stop-click ng-click="filterType(constants.cipherType.login)"> <a href="#" stop-click ng-click="filterType(constants.cipherType.login)">
@ -293,12 +294,14 @@
</a> </a>
</li> </li>
</ul> </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>
<div class="control-sidebar-section">
<ul class="control-sidebar-menu" ng-show="!loading && vaultFolders.length"> <ul class="control-sidebar-menu" ng-show="!loading && vaultFolders.length">
<li ng-repeat="folder in vaultFolders track by folder.id"> <li ng-repeat="folder in vaultFolders track by folder.id">
<a href="#" stop-click ng-click="filterFolder(folder)"> <a href="#" stop-click ng-click="filterFolder(folder)">
@ -309,4 +312,5 @@
</li> </li>
</ul> </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 {