Twenty Thirteen: remove `hgroup` from the theme markup structure since it's been dropped from HTML5 spec. Props obenland for the starter patch. Fixes #24114.

git-svn-id: http://core.svn.wordpress.org/trunk@24072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Lance Willett 2013-04-23 17:55:55 +00:00
parent 89d7585b30
commit 8492d3b680
5 changed files with 14 additions and 19 deletions

View File

@ -34,7 +34,7 @@ Styles for older IE versions (previous to IE9).
left: 100%; left: 100%;
} }
.site-header hgroup { .site-header .home-link {
max-width: 1040px; max-width: 1040px;
} }

View File

@ -39,11 +39,9 @@ $html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
<body <?php body_class(); ?>> <body <?php body_class(); ?>>
<div id="page" class="hfeed site"> <div id="page" class="hfeed site">
<header id="masthead" class="site-header" role="banner"> <header id="masthead" class="site-header" role="banner">
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"> <a class="home-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<hgroup>
<h1 class="site-title"><?php bloginfo( 'name' ); ?></h1> <h1 class="site-title"><?php bloginfo( 'name' ); ?></h1>
<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2> <h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
</hgroup>
</a> </a>
<div id="navbar" class="navbar"> <div id="navbar" class="navbar">

View File

@ -103,7 +103,7 @@ function twentythirteen_header_style() {
<?php <?php
if ( empty( $header_image ) ) : if ( empty( $header_image ) ) :
?> ?>
.site-header hgroup { .site-header .home-link {
min-height: 0; min-height: 0;
} }
<?php <?php
@ -141,7 +141,7 @@ function twentythirteen_admin_header_style() {
} ?> } ?>
padding: 0 20px; padding: 0 20px;
} }
#headimg .hgroup { #headimg .home-link {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
@ -195,7 +195,7 @@ function twentythirteen_admin_header_image() {
?> ?>
<div id="headimg" style="background: url(<?php header_image(); ?>) no-repeat scroll top; background-size: 1600px auto;"> <div id="headimg" style="background: url(<?php header_image(); ?>) no-repeat scroll top; background-size: 1600px auto;">
<?php $style = ' style="color:#' . get_header_textcolor() . ';"'; ?> <?php $style = ' style="color:#' . get_header_textcolor() . ';"'; ?>
<div class="hgroup"> <div class="home-link">
<h1 class="displaying-header-text"><a id="name"<?php echo $style; ?> onclick="return false;" href="#"><?php bloginfo( 'name' ); ?></a></h1> <h1 class="displaying-header-text"><a id="name"<?php echo $style; ?> onclick="return false;" href="#"><?php bloginfo( 'name' ); ?></a></h1>
<h2 id="desc" class="displaying-header-text"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></h2> <h2 id="desc" class="displaying-header-text"<?php echo $style; ?>><?php bloginfo( 'description' ); ?></h2>
</div> </div>

View File

@ -22,13 +22,13 @@
value.bind( function( to ) { value.bind( function( to ) {
if ( 'blank' == to ) { if ( 'blank' == to ) {
if ( 'remove-header' == _wpCustomizeSettings.values.header_image ) if ( 'remove-header' == _wpCustomizeSettings.values.header_image )
$( '#masthead hgroup' ).css( 'min-height', '0' ); $( '.home-link' ).css( 'min-height', '0' );
$( '.site-title, .site-description' ).css( { $( '.site-title, .site-description' ).css( {
'clip': 'rect(1px, 1px, 1px, 1px)', 'clip': 'rect(1px, 1px, 1px, 1px)',
'position': 'absolute' 'position': 'absolute'
} ); } );
} else { } else {
$( '#masthead hgroup' ).css( 'min-height', '230px' ); $( '.home-link' ).css( 'min-height', '230px' );
$( '.site-title, .site-description' ).css( { $( '.site-title, .site-description' ).css( {
'clip': 'auto', 'clip': 'auto',
'color': to, 'color': to,

View File

@ -70,7 +70,6 @@ figcaption,
figure, figure,
footer, footer,
header, header,
hgroup,
nav, nav,
section, section,
summary { summary {
@ -807,16 +806,14 @@ img.wp-smiley,
position: relative; position: relative;
} }
.site-header hgroup { .site-header .home-link {
color: #141412;
display: block;
margin: 0 auto; margin: 0 auto;
max-width: 1080px; max-width: 1080px;
padding: 0 20px; padding: 0 20px;
min-height: 230px; min-height: 230px;
width: 100%; width: 100%;
}
.site-header a {
color: #141412;
text-decoration: none; text-decoration: none;
} }
@ -991,7 +988,7 @@ ul.nav-menu li:hover > ul,
z-index: 3; z-index: 3;
} }
.navbar-fixed #masthead .site-title { .navbar-fixed .site-title {
color: #141412; color: #141412;
} }
@ -3238,7 +3235,7 @@ footer.entry-meta {
background-image: none !important; background-image: none !important;
} }
.site-header hgroup { .site-header .home-link {
min-height: 0; min-height: 0;
max-width: none; max-width: none;
} }