diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scripts/media.js | 6 | ||||
| -rw-r--r-- | lib/tpl/default/mediamanager.css | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/lib/scripts/media.js b/lib/scripts/media.js index b4f1c0322..4fc4155b2 100644 --- a/lib/scripts/media.js +++ b/lib/scripts/media.js @@ -546,6 +546,12 @@ var dw_mediamanager = { $select.append(new Option(LANG.media_diff_portions, "portions")); $label.append($select); $form.append($label); + + // for IE + var select = document.getElementById('mediamanager__difftype'); + select.options[0].text = LANG.media_diff_both; + select.options[1].text = LANG.media_diff_opacity; + select.options[2].text = LANG.media_diff_portions; }, /** diff --git a/lib/tpl/default/mediamanager.css b/lib/tpl/default/mediamanager.css index 8a42a9e35..bd9efdca1 100644 --- a/lib/tpl/default/mediamanager.css +++ b/lib/tpl/default/mediamanager.css @@ -124,6 +124,12 @@ float: right; } +* html #mediamanager__sort, +*+html #mediamanager__sort { + position: relative; + margin-top: -18px; +} + /* File list */ #mediamanager__file_list { @@ -159,7 +165,6 @@ *+html .mediamanager-thumbs li { display: inline; - height: 130px; } .mediamanager-thumbs li .image, @@ -174,8 +179,8 @@ display: none; } -.mediamanager-thumbs li .image div, -.mediamanager-thumbs li .image0 div { +.mediamanager-thumbs li .image span, +.mediamanager-thumbs li .image0 span { vertical-align: middle; display: table-cell; width: 100px; @@ -188,6 +193,7 @@ .mediamanager-thumbs li .date { display: block; overflow: hidden; + width: 90px; white-space: nowrap; } @@ -257,8 +263,8 @@ max-height: 16px; } -.mediamanager-list li .image div, -.mediamanager-list li .image1 div { +.mediamanager-list li .image span, +.mediamanager-list li .image1 span { vertical-align: middle; text-align: center; display: table-cell; @@ -348,6 +354,9 @@ form.meta textarea.edit { * html #mediamanager__diff_table li { display: inline; } +*+html #mediamanager__diff_table li { + display: inline; +} /* Image diff */ |