Permalink
Browse files

Updates to support DokuWiki rc2013-10-28 "Binky"

The introduced LESS support [1] stumbled upon several CSS hacks for older
Internet Explorer versions. This commit puts these hacks in a separate file
which gets loaded by a simple conditional comment instead of the style.ini.
So only older MSIE clients but not DokuWiki itself gets faced with the hacks.

[1] <splitbrain/dokuwiki#240>
  • Loading branch information...
andreashaerter committed Nov 17, 2013
1 parent 85fdb6b commit f2266fda5ac479685942dfba79a1d4a61fb11ec2
Showing with 72 additions and 54 deletions.
  1. +1 −0 main.php
  2. +1 −0 mediamanager.php
  3. +0 −54 static/css/screen.css
  4. +70 −0 static/css/screen_iehacks.css
View
@@ -532,6 +532,7 @@ function _monobook_renderButtons($arr)
}
}
?>
<!--[if lte IE 8]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/css/screen_iehacks.css" /><![endif]-->
<!--[if lt IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE50Fixes.css" /><![endif]-->
<!--[if IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE55Fixes.css" /><![endif]-->
<!--[if IE 6]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE60Fixes.css" /><![endif]-->
View
@@ -82,6 +82,7 @@
}
}
?>
<!--[if lte IE 8]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/css/screen_iehacks.css" /><![endif]-->
<!--[if lt IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE50Fixes.css" /><![endif]-->
<!--[if IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE55Fixes.css" /><![endif]-->
<!--[if IE 6]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE60Fixes.css" /><![endif]-->
View
@@ -433,15 +433,13 @@ div.dokuwiki button.button {
padding: 0.125em 0.4em;
font-weight: normal;
line-height: 1.333em;
#line-height: 1em; /* fix MSIE 6, 7 */
}
div.dokuwiki button.toolbutton {
height: 20px;
width: 24px;
padding: 1px 3px;
line-height: 16px;
text-align: center;
height: 22px\9; /* fix MSIE 6, 7, 8 */
}
/* nice alphatransparency background except for IE <7 */
html>body div.dokuwiki input.button,
@@ -1189,9 +1187,6 @@ html.popup body {
html.popup #media__manager {
min-height: 465px;
}
* html.popup #media__manager {
height: 465px; /* fix MSIE 6 */
}
html.popup #media__manager h1,
html.popup #media__manager h2,
html.popup #media__popup h1,
@@ -1370,52 +1365,3 @@ div.dokuwiki .section_highlight {
padding-left: 2px;
padding-right: 2px;
}
/******************************************************************************
********************* Browser Hacks and corrections **************************
******************************************************************************/
/* MSIE 7: renders the anchor in headlines in two lines?! */
*:first-child+html div#content .dokuwiki h1 a,
*:first-child+html div#content .dokuwiki h2 a,
*:first-child+html div#content .dokuwiki h3 a {
display: inline-block;
}
*:first-child+html div#content .dokuwiki h1 a {
padding-bottom: 2px;
}
*:first-child+html div#content .dokuwiki h2 a,
*:first-child+html div#content .dokuwiki h3 a {
padding-bottom: 1px;
}
/* MSIE 7: media manager */
*:first-child+html #mediamanager__page .panelContent li {
list-style: none !important;
list-style-image: none !important;
}
*:first-child+html #mediamanager__page .panelContent ul.thumbs dl {
margin-left: 0;
}
/* MSIE: fix textarea in admin menu (incl. jumping bug MSIE8) */
textarea,
.dokuwiki #dw__editform textarea.edit {
/* fix scrollbar flickers in IE8 standards mode, see
http://j.mp/bHExde and http://j.mp/ad7Abj for details */
width: 450px\9;
max-width: 100%\9;
min-width: 100%\9;
/* overwrite original monobook with fixes for IE6/7 */
#width: 100% !important;
border: auto;
}
/* MSIE 6/7: admin menu icons */
.dokuwiki ul.admin_tasks li div.li {
#font-weight: bold;
#border-left: 1px dashed __background__; /* invisible border triggers IE to render the stuff */
}
/* MSIE 6/7: take care about hiding the bottom border when tab is selected */
#p-cactions .selected,
#p-cactions .selected a,
#p-cactions .selected span {
#padding-bottom: 0.17em;
}
@@ -0,0 +1,70 @@
/******************************************************************************
******************************** ATTENTION *********************************
DO NOT MODIFY THIS FILE, IT WILL NOT BE PRESERVED ON UPDATES!
******************************************************************************
If you want to add some own screen CSS, have a look at the README of this
template and "/user/screen.css". You have been warned!
*****************************************************************************/
/* This file get loaded by a conditional comment. The style.ini is not used as
DokuWiki's internal CSS handling stumbles upon most of these Internet
Explorer specific browser hacks and corrections. */
/* buttons */
div.dokuwiki input.button,
div.dokuwiki button.button {
#line-height: 1em; /* fix MSIE 6, 7 */
}
div.dokuwiki button.toolbutton {
height: 22px\9; /* fix MSIE 6, 7, 8 */
}
/* media manager popup */
* html.popup #media__manager {
height: 465px; /* fix MSIE 6 */
}
/* MSIE 7: renders the anchor in headlines in two lines?! */
*:first-child+html div#content .dokuwiki h1 a,
*:first-child+html div#content .dokuwiki h2 a,
*:first-child+html div#content .dokuwiki h3 a {
display: inline-block;
}
*:first-child+html div#content .dokuwiki h1 a {
padding-bottom: 2px;
}
*:first-child+html div#content .dokuwiki h2 a,
*:first-child+html div#content .dokuwiki h3 a {
padding-bottom: 1px;
}
/* MSIE 7: media manager */
*:first-child+html #mediamanager__page .panelContent li {
list-style: none !important;
list-style-image: none !important;
}
*:first-child+html #mediamanager__page .panelContent ul.thumbs dl {
margin-left: 0;
}
/* MSIE: fix textarea in admin menu (incl. jumping bug MSIE8) */
textarea,
.dokuwiki #dw__editform textarea.edit {
/* fix scrollbar flickers in IE8 standards mode, see
http://j.mp/bHExde and http://j.mp/ad7Abj for details */
width: 450px\9;
max-width: 100%\9;
min-width: 100%\9;
/* overwrite original monobook with fixes for IE6/7 */
#width: 100% !important;
border: auto;
}
/* MSIE 6/7: admin menu icons */
.dokuwiki ul.admin_tasks li div.li {
#font-weight: bold;
#border-left: 1px dashed __background__; /* invisible border triggers IE to render the stuff */
}
/* MSIE 6/7: take care about hiding the bottom border when tab is selected */
#p-cactions .selected,
#p-cactions .selected a,
#p-cactions .selected span {
#padding-bottom: 0.17em;
}

0 comments on commit f2266fd

Please sign in to comment.