Commit ed9513f4 by Braden MacDonald

Work around Firefox bug 975632

parent a1852925
...@@ -129,8 +129,7 @@ ...@@ -129,8 +129,7 @@
/*** Drop Target ***/ /*** Drop Target ***/
.xblock--drag-and-drop .target { .xblock--drag-and-drop .target {
display: table; display: table;
width: 0; /* 'display: table' makes this have the smallest size that fits the .target-img
/* 'display: table' & 'width: 0' make this have the smallest size that fits the .target-img
while still allowing the image to use 'max-width: 100%' and scale proportionally. while still allowing the image to use 'max-width: 100%' and scale proportionally.
The end result is that this element has the same widdth and height as the image, so we The end result is that this element has the same widdth and height as the image, so we
can use it as a 'position: relative' anchor for the placed elements. */ can use it as a 'position: relative' anchor for the placed elements. */
...@@ -140,11 +139,16 @@ ...@@ -140,11 +139,16 @@
background: #fff; background: #fff;
} }
.xblock--drag-and-drop .target-img-wrapper {
/* This element is required for Firefox due to https://bugzilla.mozilla.org/show_bug.cgi?id=975632 */
display: table-row;
}
.xblock--drag-and-drop .target-img { .xblock--drag-and-drop .target-img {
width: auto; display: table-cell;
width: 100%;
max-width: 100%; max-width: 100%;
height: auto; height: auto;
max-height: 80vh; /* On mobile, don't ever fill the whole screen with the image */
} }
.xblock--drag-and-drop .zone { .xblock--drag-and-drop .zone {
......
...@@ -108,7 +108,9 @@ ...@@ -108,7 +108,9 @@
h('div.close.icon-remove-sign.fa-times-circle'), h('div.close.icon-remove-sign.fa-times-circle'),
h('p.popup-content', {innerHTML: ctx.popup_html}), h('p.popup-content', {innerHTML: ctx.popup_html}),
]), ]),
h('div.target-img-wrapper', [
h('img.target-img', {src: ctx.target_img_src, alt: "Image Description here"}), h('img.target-img', {src: ctx.target_img_src, alt: "Image Description here"}),
]),
renderCollection(zoneTemplate, ctx.zones, ctx), renderCollection(zoneTemplate, ctx.zones, ctx),
renderCollection(itemTemplate, items_placed, ctx), renderCollection(itemTemplate, items_placed, ctx),
]), ]),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment