diff options
| -rw-r--r-- | css/_edit.css | 4 | ||||
| -rw-r--r-- | css/design.css | 27 | ||||
| -rw-r--r-- | css/structure.css | 12 |
3 files changed, 40 insertions, 3 deletions
diff --git a/css/_edit.css b/css/_edit.css index db62dc976..a17df77f7 100644 --- a/css/_edit.css +++ b/css/_edit.css @@ -41,7 +41,9 @@ div.picker button.pickerbutton { .dokuwiki textarea.edit { /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */ - width: 100%; + width: 700px; + min-width: 100%; + max-width: 100%; margin-bottom: .5em; } diff --git a/css/design.css b/css/design.css index a86fc9f27..243733462 100644 --- a/css/design.css +++ b/css/design.css @@ -12,6 +12,9 @@ #dokuwiki__header { margin: 1em 0 0; } +#IE7 #dokuwiki__header { + margin-top: 2em; +} #dokuwiki__header .headings { margin-bottom: 2.1em; @@ -108,6 +111,9 @@ max-width: 64em; padding: 0 1em; } +#IE6 #dokuwiki__usertools ul { + width: 100%; +} #dokuwiki__usertools ul li.user { float: left; margin-left: 0; @@ -124,6 +130,9 @@ width: 100%; z-index: 10; } +#IE6 #dokuwiki__content { + margin-bottom: 1.4em; +} #dokuwiki__pagetools ul li { display: inline; margin: 0 1.5em 0 0; @@ -131,6 +140,14 @@ #dokuwiki__pagetools ul li a.action.top { float: right; } +#IE7 #dokuwiki__pagetools ul { + position: relative;; +} +#IE7 #dokuwiki__pagetools ul li a.action.top { + position: absolute; + top: 0; + right: 0; +} /* sidebar @@ -266,6 +283,10 @@ font-size: 90%; } +#IE6 input.button, #IE6 button, +#IE7 input.button, #IE7 button { + line-height: 1.4; +} /*____________ JS popup ____________*/ @@ -289,10 +310,16 @@ .dokuwiki .wrapper { margin-bottom: 2.8em; } +#IE6 .dokuwiki .wrapper { + margin-bottom: 1.4em; +} #dokuwiki__footer { margin-bottom: 1em; } +#IE7 #dokuwiki__footer { + height: 1%; +} #dokuwiki__footer .doc { float: left; } diff --git a/css/structure.css b/css/structure.css index 41e446e12..7b188dbd6 100644 --- a/css/structure.css +++ b/css/structure.css @@ -22,14 +22,23 @@ body { #dokuwiki__header .headings { float: left; } + #IE6 #dokuwiki__header .headings { + width: 50%; + } #dokuwiki__header .tools { float: right; text-align: right; } + #IE6 #dokuwiki__header .tools { + width: 50%; + } #dokuwiki__site .wrapper { position: relative; - zoom: 1; /* @todo: IE */ +} +#IE6 #dokuwiki__site .wrapper, +#IE7 #dokuwiki__site .wrapper { + height: 1%; } /* show sidebar only in show mode */ @@ -41,7 +50,6 @@ body { float: left; position: relative; display: block; - zoom: 1; /* @todo: IE */ } #dokuwiki__aside .pad { margin: 0 1.5em 0 0; |