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

Merge twentyten print style into style.css. Fixes #12733. Props demetris. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
iammattthomas 2010-03-29 00:48:03 +00:00
parent 513e965bc0
commit 0fe0c542ec
3 changed files with 94 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-content/themes/twentyten/header.php
View File

@ -2,8 +2,9 @@
<html <?php language_attributes(); ?>> <html <?php language_attributes(); ?>>
<head> <head>
<meta charset="<?php bloginfo( 'charset' ); ?>" /> <meta charset="<?php bloginfo( 'charset' ); ?>" />
<title><?php <title><?php
if ( is_single() ) { // Returns the title based on the type of page being viewed
if ( is_single() ) {
single_post_title(); echo ' | '; bloginfo( 'name' ); single_post_title(); echo ' | '; bloginfo( 'name' );
} elseif ( is_home() || is_front_page() ) { } elseif ( is_home() || is_front_page() ) {
bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); twentyten_the_page_number(); bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); twentyten_the_page_number();
@ -16,10 +17,9 @@
} else { } else {
wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number(); wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
} }
?></title> ?></title>
<link rel="profile" href="http://gmpg.org/xfn/11" /> <link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" /> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
<link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo( 'stylesheet_directory' ); ?>/print.css" />
<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?> <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" /> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
<?php wp_head(); ?> <?php wp_head(); ?>

85
wp-content/themes/twentyten/print.css
View File

@ -1,85 +0,0 @@
/*
This stylesheet reformats the theme for the printed page.
*/
body {
background:none !important;
}
#wrapper {
float: none !important;
clear: both !important;
display: block !important;
position: relative !important;
}
#header {
border-bottom: 4pt solid #000;
padding-bottom: 18pt;
}
#site-title, #site-description {
float: none;
margin: 0;
}
#site-title {
font-size: 13pt;
}
.entry-content {
font-size: 14pt;
line-height: 1.6em;
}
.entry-title {
font-size: 21pt;
line-height: 1.4em;
}
#access,
#branding img,
#respond,
.comment-edit-link,
.edit-link,
.navigation,
.page-link,
.widget-area {
display: none !important;
}
#branding img.wp-post-image {
display: block !important;
margin-left: -104pt;
margin-top: 20pt;
border: none;
margin-bottom: -24pt;
}
#container, #header, #footer {
margin: 0 0 0 24%;
width: 70%;
}
#content {
margin: 24pt 0 0;
}
.wp-caption p {
font-size: 11pt;
}
#site-info,
#site-generator {
float: none;
width: auto;
}
#colophon {
width: auto;
}
img#wpstats {
display:none
}
#site-generator a {
padding: 0;
margin: 0;
}
#entry-author-info {
border: 1px solid #e7e7e7;
}
#main {
margin: 0;
width: auto;
padding: 0;
}
.home .sticky {
border: none;
}

89
wp-content/themes/twentyten/style.css
View File

@ -1199,3 +1199,92 @@ code {
#site-description { #site-description {
-webkit-text-size-adjust: none; -webkit-text-size-adjust: none;
} }
/* =Print Style
-------------------------------------------------------------- */
@media print {
body {
background:none !important;
}
#wrapper {
float: none !important;
clear: both !important;
display: block !important;
position: relative !important;
}
#header {
border-bottom: 4pt solid #000;
padding-bottom: 18pt;
}
#site-title, #site-description {
float: none;
margin: 0;
}
#site-title {
font-size: 13pt;
}
.entry-content {
font-size: 14pt;
line-height: 1.6em;
}
.entry-title {
font-size: 21pt;
line-height: 1.4em;
}
#access,
#branding img,
#respond,
.comment-edit-link,
.edit-link,
.navigation,
.page-link,
.widget-area {
display: none !important;
}
#branding img.wp-post-image {
display: block !important;
margin-left: -104pt;
margin-top: 20pt;
border: none;
margin-bottom: -24pt;
}
#container, #header, #footer {
margin: 0 0 0 24%;
width: 70%;
}
#content {
margin: 24pt 0 0;
}
.wp-caption p {
font-size: 11pt;
}
#site-info,
#site-generator {
float: none;
width: auto;
}
#colophon {
width: auto;
}
img#wpstats {
display:none
}
#site-generator a {
padding: 0;
margin: 0;
}
#entry-author-info {
border: 1px solid #e7e7e7;
}
#main {
margin: 0;
width: auto;
padding: 0;
}
.home .sticky {
border: none;
}
}