Skip to content

Commit

Permalink
Merge branch 'feature/unbreak-opengl' into develop
Browse files Browse the repository at this point in the history
 [SVCS-566]
 Closes: #319
  • Loading branch information
felliott committed Mar 20, 2018
2 parents 71685ed + bc864c3 commit 7150e66
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion mfr/server/static/css/mfr.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,16 @@ This CSS was stripped out of base.css from the osf-style repo.
align-items: center;
width: 100%;
height: 250px;
top: 0;
left: 0;
}

.embed-responsive-pdf {
padding-bottom: 95%;
}

#mfrIframe iframe {
display: none;
opacity: 0.0;
}

#mfrIframe {
Expand Down
2 changes: 1 addition & 1 deletion mfr/server/static/js/mfr.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
self.pymParent.el.appendChild(self.spinner);
$(self.pymParent.iframe).on('load', function() {
self.pymParent.el.removeChild(self.spinner);
this.style.display = "block"
this.style.opacity = "1.0"
})

self.pymParent.onMessage('embed', function(message) {
Expand Down

0 comments on commit 7150e66

Please sign in to comment.