Skip to content

Commit f2266fd

Browse files
andreashaerterandreashaerter
committed
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] <dokuwiki/dokuwiki#240>
1 parent 85fdb6b commit f2266fd

File tree

4 files changed

+72
-54
lines changed

4 files changed

+72
-54
lines changed

‎main.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@ function _monobook_renderButtons($arr)
532532
}
533533
}
534534
?>
535+
<!--[if lte IE 8]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/css/screen_iehacks.css" /><![endif]-->
535536
<!--[if lt IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE50Fixes.css" /><![endif]-->
536537
<!--[if IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE55Fixes.css" /><![endif]-->
537538
<!--[if IE 6]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE60Fixes.css" /><![endif]-->

‎mediamanager.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
}
8383
}
8484
?>
85+
<!--[if lte IE 8]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/css/screen_iehacks.css" /><![endif]-->
8586
<!--[if lt IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE50Fixes.css" /><![endif]-->
8687
<!--[if IE 5.5000]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE55Fixes.css" /><![endif]-->
8788
<!--[if IE 6]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>static/3rd/monobook/IE60Fixes.css" /><![endif]-->

‎static/css/screen.css

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -433,15 +433,13 @@ div.dokuwiki button.button {
433433
padding: 0.125em 0.4em;
434434
font-weight: normal;
435435
line-height: 1.333em;
436-
#line-height: 1em; /* fix MSIE 6, 7 */
437436
}
438437
div.dokuwiki button.toolbutton {
439438
height: 20px;
440439
width: 24px;
441440
padding: 1px 3px;
442441
line-height: 16px;
443442
text-align: center;
444-
height: 22px\9; /* fix MSIE 6, 7, 8 */
445443
}
446444
/* nice alphatransparency background except for IE <7 */
447445
html>body div.dokuwiki input.button,
@@ -1189,9 +1187,6 @@ html.popup body {
11891187
html.popup #media__manager {
11901188
min-height: 465px;
11911189
}
1192-
* html.popup #media__manager {
1193-
height: 465px; /* fix MSIE 6 */
1194-
}
11951190
html.popup #media__manager h1,
11961191
html.popup #media__manager h2,
11971192
html.popup #media__popup h1,
@@ -1370,52 +1365,3 @@ div.dokuwiki .section_highlight {
13701365
padding-left: 2px;
13711366
padding-right: 2px;
13721367
}
1373-
1374-
1375-
/******************************************************************************
1376-
********************* Browser Hacks and corrections **************************
1377-
******************************************************************************/
1378-
/* MSIE 7: renders the anchor in headlines in two lines?! */
1379-
*:first-child+html div#content .dokuwiki h1 a,
1380-
*:first-child+html div#content .dokuwiki h2 a,
1381-
*:first-child+html div#content .dokuwiki h3 a {
1382-
display: inline-block;
1383-
}
1384-
*:first-child+html div#content .dokuwiki h1 a {
1385-
padding-bottom: 2px;
1386-
}
1387-
*:first-child+html div#content .dokuwiki h2 a,
1388-
*:first-child+html div#content .dokuwiki h3 a {
1389-
padding-bottom: 1px;
1390-
}
1391-
/* MSIE 7: media manager */
1392-
*:first-child+html #mediamanager__page .panelContent li {
1393-
list-style: none !important;
1394-
list-style-image: none !important;
1395-
}
1396-
*:first-child+html #mediamanager__page .panelContent ul.thumbs dl {
1397-
margin-left: 0;
1398-
}
1399-
/* MSIE: fix textarea in admin menu (incl. jumping bug MSIE8) */
1400-
textarea,
1401-
.dokuwiki #dw__editform textarea.edit {
1402-
/* fix scrollbar flickers in IE8 standards mode, see
1403-
http://j.mp/bHExde and http://j.mp/ad7Abj for details */
1404-
width: 450px\9;
1405-
max-width: 100%\9;
1406-
min-width: 100%\9;
1407-
/* overwrite original monobook with fixes for IE6/7 */
1408-
#width: 100% !important;
1409-
border: auto;
1410-
}
1411-
/* MSIE 6/7: admin menu icons */
1412-
.dokuwiki ul.admin_tasks li div.li {
1413-
#font-weight: bold;
1414-
#border-left: 1px dashed __background__; /* invisible border triggers IE to render the stuff */
1415-
}
1416-
/* MSIE 6/7: take care about hiding the bottom border when tab is selected */
1417-
#p-cactions .selected,
1418-
#p-cactions .selected a,
1419-
#p-cactions .selected span {
1420-
#padding-bottom: 0.17em;
1421-
}

‎static/css/screen_iehacks.css

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/******************************************************************************
2+
******************************** ATTENTION *********************************
3+
DO NOT MODIFY THIS FILE, IT WILL NOT BE PRESERVED ON UPDATES!
4+
******************************************************************************
5+
If you want to add some own screen CSS, have a look at the README of this
6+
template and "/user/screen.css". You have been warned!
7+
*****************************************************************************/
8+
9+
/* This file get loaded by a conditional comment. The style.ini is not used as
10+
DokuWiki's internal CSS handling stumbles upon most of these Internet
11+
Explorer specific browser hacks and corrections. */
12+
13+
/* buttons */
14+
div.dokuwiki input.button,
15+
div.dokuwiki button.button {
16+
#line-height: 1em; /* fix MSIE 6, 7 */
17+
}
18+
19+
div.dokuwiki button.toolbutton {
20+
height: 22px\9; /* fix MSIE 6, 7, 8 */
21+
}
22+
/* media manager popup */
23+
* html.popup #media__manager {
24+
height: 465px; /* fix MSIE 6 */
25+
}
26+
/* MSIE 7: renders the anchor in headlines in two lines?! */
27+
*:first-child+html div#content .dokuwiki h1 a,
28+
*:first-child+html div#content .dokuwiki h2 a,
29+
*:first-child+html div#content .dokuwiki h3 a {
30+
display: inline-block;
31+
}
32+
*:first-child+html div#content .dokuwiki h1 a {
33+
padding-bottom: 2px;
34+
}
35+
*:first-child+html div#content .dokuwiki h2 a,
36+
*:first-child+html div#content .dokuwiki h3 a {
37+
padding-bottom: 1px;
38+
}
39+
/* MSIE 7: media manager */
40+
*:first-child+html #mediamanager__page .panelContent li {
41+
list-style: none !important;
42+
list-style-image: none !important;
43+
}
44+
*:first-child+html #mediamanager__page .panelContent ul.thumbs dl {
45+
margin-left: 0;
46+
}
47+
/* MSIE: fix textarea in admin menu (incl. jumping bug MSIE8) */
48+
textarea,
49+
.dokuwiki #dw__editform textarea.edit {
50+
/* fix scrollbar flickers in IE8 standards mode, see
51+
http://j.mp/bHExde and http://j.mp/ad7Abj for details */
52+
width: 450px\9;
53+
max-width: 100%\9;
54+
min-width: 100%\9;
55+
/* overwrite original monobook with fixes for IE6/7 */
56+
#width: 100% !important;
57+
border: auto;
58+
}
59+
/* MSIE 6/7: admin menu icons */
60+
.dokuwiki ul.admin_tasks li div.li {
61+
#font-weight: bold;
62+
#border-left: 1px dashed __background__; /* invisible border triggers IE to render the stuff */
63+
}
64+
/* MSIE 6/7: take care about hiding the bottom border when tab is selected */
65+
#p-cactions .selected,
66+
#p-cactions .selected a,
67+
#p-cactions .selected span {
68+
#padding-bottom: 0.17em;
69+
}
70+

0 commit comments

Comments
 (0)