Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added scroll to org list modal #10960

Merged
merged 2 commits into from
Feb 20, 2018
Merged

added scroll to org list modal #10960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27e087
added scroll to org list modal, fixes #10774
Ijin08 Feb 19, 2018
993289f
removed console.log
Ijin08 Feb 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions public/app/core/components/org_switcher.ts
View file
Open in desktop
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
View file
Open in desktop
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