removed IE6-specific code
This commit is contained in:
parent
245aab3112
commit
aae6252e15
6 changed files with 9 additions and 30 deletions
|
|
@ -261,6 +261,8 @@ iframe {
|
|||
}
|
||||
|
||||
/* IE8 and below won't display the images otherwise */
|
||||
#IE7 img,
|
||||
#IE8 img,
|
||||
button img {
|
||||
max-width: none;
|
||||
}
|
||||
|
|
@ -410,8 +412,6 @@ button {
|
|||
overflow: visible;
|
||||
padding: .1em .4em;
|
||||
}
|
||||
#IE6 .dokuwiki input.button,
|
||||
#IE6 .dokuwiki button,
|
||||
#IE7 .dokuwiki input.button,
|
||||
#IE7 .dokuwiki button {
|
||||
line-height: 1.4;
|
||||
|
|
|
|||
|
|
@ -120,9 +120,6 @@
|
|||
max-width: __site_width__;
|
||||
padding: 0 1em;
|
||||
}
|
||||
#IE6 #dokuwiki__usertools ul {
|
||||
width: 100%;
|
||||
}
|
||||
#dokuwiki__usertools ul li.user {
|
||||
float: left;
|
||||
margin-left: 0;
|
||||
|
|
@ -143,9 +140,6 @@
|
|||
width: 100%;
|
||||
z-index: 10;
|
||||
}
|
||||
#IE6 #dokuwiki__content {
|
||||
margin-bottom: 1.4em;
|
||||
}
|
||||
#dokuwiki__pagetools ul li {
|
||||
display: inline;
|
||||
margin: 0 1.5em 0 0;
|
||||
|
|
@ -156,17 +150,14 @@
|
|||
[dir=rtl] #dokuwiki__pagetools ul li a.action.top {
|
||||
float: left;
|
||||
}
|
||||
#IE6 #dokuwiki__pagetools ul,
|
||||
#IE7 #dokuwiki__pagetools ul {
|
||||
position: relative;
|
||||
}
|
||||
#IE6 #dokuwiki__pagetools ul li a.action.top,
|
||||
#IE7 #dokuwiki__pagetools ul li a.action.top {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
}
|
||||
[dir=rtl] #IE6 #dokuwiki__pagetools ul li a.action.top,
|
||||
[dir=rtl] #IE7 #dokuwiki__pagetools ul li a.action.top {
|
||||
right: auto;
|
||||
left: 0;
|
||||
|
|
@ -251,14 +242,10 @@
|
|||
.dokuwiki .wrapper {
|
||||
margin-bottom: 2.8em;
|
||||
}
|
||||
#IE6 .dokuwiki .wrapper {
|
||||
margin-bottom: 1.4em;
|
||||
}
|
||||
|
||||
#dokuwiki__footer {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
#IE6 #dokuwiki__footer,
|
||||
#IE7 #dokuwiki__footer {
|
||||
height: 1%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,9 +26,6 @@ body {
|
|||
float: right;
|
||||
}
|
||||
|
||||
#IE6 #dokuwiki__header .headings {
|
||||
width: 50%;
|
||||
}
|
||||
#dokuwiki__header .tools {
|
||||
float: right;
|
||||
text-align: right;
|
||||
|
|
@ -38,14 +35,9 @@ body {
|
|||
text-align: left;
|
||||
}
|
||||
|
||||
#IE6 #dokuwiki__header .tools {
|
||||
width: 50%;
|
||||
}
|
||||
|
||||
#dokuwiki__site .wrapper {
|
||||
position: relative;
|
||||
}
|
||||
#IE6 #dokuwiki__site .wrapper,
|
||||
#IE7 #dokuwiki__site .wrapper {
|
||||
height: 1%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<!--[if IE 6 ]><div id="IE6"><![endif]--><!--[if IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
|
||||
<!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
|
||||
<div id="dokuwiki__detail" class="dokuwiki">
|
||||
<?php html_msgarea() ?>
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
|
|||
|
||||
<?php } ?>
|
||||
</div>
|
||||
<!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]-->
|
||||
<!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
6
main.php
6
main.php
|
|
@ -28,8 +28,8 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
|
|||
|
||||
<body>
|
||||
<?php /* with these Conditional Comments you can better address IE issues in CSS files,
|
||||
precede CSS rules by #IE6 for IE6, #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?>
|
||||
<!--[if IE 6 ]><div id="IE6"><![endif]--><!--[if IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
|
||||
precede CSS rules by #IE7 for IE7 and #IE8 for IE8 (div closes at the bottom) */ ?>
|
||||
<!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
|
||||
|
||||
<?php /* the "dokuwiki__top" id is needed somewhere at the top, because that's where the "back to top" button/link links to */ ?>
|
||||
<?php /* classes mode_<action> are added to make it possible to e.g. style a page differently if it's in edit mode,
|
||||
|
|
@ -170,6 +170,6 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
|
|||
</div></div><!-- /site -->
|
||||
|
||||
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
|
||||
<!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]-->
|
||||
<!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
|
|||
</head>
|
||||
|
||||
<body>
|
||||
<!--[if IE 6 ]><div id="IE6"><![endif]--><!--[if IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
|
||||
<!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
|
||||
<div id="media__manager" class="dokuwiki">
|
||||
<?php html_msgarea() ?>
|
||||
<div id="mediamgr__aside"><div class="pad">
|
||||
|
|
@ -43,6 +43,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');
|
|||
<?php tpl_mediaContent() ?>
|
||||
</div></div>
|
||||
</div>
|
||||
<!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]-->
|
||||
<!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue