refs #1668 : removed - IE6 / IE specific conditional tags / CSSes.

-
Needlworks · Dec 12, 2014 · 5715522 · 5715522
1 parent 31ac5ef
commit 5715522
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/interface/common/control/header.php b/interface/common/control/header.php
@@ -404,8 +404,7 @@
 foreach($blogTopMenuItem as $menuItem) {
 ?>
 						<li id="menu-<?php echo $menuItem['menu'];?>"<?php echo $menuItem['menu']==$blogMenu['topMenu'] ? ' class="selected"' : '';?>>
-							<a href="<?php echo $context->getProperty('uri.blog').$menuItem['link'];?>" class="menu-name"><span><?php echo $menuItem['title'];?></span><!--[if gte IE 7]><!--></a><!--<![endif]-->
-							<!--[if lte IE 6]><table><tr><td><![endif]-->							
+							<a href="<?php echo $context->getProperty('uri.blog').$menuItem['link'];?>" class="menu-name"><span><?php echo $menuItem['title'];?></span></a>
 							<ul id="submenu-<?php echo $menuItem['menu'];?>" class="sub-menu">
 <?php
 	$firstChildClass = ' firstChild';
@@ -479,7 +478,6 @@
 	}
 ?>
 							</ul>
-							<!--[if lte IE 6]></td></tr></table></a><![endif]-->
 						</li>
 <?php
 }

diff --git a/interface/common/owner/header.php b/interface/common/owner/header.php
@@ -437,8 +437,7 @@
 foreach($blogTopMenuItem as $menuItem) {
 ?>
 						<li id="menu-<?php echo $menuItem['menu'];?>"<?php echo $menuItem['menu']==$blogMenu['topMenu'] ? ' class="selected"' : '';?>>
-							<a href="<?php echo $context->getProperty('uri.blog').$menuItem['link'];?>" class="menu-name"><span><?php echo $menuItem['title'];?></span><!--[if gte IE 7]><!--></a><!--<![endif]-->
-							<!--[if lte IE 6]><table><tr><td><![endif]-->							
+							<a href="<?php echo $context->getProperty('uri.blog').$menuItem['link'];?>" class="menu-name"><span><?php echo $menuItem['title'];?></span></a>
 							<ul id="submenu-<?php echo $menuItem['menu'];?>" class="sub-menu">
 <?php
 	$firstChildClass = ' firstChild';
@@ -515,7 +514,6 @@
 	}
 ?>
 							</ul>
-							<!--[if lte IE 6]></td></tr></table></a><![endif]-->
 						</li>
 <?php
 }

diff --git a/resources/control/basic.css b/resources/control/basic.css
@@ -93,9 +93,9 @@ h3
 input
 {
 	font-family                      : 'Lucida Grande', Arial, AppleGothic, '굴림', Gulim, Tahoma, Verdana, sans-serif;
-	background                       : -webkit-gradient(linear, left top, 0 10, from(#eee), to(#fff)); 
- 	-webkit-background-origin        : padding-box; 
- 	-webkit-background-clip          : content-box; 
+	background                       : -webkit-gradient(linear, left top, 0 10, from(#eee), to(#fff));
+ 	-webkit-background-origin        : padding-box;
+ 	-webkit-background-clip          : content-box;
 }
 
 label
@@ -215,7 +215,7 @@ textarea
 	top                              : 15px;
 }
 
-#main-action li 
+#main-action li
 {
 	float                            : left;
 	display                          : block;
@@ -341,21 +341,20 @@ textarea
 	color                            : #FAFAA0;
 }
 
-#main-menu ul.sub-menu 
+#main-menu ul.sub-menu
 {
 	display                          : none;
 	border                           : none;
 }
 
-#main-menu li:hover ul,
-#main-menu li a:hover table
+#main-menu li:hover ul
 {
 	display                          : block !important;
 	width                            : 150px;
 	color                            : #222;
     position                         : absolute;
 	z-index                          : 100 !important;
-	top                              : 40px; 
+	top                              : 40px;
 	left                             : 0;
 	border                           : solid 1px #CCC;
 	background-color                 : #EEE;
@@ -1132,7 +1131,7 @@ table.data-inbox tbody tr td.inactive-class
 
 #layout-footer div
 {
-	display                          : block; 
+	display                          : block;
 }
 
 /* Etc *******************************************************************************************/

diff --git a/skin/admin/canon/basic.css b/skin/admin/canon/basic.css
@@ -426,8 +426,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7d7e7d', end
 	border                           : none;
 }
 
-#main-menu li:hover ul,
-#main-menu li a:hover table
+#main-menu li:hover ul
 {
 	display                          : block;
 	border                           : none;
@@ -445,8 +444,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7d7e7d', end
 	box-shadow                  : 0 3px 3px rgba(0, 0, 0, 0.3), 0 0 1px rgba(0,0,0,0.2);
 }
 
-#main-menu li:hover .sub-menu,
-#main-menu li a:hover table
+#main-menu li:hover .sub-menu
 {
 	display                          : block !important;
 	top                              : 35px;