Skip to content

Commit

Permalink
added scroll to org list modal (#10960)
Browse files Browse the repository at this point in the history
* added scroll to org list modal, fixes #10774

* removed console.log
  • Loading branch information
Ijin08 authored and torkelo committed Feb 20, 2018
1 parent 1293fca commit 9f4b7ac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 1 addition & 2 deletions public/app/core/components/org_switcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ const template = `
</a>
</div>
<div class="modal-content">
<div class="gf-form-group">
<div class="modal-content modal-content--has-scroll" grafana-scrollbar>
<table class="filter-table form-inline">
<thead>
<tr>
Expand Down
5 changes: 5 additions & 0 deletions public/sass/components/_modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@

.modal-content {
padding: $spacer*2;

&--has-scroll {
max-height: calc(100vh - 400px);
position: relative;
}
}

// Remove bottom margin if need be
Expand Down

0 comments on commit 9f4b7ac

Please sign in to comment.