Skip to content

Commit

Permalink
Merge branch 'feature/ie-css-for-images' into develop
Browse files Browse the repository at this point in the history
 [SVCS-571]
 Closes: #322
  • Loading branch information
felliott committed Mar 22, 2018
2 parents 227cae5 + 976fd20 commit 4cf6112
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion mfr/extensions/image/templates/viewer.mako
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@
## issue mentioned below.
## 2. Images are displayed in its actual size. No issue for all supported
## browsers.
baseImage.wrap("<div></div>").parent().css("display", "inline-block");
baseImage.wrap("<div></div>").parent().css({
"display": "inline-block",
"max-width": "100%", // need to be explicit for IE
"height": "auto" // need to be explicit for IE
});
} else {
## Quirks: Chrome has a flickering bug when images are wrapped with `<div>` or
## `<span>`. During zoom the scroll bar keeps appearing and disappearing which
Expand Down

0 comments on commit 4cf6112

Please sign in to comment.