WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Twenty Twelve style updates, props drewstrojny. See #19978. 

And, use a simpler and more consistent `site-header` class value. Props iandstewart.


git-svn-id: http://svn.automattic.com/wordpress/trunk@19958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
lancewillett 2012-02-21 06:14:51 +00:00
parent 0188837271
commit 285fd9bc55
2 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-content/themes/twentytwelve/header.php
View File

@ -34,7 +34,7 @@ wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
<body <?php body_class(); ?>> <body <?php body_class(); ?>>
<div id="page" class="hfeed"> <div id="page" class="hfeed">
<header id="masthead" role="banner"> <header id="masthead" class="site-header" role="banner">
<hgroup> <hgroup>
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2> <h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>

120
wp-content/themes/twentytwelve/style.css
View File

@ -120,9 +120,9 @@ img {
.all-caps-title { .all-caps-title {
text-transform: uppercase; text-transform: uppercase;
font-weight: 400; font-weight: 400;
font-size: 13px; font-size: 12px;
font-size: 0.928571429rem; font-size: 0.857142857rem;
line-height: 1.846153846; line-height: 2;
} }
/* scaffolding.css.scss /* scaffolding.css.scss
@ -145,10 +145,10 @@ body {
a { a {
outline: none; outline: none;
color: #177095; color: #13609e;
} }
a:hover { a:hover {
color: #092e3d; color: #082943;
} }
.skip-link, .skip-link,
@ -178,7 +178,6 @@ Page structure
#page:after { #page:after {
clear: both; clear: both;
} }
} }
#primary { #primary {
@ -190,6 +189,7 @@ Page structure
float: left; float: left;
width: 65.104166667%; width: 65.104166667%;
} }
}
@media screen and (min-width: 600px) { @media screen and (min-width: 600px) {
body.full-width #primary { body.full-width #primary {
@ -206,55 +206,53 @@ Page structure
float: right; float: right;
width: 26.041666667%; width: 26.041666667%;
} }
} }
/*--------------------------------------------------------- /*---------------------------------------------------------
Header Header
------------------------------------------------------------ */ ------------------------------------------------------------ */
header#masthead { .site-header {
padding: 24px 0; padding: 24px 0;
padding: 1.714285714rem 0; padding: 1.714285714rem 0;
} }
header#masthead hgroup h1, .site-header hgroup h1,
header#masthead hgroup h2 { .site-header hgroup h2 {
text-align: center; text-align: center;
} }
@media screen and (min-width: 600px) { @media screen and (min-width: 600px) {
header#masthead hgroup h1, .site-header hgroup h1,
header#masthead hgroup h2 { .site-header hgroup h2 {
text-align: left; text-align: left;
} }
} }
header#masthead hgroup h1 a, .site-header hgroup h1 a,
header#masthead hgroup h2 a { .site-header hgroup h2 a {
color: #444444; color: #444444;
text-decoration: none; text-decoration: none;
} }
header#masthead hgroup h1 a:hover, .site-header hgroup h1 a:hover,
header#masthead hgroup h2 a:hover { .site-header hgroup h2 a:hover {
color: #177095; color: #13609e;
text-decoration: underline; text-decoration: underline;
} }
header#masthead hgroup h1 { .site-header hgroup h1 {
font-size: 24px; font-size: 24px;
font-size: 1.714285714rem; font-size: 1.714285714rem;
line-height: 2; line-height: 2;
} }
@media screen and (min-width: 600px) { @media screen and (min-width: 600px) {
header#masthead hgroup h1 { .site-header hgroup h1 {
font-size: 30px; font-size: 26px;
font-size: 2.142857143rem; font-size: 1.857142857rem;
line-height: 1.6; line-height: 1.846153846;
} }
} }
header#masthead hgroup h2 { .site-header hgroup h2 {
font-weight: normal; font-weight: normal;
font-size: 13px; font-size: 13px;
font-size: 0.928571429rem; font-size: 0.928571429rem;
line-height: 1.846153846; line-height: 1.846153846;
color: #777777;
} }
/*--------------------------------------------------------- /*---------------------------------------------------------
@ -280,7 +278,6 @@ nav[role="navigation"] {
column-gap: 0.714285714rem; column-gap: 0.714285714rem;
text-align: center; text-align: center;
} }
} }
nav[role="navigation"] ul { nav[role="navigation"] ul {
margin: 0; margin: 0;
@ -299,7 +296,6 @@ nav[role="navigation"] li {
nav[role="navigation"] li { nav[role="navigation"] li {
display: list-item; display: list-item;
} }
} }
nav[role="navigation"] li a { nav[role="navigation"] li a {
color: #444444; color: #444444;
@ -369,6 +365,12 @@ div#secondary aside li {
font-size: 0.928571429rem; font-size: 0.928571429rem;
line-height: 1.846153846; line-height: 1.846153846;
} }
div#secondary aside a {
color: #777777;
}
div#secondary aside a:hover {
color: #13609e;
}
/*--------------------------------------------------------- /*---------------------------------------------------------
Footer Footer
@ -402,7 +404,7 @@ footer[role="contentinfo"] a {
color: #686868; color: #686868;
} }
footer[role="contentinfo"] a:hover { footer[role="contentinfo"] a:hover {
color: #177095; color: #13609e;
} }
/* index.css.scss /* index.css.scss
@ -412,47 +414,42 @@ footer[role="contentinfo"] a:hover {
Basic post styling Basic post styling
------------------------------------------------------------ */ ------------------------------------------------------------ */
header.entry-header { header.entry-header {
margin-bottom: 42px; margin-bottom: 24px;
margin-bottom: 3rem; margin-bottom: 1.714285714rem;
} }
header.entry-header .entry-title { header.entry-header .entry-title {
font-size: 22px; font-size: 20px;
font-size: 1.571428571rem; font-size: 1.428571429rem;
line-height: 1.090909091; line-height: 1.2;
font-weight: normal;
} }
header.entry-header .entry-title a { header.entry-header .entry-title a {
text-decoration: none; text-decoration: none;
color: #444444;
}
header.entry-header .entry-title a:hover {
color: #177095;
} }
@media screen and (min-width: 600px) { @media screen and (min-width: 600px) {
header.entry-header .entry-title { header.entry-header .entry-title {
font-size: 20px; font-size: 22px;
font-size: 1.428571429rem; font-size: 1.571428571rem;
line-height: 1.2; line-height: 1.090909091;
} }
} }
header.entry-header .entry-format { header.entry-header .entry-format {
margin-top: 24px; margin-top: 24px;
margin-top: 1.714285714rem; margin-top: 1.714285714rem;
font-weight: normal; font-weight: normal;
} }
header.entry-header .entry-meta {
font-size: 11px;
font-size: 0.785714286rem;
line-height: 2.181818182;
color: #777777;
}
div.entry-meta { .entry-meta a {
margin-top: 6px; color: #777777;
margin-top: 0.428571429rem;
font-size: 12px;
font-size: 0.857142857rem;
line-height: 2;
} }
div.entry-meta a { .entry-meta a:hover {
color: #686868; color: #13609e;
}
div.entry-meta a:hover {
color: #177095;
} }
div.entry-content p { div.entry-content p {
@ -462,18 +459,27 @@ div.entry-content p {
} }
div#content article { div#content article {
padding-bottom: 48px; padding-bottom: 24px;
padding-bottom: 3.428571429rem; padding-bottom: 1.714285714rem;
margin-bottom: 48px; margin-bottom: 48px;
margin-bottom: 3.428571429rem; margin-bottom: 3.428571429rem;
border-bottom: 1px solid #ededed; border-bottom: 1px solid #ededed;
} }
div.page-links, div.page-links {
footer.entry-meta {
line-height: 1.714285714; line-height: 1.714285714;
} }
footer.entry-meta {
margin-top: 24px;
margin-top: 1.714285714rem;
font-size: 13px;
font-size: 0.928571429rem;
line-height: 1.846153846;
font-style: italic;
color: #777777;
}
/*--------------------------------------------------------- /*---------------------------------------------------------
Elements Elements
------------------------------------------------------------ */ ------------------------------------------------------------ */
@ -535,7 +541,7 @@ video {
/* archive.css.scss /* archive.css.scss
* Styling for the archive view * Styling for the archive view
* ------------------------------------------------------------------ */ * ------------------------------------------------------------------ */
#content.archive h1.archive-title { .archive #content h1.archive-title {
margin-bottom: 48px; margin-bottom: 48px;
margin-bottom: 3.428571429rem; margin-bottom: 3.428571429rem;
padding-bottom: 22px; padding-bottom: 22px;