Arreglado menú superior en IE.

git-svn-id: https://192.168.0.254/svn/Proyectos.OriginalHouse_Web/trunk@20 54e8636e-a86c-764f-903d-b964358a1ae2
This commit is contained in:
David Arranz 2011-07-12 08:46:00 +00:00
parent 9e9aecf1a2
commit 869eaa3d79
2 changed files with 46 additions and 44 deletions

View File

@ -1,48 +1,35 @@
<?php
global $woo_options;
//<div id="navigation-top" class="fr">
// < ? php
// if ( function_exists( 'has_nav_menu') && has_nav_menu( 'primary-menu' ) ) {
// wp_nav_menu( array( 'depth' => 6, 'sort_column' => 'menu_order', 'container' => 'ul', 'menu_id' => 'primary-nav', 'menu_class' => 'nav fr', 'theme_location' => 'primary-menu' ) );
// } else {
// ? >
// <ul id="primary-nav" class="nav fr">
//<?php
// if ( isset($woo_options[ 'woo_custom_nav_menu' ]) AND $woo_options[ 'woo_custom_nav_menu' ] == 'true' ) {
// if ( function_exists( 'woo_custom_navigation_output') )
// woo_custom_navigation_output();
// } else { ? >
//< ? php if ( is_page() ) $highlight = "page_item"; else $highlight = "page_item current_page_item"; ? >
// <li class="< ? php echo $highlight; ? >"><a href="< ? php bloginfo( 'url' ); ? >">< ? php _e( 'Home', 'woothemes' ); ? ></a></li>
//< ? php
// wp_list_pages( 'sort_column=menu_order&depth=6&title_li=&exclude=' );
// }
// ? >
// </ul><!-- /#nav -->
// < ? php } ? >
//</div>
?>
<div id="navigation-top" class="fr">
<?php if ( $woo_options[ 'woo_footer_social' ] == 'true' ) { ?>
<div class="social-icons fr">
<ul>
<?php if ( $woo_options[ 'woo_connect_twitter' ] != '' ) { ?>
<li class="twitter"><a href="<?php echo $woo_options[ 'woo_connect_twitter' ]; ?>"><?php _e( 'Twitter', 'woothemes' ); ?></a></li>
<?php } if ( $woo_options[ 'woo_connect_facebook' ] != '' ) { ?>
<li class="facebook"><a href="<?php echo $woo_options[ 'woo_connect_facebook' ]; ?>"><?php _e( 'Facebook', 'woothemes' ); ?></a></li>
<?php } if ( $woo_options[ 'woo_connect_blogger' ] != '' ) { ?>
<li class="blogger"><a href="<?php echo $woo_options[ 'woo_connect_blogger' ]; ?>"><?php _e( 'Blogger', 'woothemes' ); ?></a></li>
<?php } ?>
</ul>
</div>
<?php } ?>
<?php
if ( function_exists( 'has_nav_menu') && has_nav_menu( 'primary-menu' ) ) {
wp_nav_menu( array( 'depth' => 6, 'sort_column' => 'menu_order', 'container' => 'ul', 'menu_id' => 'primary-nav', 'menu_class' => 'nav fr', 'theme_location' => 'primary-menu' ) );
} else {
?>
<ul id="primary-nav" class="nav fr">
<?php
if ( isset($woo_options[ 'woo_custom_nav_menu' ]) AND $woo_options[ 'woo_custom_nav_menu' ] == 'true' ) {
if ( function_exists( 'woo_custom_navigation_output') )
woo_custom_navigation_output();
} else { ?>
<?php if ( is_page() ) $highlight = "page_item"; else $highlight = "page_item current_page_item"; ?>
<li class="<?php echo $highlight; ?>"><a href="<?php bloginfo( 'url' ); ?>"><?php _e( 'Home', 'woothemes' ); ?></a></li>
<?php
wp_list_pages( 'sort_column=menu_order&depth=6&title_li=&exclude=' );
}
?>
</ul><!-- /#nav -->
<?php } ?>
</div>
<div id="navigation">
<?php
if ( function_exists( 'has_nav_menu' ) && has_nav_menu('secondary-menu' ) ) {
wp_nav_menu( array( 'depth' => 6, 'sort_column' => 'menu_order', 'container' => 'ul', 'menu_id' => 'main-menu', 'menu_class' => 'nav fl','theme_location' => 'secondary-menu' ) );
if ( function_exists( 'has_nav_menu' ) && has_nav_menu('secondary-menu' ) ) {
wp_nav_menu( array( 'depth' => 6, 'sort_column' => 'menu_order', 'container' => 'ul', 'menu_id' => 'main-menu', 'menu_class' => 'nav fl','theme_location' => 'secondary-menu' ) );
} else {
?>
<ul id="main-nav" class="nav fl">
@ -59,6 +46,21 @@
?>
</ul><!-- /#nav -->
<?php } ?>
<?php if ( $woo_options[ 'woo_footer_social' ] == 'true' ) { ?>
<div class="social-icons fr">
<ul>
<?php if ( $woo_options[ 'woo_connect_twitter' ] != '' ) { ?>
<li class="twitter"><a href="<?php echo $woo_options[ 'woo_connect_twitter' ]; ?>"><?php _e( 'Twitter', 'woothemes' ); ?></a></li>
<?php } if ( $woo_options[ 'woo_connect_facebook' ] != '' ) { ?>
<li class="facebook"><a href="<?php echo $woo_options[ 'woo_connect_facebook' ]; ?>"><?php _e( 'Facebook', 'woothemes' ); ?></a></li>
<?php } if ( $woo_options[ 'woo_connect_blogger' ] != '' ) { ?>
<li class="blogger"><a href="<?php echo $woo_options[ 'woo_connect_blogger' ]; ?>"><?php _e( 'Blogger', 'woothemes' ); ?></a></li>
<?php } ?>
</ul>
</div>
<?php } ?>
</div><!-- /#navigation -->

View File

@ -172,7 +172,7 @@ h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {text-de
/* 2.1 Containers & Columns */
#wrapper { }
#main{ width:440px;padding:0;background:transparent;position:relative; z-index:2; height:590px;}
#main{ width:440px;padding:0;background:transparent;position:relative; z-index:2; height:550px;}
.layout-full #main, .col-full {width:960px; margin:0 auto;}
#main.fullwidth { width:960px; margin:0 auto; }
@ -196,7 +196,7 @@ h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {text-de
#navigation ul.rss li.sub-email {color:#dedede;}
#navigation ul.rss li a:hover{text-decoration:underline;}
.nav { z-index:99; margin:0; padding:0; list-style:none; line-height:1; position: relative; }
.nav { z-index:99; margin:0; padding:0; list-style:none; line-height:1; position: relative;}
.nav a { position:relative; color:#fff; display:block; z-index:100; padding:10px 15px; line-height:18px; text-decoration:none; }
.nav li { float:left; width: auto; }
.nav li a.sf-with-ul { padding-right:20px; }
@ -266,7 +266,7 @@ h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {text-de
#navigation .nav li ul li:last-child a { border-bottom:none; }
#navigation-top { height: 40px; background: #181818; font-size: 20px; letter-spacing: 1px; text-transform: uppercase;}
#navigation-top { height: 40px; background: #181818; font-size: 20px; letter-spacing: 1px; text-transform: uppercase; }
#navigation-top .nav li a { color: #7f7875; font-weight:normal; border-left:1px solid #000;}
#navigation-top .nav li a:hover { background: none; color: #fff; }
#navigation-top .nav li:first-child a { border-left:none; }
@ -293,7 +293,7 @@ h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {text-de
#navigation-top .nav li ul a { border: none; font-size: 12px; padding: 8px 12px; font-size: 11px; }
#navigation-top .nav li ul a:hover { padding: 8px 12px; }
#primary-nav { z-index:100; }
#primary-nav { z-index:100;}
/* 2.2.2 Top Navigation (optional) */
#top { background: #000; }
@ -362,13 +362,13 @@ h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover {text-de
#header .tool-icons li span {display: none;}
#header-left .social-icons { margin-top: 25px; }
#navigation-top .social-icons { margin-top: 5px; }
.social-icons { margin-top: 5px; }
.social-icons li {float:left; height: 30px;}
.social-icons li.facebook {background: url(images/ico-facebook-footer.png) no-repeat left center;}
.social-icons li.twitter {background: url(images/ico-twitter-footer.png) no-repeat left center;;}
.social-icons li.blogger {background: url(images/ico-blogger-footer.png) no-repeat left center;;}
.social-icons li a {padding: 2px 20px 0px 35px; display: block; color: #999; text-transform: uppercase;}
.social-icons li a {padding: 2px 10px 0px 35px; display: block; color: #999; text-transform: uppercase;}
.social-icons li a:hover {text-decoration: none; color: #fff}