From e000c618e1e603ca14c141bf97c892c4056418d0 Mon Sep 17 00:00:00 2001 From: Anika Henke Date: Tue, 16 Jul 2013 09:54:03 +0100 Subject: [PATCH] removed IE6-specific code --- css/basic.css | 6 +++--- css/design.css | 13 ------------- css/structure.css | 10 +--------- detail.php | 4 ++-- main.php | 6 +++--- mediamanager.php | 4 ++-- 6 files changed, 11 insertions(+), 32 deletions(-) diff --git a/css/basic.css b/css/basic.css index 3b34084..89449ea 100644 --- a/css/basic.css +++ b/css/basic.css @@ -261,6 +261,8 @@ iframe { } /* IE8 and below won't display the images otherwise */ +#IE7 img, +#IE8 img, button img { max-width: none; } @@ -410,8 +412,6 @@ button { overflow: visible; padding: .1em .4em; } -#IE6 .dokuwiki input.button, -#IE6 .dokuwiki button, #IE7 .dokuwiki input.button, #IE7 .dokuwiki button { line-height: 1.4; @@ -469,4 +469,4 @@ div.clearer { [dir=rtl] .a11y { left: auto; right: -99999em; -} \ No newline at end of file +} diff --git a/css/design.css b/css/design.css index 7619034..4d7dff3 100644 --- a/css/design.css +++ b/css/design.css @@ -120,9 +120,6 @@ max-width: __site_width__; padding: 0 1em; } -#IE6 #dokuwiki__usertools ul { - width: 100%; -} #dokuwiki__usertools ul li.user { float: left; margin-left: 0; @@ -143,9 +140,6 @@ width: 100%; z-index: 10; } -#IE6 #dokuwiki__content { - margin-bottom: 1.4em; -} #dokuwiki__pagetools ul li { display: inline; margin: 0 1.5em 0 0; @@ -156,17 +150,14 @@ [dir=rtl] #dokuwiki__pagetools ul li a.action.top { float: left; } -#IE6 #dokuwiki__pagetools ul, #IE7 #dokuwiki__pagetools ul { position: relative; } -#IE6 #dokuwiki__pagetools ul li a.action.top, #IE7 #dokuwiki__pagetools ul li a.action.top { position: absolute; top: 0; right: 0; } -[dir=rtl] #IE6 #dokuwiki__pagetools ul li a.action.top, [dir=rtl] #IE7 #dokuwiki__pagetools ul li a.action.top { right: auto; left: 0; @@ -251,14 +242,10 @@ .dokuwiki .wrapper { margin-bottom: 2.8em; } -#IE6 .dokuwiki .wrapper { - margin-bottom: 1.4em; -} #dokuwiki__footer { margin-bottom: 1em; } -#IE6 #dokuwiki__footer, #IE7 #dokuwiki__footer { height: 1%; } diff --git a/css/structure.css b/css/structure.css index 8da5a5c..c2907cd 100644 --- a/css/structure.css +++ b/css/structure.css @@ -26,9 +26,6 @@ body { float: right; } - #IE6 #dokuwiki__header .headings { - width: 50%; - } #dokuwiki__header .tools { float: right; text-align: right; @@ -38,14 +35,9 @@ body { text-align: left; } - #IE6 #dokuwiki__header .tools { - width: 50%; - } - #dokuwiki__site .wrapper { position: relative; } -#IE6 #dokuwiki__site .wrapper, #IE7 #dokuwiki__site .wrapper { height: 1%; } @@ -89,4 +81,4 @@ body { clear: both; } #dokuwiki__footer > .pad { -} \ No newline at end of file +} diff --git a/detail.php b/detail.php index 8c2c844..81e7afd 100644 --- a/detail.php +++ b/detail.php @@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die(); - +
@@ -92,7 +92,7 @@ if (!defined('DOKU_INC')) die();
- + diff --git a/main.php b/main.php index c7164f7..2bfd622 100644 --- a/main.php +++ b/main.php @@ -28,8 +28,8 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show'); - + precede CSS rules by #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?> + are added to make it possible to e.g. style a page differently if it's in edit mode, @@ -170,6 +170,6 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
- + diff --git a/mediamanager.php b/mediamanager.php index eb62515..a303dd5 100644 --- a/mediamanager.php +++ b/mediamanager.php @@ -27,7 +27,7 @@ if (!defined('DOKU_INC')) die(); - +
@@ -43,6 +43,6 @@ if (!defined('DOKU_INC')) die();
- +