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,42 +1,29 @@
<?php <?php
global $woo_options; global $woo_options;
?>
<div id="navigation-top" class="fr"> //<div id="navigation-top" class="fr">
<?php if ( $woo_options[ 'woo_footer_social' ] == 'true' ) { ?> // < ? php
<div class="social-icons fr"> // if ( function_exists( 'has_nav_menu') && has_nav_menu( 'primary-menu' ) ) {
<ul> // wp_nav_menu( array( 'depth' => 6, 'sort_column' => 'menu_order', 'container' => 'ul', 'menu_id' => 'primary-nav', 'menu_class' => 'nav fr', 'theme_location' => 'primary-menu' ) );
<?php if ( $woo_options[ 'woo_connect_twitter' ] != '' ) { ?> // } else {
<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' ] != '' ) { ?> // <ul id="primary-nav" class="nav fr">
<li class="facebook"><a href="<?php echo $woo_options[ 'woo_connect_facebook' ]; ?>"><?php _e( 'Facebook', 'woothemes' ); ?></a></li> //<?php
<?php } if ( $woo_options[ 'woo_connect_blogger' ] != '' ) { ?> // if ( isset($woo_options[ 'woo_custom_nav_menu' ]) AND $woo_options[ 'woo_custom_nav_menu' ] == 'true' ) {
<li class="blogger"><a href="<?php echo $woo_options[ 'woo_connect_blogger' ]; ?>"><?php _e( 'Blogger', 'woothemes' ); ?></a></li> // if ( function_exists( 'woo_custom_navigation_output') )
<?php } ?> // woo_custom_navigation_output();
</ul> // } else { ? >
</div> //< ? php if ( is_page() ) $highlight = "page_item"; else $highlight = "page_item current_page_item"; ? >
<?php } ?> // <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>
<?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"> <div id="navigation">
@ -60,5 +47,20 @@
</ul><!-- /#nav --> </ul><!-- /#nav -->
<?php } ?> <?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 --> </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 */ /* 2.1 Containers & Columns */
#wrapper { } #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;} .layout-full #main, .col-full {width:960px; margin:0 auto;}
#main.fullwidth { width:960px; margin:0 auto; } #main.fullwidth { width:960px; margin:0 auto; }
@ -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 .tool-icons li span {display: none;}
#header-left .social-icons { margin-top: 25px; } #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 {float:left; height: 30px;}
.social-icons li.facebook {background: url(images/ico-facebook-footer.png) no-repeat left center;} .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.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.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} .social-icons li a:hover {text-decoration: none; color: #fff}