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...
1 parent 7b183d7 commit 210e039aae7e4ae254126f22cf99bdfe297b3bbf @andreashaerter andreashaerter committed Nov 17, 2013
Showing with 55 additions and 23 deletions.
  1. +1 −1 css/prsnl10_print.css
  2. +0 −22 css/prsnl10_screen.css
  3. +51 −0 css/prsnl10_screen_iehacks.css
  4. +1 −0 detail.php
  5. +1 −0 main.php
  6. +1 −0 mediamanager.php
@@ -51,7 +51,7 @@ a.interwiki.text:after, a.interwiki:after {
.dokuwiki a.interwiki {
padding-left: 0 !important;
padding-right: 0 !important;
- background: none:
+ background: none;
}
#licenseinfo {
margin-top: 10px;
@@ -100,7 +100,6 @@ legend {
}
legend {
text-align: left; /* needed for webkit browsers */
- #font-family: 'Droid Sans','Liberation Sans',Arial,Helvetica,sans-serif; /* fix MSIE 6/7 */
}
/* basic margins and paddings */
@@ -249,10 +248,6 @@ pre,
code {
background-color: transparent !important;
}
-* html pre,
-* html code {
- width: 100%; /* fix MSIE 6 */
-}
blockquote {
padding: 0 0.75em;
border: solid #606060;
@@ -444,9 +439,6 @@ td[align="right"],
th[align="right"] {
text-align: right;
}
-.dokuwiki table.inline {
- #border: 1px solid #606060; /* fix MSIE 6/7 */
-}
.dokuwiki table.inline th,
.dokuwiki table.inline tr {
border: 1px solid #606060;
@@ -603,7 +595,6 @@ div#pagewrap {
font-size: 0.714em; /* 10px (base: 14px) */
color: __text_neu__;
text-align: center;
- #zoom: 1; /* fix MSIE 6/7 */
}
#tmpl_footer a,
#tmpl_footer a:link,
@@ -815,10 +806,6 @@ div#pagewrap.admin div#content {
.dokuwiki div.toc span.toc_close {
border-color: transparent;
}
-* html .dokuwiki div.toc span.toc_open,
-* html .dokuwiki div.toc span.toc_close {
- border-color: #fff; /* fix MSIE 6 */
-}
.dokuwiki div.toc span.toc_open {
border-top-color: __text__ !important;
}
@@ -957,7 +944,6 @@ div.insitu-footnote {
font-size: 10px !important;
padding: 5px 6px;
line-height: 1.333em;
- #line-height: 1em; /* fix MSIE 6, 7 */
}
.dokuwiki input.button[type=image],
.dokuwiki button.button[type=image] {
@@ -966,10 +952,6 @@ div.insitu-footnote {
border: 0;
padding: 0;
}
-* html .dokuwiki input.button,
-* html .dokuwiki button.button {
- height: 28px; /* fix MSIE 6 */
-}
@@ -1005,9 +987,6 @@ html>body button.toolbutton {
/* same font stack should be used for "pre, code, samp, kbd" and
".dokuwiki table.diff td" */
}
-* html .dokuwiki textarea.edit {
- width: 100%; /* fix MSIE 6 */
-}
div.picker {
background-color: #ebebeb;
}
@@ -1194,7 +1173,6 @@ html.popup #media__opts br {
/* bureaucracy */
.dokuwiki form.bureaucracy__plugin fieldset {
border: 1px dotted #606060;
- border-style: solid\9; /* fix MSIE 6/7/8 */
}
.dokuwiki form.bureaucracy__plugin label span,
.dokuwiki form.bureaucracy__plugin input.edit,
@@ -0,0 +1,51 @@
+/******************************************************************************
+ ******************************** 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. */
+
+legend {
+ #font-family: 'Droid Sans','Liberation Sans',Arial,Helvetica,sans-serif; /* fix MSIE 6/7 */
+}
+* html pre,
+* html code {
+ width: 100%; /* fix MSIE 6 */
+}
+
+.dokuwiki table.inline {
+ #border: 1px solid #606060; /* fix MSIE 6/7 */
+}
+#tmpl_footer {
+ #zoom: 1; /* fix MSIE 6/7 */
+}
+* html .dokuwiki div.toc span.toc_open,
+* html .dokuwiki div.toc span.toc_close {
+ border-color: #fff; /* fix MSIE 6 */
+}
+
+
+.dokuwiki input.button,
+.dokuwiki button.button {
+ #line-height: 1em; /* fix MSIE 6, 7 */
+}
+* html .dokuwiki input.button,
+* html .dokuwiki button.button {
+ height: 28px; /* fix MSIE 6 */
+}
+
+
+* html .dokuwiki textarea.edit {
+ width: 100%; /* fix MSIE 6 */
+}
+
+
+/* bureaucracy plugin */
+.dokuwiki form.bureaucracy__plugin fieldset {
+ border-style: solid\9; /* fix MSIE 6/7/8 */
+}
View
@@ -68,6 +68,7 @@
echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"".DOKU_TPL."user/user.js\"></script>\n";
}
?>
+<!--[if lte IE 8]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>css/prsnl10_screen_iehacks.css" /><![endif]-->
<!--[if lt IE 7]><style type="text/css">img, div { behavior: url(<?php echo DOKU_TPL; ?>js/iepngfix/iepngfix.htc); }</style><![endif]-->
</head>
View
@@ -104,6 +104,7 @@
echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"".DOKU_TPL."user/user.js\"></script>\n";
}
?>
+<!--[if lte IE 8]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>css/prsnl10_screen_iehacks.css" /><![endif]-->
<!--[if lt IE 7]><style type="text/css">img { behavior: url(<?php echo DOKU_TPL; ?>js/iepngfix/iepngfix.htc); }</style><![endif]-->
</head>
View
@@ -69,6 +69,7 @@
echo "<script type=\"text/javascript\" charset=\"utf-8\" src=\"".DOKU_TPL."user/user.js\"></script>\n";
}
?>
+<!--[if lte IE 8]><link rel="stylesheet" media="all" type="text/css" href="<?php echo DOKU_TPL; ?>css/prsnl10_screen_iehacks.css" /><![endif]-->
<!--[if lt IE 7]><style type="text/css">img { behavior: url(<?php echo DOKU_TPL; ?>js/iepngfix/iepngfix.htc); }</style><![endif]-->
</head>

0 comments on commit 210e039

Please sign in to comment.