From 00c2d4a9d8fcb38b6a2294749b395d528952fde5 Mon Sep 17 00:00:00 2001 From: Anika Henke <anika@selfthinker.org> Date: Sat, 28 Jul 2012 20:51:59 +0100 Subject: [PATCH] fixed some RTL+IE7 bugs, mainly background icons and search form (FS#2569) --- inc/template.php | 2 +- lib/plugins/acl/style.css | 4 ++++ lib/tpl/default/rtl.css | 1 + lib/tpl/dokuwiki/css/_links.css | 1 + lib/tpl/dokuwiki/css/design.css | 7 +++++++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/inc/template.php b/inc/template.php index 78d9dd748..7d09f7dd4 100644 --- a/inc/template.php +++ b/inc/template.php @@ -1226,7 +1226,7 @@ function tpl_mediaFileDetails($image, $rev){ list($ext,$mime,$dl) = mimetype($image,false); $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext); $class = 'select mediafile mf_'.$class; - $tabTitle = '<strong class="'.$class.'"><a href="'.ml($image).'" title="'.$lang['mediaview'].'">'.$image.'</a>'.'</strong>'; + $tabTitle = '<strong><a href="'.ml($image).'" class="'.$class.'" title="'.$lang['mediaview'].'">'.$image.'</a>'.'</strong>'; if ($opened_tab === 'view' && $rev) { printf($lang['media_viewold'], $tabTitle, dformat($rev)); } else { diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css index 2eee4f41c..7044254a5 100644 --- a/lib/plugins/acl/style.css +++ b/lib/plugins/acl/style.css @@ -74,6 +74,7 @@ div#acl_manager .aclgroup { [dir=rtl] div#acl_manager .aclgroup { background: transparent url(pix/group.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .acluser { @@ -83,6 +84,7 @@ div#acl_manager .acluser { [dir=rtl] div#acl_manager .acluser { background: transparent url(pix/user.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .aclpage { @@ -92,6 +94,7 @@ div#acl_manager .aclpage { [dir=rtl] div#acl_manager .aclpage { background: transparent url(pix/page.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager .aclns { @@ -101,6 +104,7 @@ div#acl_manager .aclns { [dir=rtl] div#acl_manager .aclns { background: transparent url(pix/ns.png) right 1px no-repeat; padding: 1px 18px 1px 0px; + display: inline-block; /* needed for IE7 */ } div#acl_manager label.disabled { diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index fbc22f304..f16ba101b 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -60,6 +60,7 @@ div.dokuwiki a.mail { background-position: right 1px; padding-right: 16px; padding-left: 0; + display: inline-block; /* needed for IE7 */ } div.dokuwiki a.mediafile { diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css index 22502f6a9..e53ba45e5 100644 --- a/lib/tpl/dokuwiki/css/_links.css +++ b/lib/tpl/dokuwiki/css/_links.css @@ -70,4 +70,5 @@ [dir=rtl] .dokuwiki a.mediafile { background-position: right center; padding: 0 18px 0 0; + display: inline-block; /* needed for IE7 */ } diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css index d1a00ce0a..8a3f20729 100644 --- a/lib/tpl/dokuwiki/css/design.css +++ b/lib/tpl/dokuwiki/css/design.css @@ -103,6 +103,10 @@ padding-left: 0; padding-right: 20px; } +[dir=rtl] #IE7 #dokuwiki__usertools a.action { + display: inline-block; +} + #dokuwiki__header .mobileTools { display: none; /* hide mobile tools dropdown to only show in mobile view */ @@ -176,6 +180,9 @@ font-size: 0.875em; position: relative; } +[dir=rtl] #IE7 #dokuwiki__sitetools form.search { + min-height: 1px; +} #dokuwiki__sitetools form.search input.edit { width: 18em; padding: .35em 22px .35em .1em; -- GitLab