diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scripts/linkwiz.js | 12 | ||||
| -rw-r--r-- | lib/tpl/default/_mediamanager.css | 61 |
2 files changed, 39 insertions, 34 deletions
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js index a9d517306..cc4c19e0d 100644 --- a/lib/scripts/linkwiz.js +++ b/lib/scripts/linkwiz.js @@ -23,9 +23,12 @@ var dw_linkwiz = { // create HTML Structure dw_linkwiz.$wiz = jQuery(document.createElement('div')) - .dialog({autoOpen: false, draggable: true, title: LANG.linkwiz, - resizable: false, - }) + .dialog({ + autoOpen: false, + draggable: true, + title: LANG.linkwiz, + resizable: false + }) .html( '<div>'+LANG.linkto+' <input type="text" class="edit" id="link__wiz_entry" autocomplete="off" /></div>'+ '<div id="link__wiz_result"></div>' @@ -38,7 +41,8 @@ var dw_linkwiz = { 'top': (pos.top+20)+'px', 'left': (pos.left+80)+'px' }) - .show().appendTo('div.dokuwiki'); + .show() + .appendTo('div.dokuwiki'); dw_linkwiz.textArea = $editor[0]; dw_linkwiz.result = jQuery('#link__wiz_result')[0]; diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css index 03c2cb9ce..383a1597c 100644 --- a/lib/tpl/default/_mediamanager.css +++ b/lib/tpl/default/_mediamanager.css @@ -73,6 +73,10 @@ color: __text__; line-height: 1.5em; } +* html #mediamanager__page .namespaces h2, +*+html #mediamanager__page .namespaces h2 { + display: inline; +} #mediamanager__page .namespaces ul { margin-left: .2em; @@ -143,6 +147,20 @@ background-color: __background_alt__; } +#mediamanager__page .filelist li dt a { + vertical-align: middle; + display: table-cell; + overflow: hidden; +} +* html #mediamanager__page .filelist .thumbs li dt a, +*+html #mediamanager__page .filelist .thumbs li dt a { + display: block; +} +* html #mediamanager__page .filelist .rows li dt a, +*+html #mediamanager__page .filelist .rows li dt a { + display: inline; +} + /* thumbs */ #mediamanager__page .filelist .thumbs li { @@ -160,23 +178,18 @@ position: relative; line-height: 1.2; } -* html #mediamanager__page .filelist .thumbs li { - display: inline; - zoom: 1; -} +* html #mediamanager__page .filelist .thumbs li, *+html #mediamanager__page .filelist .thumbs li { display: inline; + zoom: 1; } -#mediamanager__page .filelist .thumbs li .image { - vertical-align: middle; - display: table-cell; +#mediamanager__page .filelist .thumbs li dt a { width: 100px; height: 90px; - overflow: hidden; } -#mediamanager__page .filelist .thumbs li .thumb img { +#mediamanager__page .filelist .thumbs li dt a img { max-width: 90px; max-height: 90px; } @@ -217,29 +230,21 @@ background-color: __background_neu__; } -#mediamanager__page .filelist .rows li .image { - width: 10%; - display: block; - overflow: hidden; +#mediamanager__page .filelist .rows li dt { float: left; + width: 10%; height: 40px; text-align: center; } -#mediamanager__page .filelist .rows li .thumb img { - max-width: 40px; - max-height: 40px; -} - -#mediamanager__page .filelist .rows li .image span { - vertical-align: middle; - text-align: center; - display: table-cell; +#mediamanager__page .filelist .rows li dt a { width: 100px; height: 40px; } -#mediamanager__page .filelist .rows .icon { - margin-top: 12px; + +#mediamanager__page .filelist .rows li dt a img { + max-width: 40px; + max-height: 40px; } #mediamanager__page .filelist .rows li .name, @@ -355,7 +360,8 @@ /* File diff */ -#mediamanager__diff { +#mediamanager__diff table { + table-layout: fixed; } #mediamanager__diff td, @@ -367,11 +373,6 @@ text-align: left; } -/* For IE7 */ -*:first-child+html #mediamanager__diff td { - width: 45%; -} - #mediamanager__diff th { font-weight: normal; } |