adrian
/
tcm-in-guestrow-tpl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

removed IE6-specific code

master
Anika Henke 12 years ago
parent
7d3d6aec8e
commit
e000c618e1
6 changed files with 11 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      css/basic.css
  2. 13
      css/design.css
  3. 10
      css/structure.css
  4. 4
      detail.php
  5. 6
      main.php
  6. 4
      mediamanager.php

6
css/basic.css
View File

@ -261,6 +261,8 @@ iframe {
} }
/* IE8 and below won't display the images otherwise */ /* IE8 and below won't display the images otherwise */
#IE7 img,
#IE8 img,
button img { button img {
max-width: none; max-width: none;
} }
@ -410,8 +412,6 @@ button {
overflow: visible; overflow: visible;
padding: .1em .4em; padding: .1em .4em;
} }
#IE6 .dokuwiki input.button,
#IE6 .dokuwiki button,
#IE7 .dokuwiki input.button, #IE7 .dokuwiki input.button,
#IE7 .dokuwiki button { #IE7 .dokuwiki button {
line-height: 1.4; line-height: 1.4;
@ -469,4 +469,4 @@ div.clearer {
[dir=rtl] .a11y { [dir=rtl] .a11y {
left: auto; left: auto;
right: -99999em; right: -99999em;
}
}

13
css/design.css
View File

@ -120,9 +120,6 @@
max-width: __site_width__; max-width: __site_width__;
padding: 0 1em; padding: 0 1em;
} }
#IE6 #dokuwiki__usertools ul {
width: 100%;
}
#dokuwiki__usertools ul li.user { #dokuwiki__usertools ul li.user {
float: left; float: left;
margin-left: 0; margin-left: 0;
@ -143,9 +140,6 @@
width: 100%; width: 100%;
z-index: 10; z-index: 10;
} }
#IE6 #dokuwiki__content {
margin-bottom: 1.4em;
}
#dokuwiki__pagetools ul li { #dokuwiki__pagetools ul li {
display: inline; display: inline;
margin: 0 1.5em 0 0; margin: 0 1.5em 0 0;
@ -156,17 +150,14 @@
[dir=rtl] #dokuwiki__pagetools ul li a.action.top { [dir=rtl] #dokuwiki__pagetools ul li a.action.top {
float: left; float: left;
} }
#IE6 #dokuwiki__pagetools ul,
#IE7 #dokuwiki__pagetools ul { #IE7 #dokuwiki__pagetools ul {
position: relative; position: relative;
} }
#IE6 #dokuwiki__pagetools ul li a.action.top,
#IE7 #dokuwiki__pagetools ul li a.action.top { #IE7 #dokuwiki__pagetools ul li a.action.top {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
} }
[dir=rtl] #IE6 #dokuwiki__pagetools ul li a.action.top,
[dir=rtl] #IE7 #dokuwiki__pagetools ul li a.action.top { [dir=rtl] #IE7 #dokuwiki__pagetools ul li a.action.top {
right: auto; right: auto;
left: 0; left: 0;
@ -251,14 +242,10 @@
.dokuwiki .wrapper { .dokuwiki .wrapper {
margin-bottom: 2.8em; margin-bottom: 2.8em;
} }
#IE6 .dokuwiki .wrapper {
margin-bottom: 1.4em;
}
#dokuwiki__footer { #dokuwiki__footer {
margin-bottom: 1em; margin-bottom: 1em;
} }
#IE6 #dokuwiki__footer,
#IE7 #dokuwiki__footer { #IE7 #dokuwiki__footer {
height: 1%; height: 1%;
} }

10
css/structure.css
View File

@ -26,9 +26,6 @@ body {
float: right; float: right;
} }
#IE6 #dokuwiki__header .headings {
width: 50%;
}
#dokuwiki__header .tools { #dokuwiki__header .tools {
float: right; float: right;
text-align: right; text-align: right;
@ -38,14 +35,9 @@ body {
text-align: left; text-align: left;
} }
#IE6 #dokuwiki__header .tools {
width: 50%;
}
#dokuwiki__site .wrapper { #dokuwiki__site .wrapper {
position: relative; position: relative;
} }
#IE6 #dokuwiki__site .wrapper,
#IE7 #dokuwiki__site .wrapper { #IE7 #dokuwiki__site .wrapper {
height: 1%; height: 1%;
} }
@ -89,4 +81,4 @@ body {
clear: both; clear: both;
} }
#dokuwiki__footer > .pad { #dokuwiki__footer > .pad {
}
}

4
detail.php
View File

@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die();
</head> </head>
<body> <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"> <div id="dokuwiki__detail" class="dokuwiki">
<?php html_msgarea() ?> <?php html_msgarea() ?>
@ -92,7 +92,7 @@ if (!defined('DOKU_INC')) die();
<?php } ?> <?php } ?>
</div> </div>
<!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]-->
<!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
</body> </body>
</html> </html>

6
main.php
View File

@ -28,8 +28,8 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
<body> <body>
<?php /* with these Conditional Comments you can better address IE issues in CSS files, <?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 /* 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, <?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></div><!-- /site -->
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> <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> </body>
</html> </html>

4
mediamanager.php
View File

@ -27,7 +27,7 @@ if (!defined('DOKU_INC')) die();
</head> </head>
<body> <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"> <div id="media__manager" class="dokuwiki">
<?php html_msgarea() ?> <?php html_msgarea() ?>
<div id="mediamgr__aside"><div class="pad"> <div id="mediamgr__aside"><div class="pad">
@ -43,6 +43,6 @@ if (!defined('DOKU_INC')) die();
<?php tpl_mediaContent() ?> <?php tpl_mediaContent() ?>
</div></div> </div></div>
</div> </div>
<!--[if ( IE 6 | IE 7 | IE 8 ) ]></div><![endif]-->
<!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]-->
</body> </body>
</html> </html>
Write Preview
Loading…
Cancel
Save