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 f2455b8 commit 9b1b82aaf698364ba6dad976fd2374fc9835ee3a
Showing with 82 additions and 42 deletions.
  1. +1 −1 css/mnml-blog_print.css
  2. +0 −41 css/mnml-blog_screen.css
  3. +78 −0 css/mnml-blog_screen_iehacks.css
  4. +1 −0 detail.php
  5. +1 −0 main.php
  6. +1 −0 mediamanager.php
@@ -54,7 +54,7 @@ a.interwiki.text:after, a.interwiki:after {
.dokuwiki a.interwiki {
padding-left: 0 !important;
padding-right: 0 !important;
background: none:
background: none;
}
@@ -94,10 +94,6 @@ h6 {
.dokuwiki div.page h3:first-child {
margin-top: 0 !important;
}
* html .dokuwiki div#tmpl_sidebar {
padding-top: 28px; /* fix MSIE 6 - if we can't kill the top margin of
headlines, we move the sidebar. Better than nothing. */
}
/* blog posting and sidebar block headlines */
.dokuwiki .hspec {
@@ -122,7 +118,6 @@ legend {
}
legend {
text-align: left; /* needed for webkit browsers */
#font-family: Arial,Helvetica,'Liberation Sans',sans-serif; /* fix MSIE 6/7 */
}
/* basic margins and paddings */
@@ -272,10 +267,6 @@ code {
background-color: transparent !important;
font-size: 0.857em; /* 12px (base 14px) */
}
* html pre,
* html code {
width: 100%; /* fix MSIE 6 */
}
blockquote {
padding: 0 0.75em;
border: solid __border__;
@@ -495,9 +486,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;
@@ -551,9 +539,6 @@ div#pagewrap {
min-width: 890px; /* = min width of 950px cause of 2*30px padding */
max-width: 1000px; /* = max width of 1060px cause of 2*30px padding */
}
* html div#pagewrap {
width: 890px; /* fix MSIE 6 */
}
#tmpl_header {
width: 100%;
@@ -604,7 +589,6 @@ div#pagewrap {
float: left;
border-right: 1px solid #333;
list-style: none;
background-color: #000; /* fix MSIE 6 */
margin: 0;
}
#tmpl_header #tmpl_header_nav ul li.level1 div {
@@ -628,9 +612,6 @@ div#pagewrap {
float: right;
padding-top: 10px;
}
#tmpl_header #tmpl_header_nav #tmpl_header_nav_search {
padding-top: 13px\9; /* Fix MSIE 6,7,8 */
}
#tmpl_header #tmpl_header_nav #tmpl_header_nav_search input.edit {
padding: 1px 2px;
width: 85px;
@@ -808,7 +789,6 @@ div#pagewrap {
font-size: 70%;
color: __text_neu__;
text-align: center;
#zoom: 1; /* fix MSIE 6/7 */
}
#tmpl_footer #tmpl_footer_actlinksleft {
float: left;
@@ -1024,10 +1004,6 @@ div#pagewrap.admin div#tmpl_sidebar {
.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;
}
@@ -1143,9 +1119,6 @@ div.insitu-footnote {
padding: 2px 7px 2px 10px;
font-size: 0.857em; /* 12px, base 14px (see ".dokuwiki") */
}
* html div.insitu-footnote {
width: 40%; /* fix MSIE6 */
}
.dokuwiki div.footnotes {
font-size: 0.857em; /* 12px, base 14px (see ".dokuwiki") */
border-top: 1px dotted #606060;
@@ -1171,7 +1144,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] {
@@ -1180,10 +1152,6 @@ div.insitu-footnote {
border: 0;
padding: 0;
}
* html .dokuwiki input.button,
* html .dokuwiki button.button {
height: 28px; /* fix MSIE 6 */
}
@@ -1227,9 +1195,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;
font-size: 0.813em; /* 13px, base 16px */
@@ -1240,11 +1205,6 @@ div.picker button.pickerbutton {
border: 0;
background-color: #ebebeb;
}
.dokuwiki #wiki__editbar .editButtons,
.dokuwiki #wiki__editbar .summary {
#display: block; /* Fix MSIE 6, 7 */
#margin-top: 25px;
}
@@ -1615,7 +1575,6 @@ div#pagewrap.admin #blogtng__tags {
/* 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,78 @@
/******************************************************************************
******************************** 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. */
* html .dokuwiki div#tmpl_sidebar {
padding-top: 28px; /* fix MSIE 6 - if we can't kill the top margin of
headlines, we move the sidebar. Better than nothing. */
}
legend {
#font-family: Arial,Helvetica,'Liberation Sans',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 */
}
* html div#pagewrap {
width: 890px; /* fix MSIE 6 */
}
#tmpl_header #tmpl_header_nav ul li.level1 {
background-color: #000; /* fix MSIE 6 */
}
#tmpl_header #tmpl_header_nav #tmpl_header_nav_search {
padding-top: 13px\9; /* Fix MSIE 6,7,8 */
}
#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 */
}
* html div.insitu-footnote {
width: 40%; /* fix MSIE6 */
}
.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 */
}
.dokuwiki #wiki__editbar .editButtons,
.dokuwiki #wiki__editbar .summary {
#display: block; /* Fix MSIE 6, 7 */
#margin-top: 25px;
}
/* bureaucracy plugin */
.dokuwiki form.bureaucracy__plugin fieldset {
border-style: solid\9; /* fix MSIE 6/7/8 */
}
@@ -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/mnml-blog_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>
@@ -181,6 +181,7 @@ function _mnmlblog_renderBoxes($arr)
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/mnml-blog_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>
@@ -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/mnml-blog_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 9b1b82a

Please sign in to comment.