Skip to content

Commit

Permalink
Merge pull request #474 from will-moore/legend_z-index_fix
Browse files Browse the repository at this point in the history
Only show legend-container above right panel when editing
  • Loading branch information
will-moore authored Aug 9, 2022
2 parents 5e4c5f8 + 5a6bc89 commit 0e56b41
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion omero_figure/static/figure/css/figure.css
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@

/* -- Legend -- */
.legend-container {
z-index: 100;
z-index: 1;
position:fixed;
bottom: 54px;
width: 60%;
Expand Down
3 changes: 3 additions & 0 deletions src/js/views/legend_view.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,14 @@ var LegendView = Backbone.View.extend({
var html = '<textarea class="form-control" rows="9" style="resize:none">'
+ legendText + '</textarea>';
$legend.html(html);
// Show above the right-hand panel when editing
$(".legend-container").css("z-index", 100);
} else {
// ...only show 'edit' button
$edit.show();
$save.hide();
$cancel.hide();
$(".legend-container").css("z-index", 1);

$panel.removeClass('editing');
if (legendText.length === 0) {
Expand Down

0 comments on commit 0e56b41

Please sign in to comment.