<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13872] trunk/wp-content/themes/twentyten:
Merge twentyten print style into style.css.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13872">13872</a></dd>
<dt>Author</dt> <dd>iammattthomas</dd>
<dt>Date</dt> <dd>2010-03-29 00:48:03 +0000 (Mon, 29 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge twentyten print style into style.css. Fixes <a href="http://trac.wordpress.org/ticket/12733">#12733</a>. Props demetris.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenprintcss">trunk/wp-content/themes/twentyten/print.css</a></li>
<li><a href="#trunkwpcontentthemestwentytenstylecss">trunk/wp-content/themes/twentyten/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13871 => 13872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-03-28 11:28:25 UTC (rev 13871)
+++ trunk/wp-content/themes/twentyten/header.php 2010-03-29 00:48:03 UTC (rev 13872)
</span><span class="lines">@@ -2,8 +2,9 @@
</span><span class="cx"> <html <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><span class="cx"> <meta charset="<?php bloginfo( 'charset' ); ?>" />
</span><del>- <title><?php
- if ( is_single() ) {
</del><ins>+ <title><?php
+ // Returns the title based on the type of page being viewed
+ if ( is_single() ) {
</ins><span class="cx"> single_post_title(); echo ' | '; bloginfo( 'name' );
</span><span class="cx"> } elseif ( is_home() || is_front_page() ) {
</span><span class="cx"> bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); twentyten_the_page_number();
</span><span class="lines">@@ -16,10 +17,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
</span><span class="cx"> }
</span><del>- ?></title>
</del><ins>+ ?></title>
</ins><span class="cx"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><span class="cx"> <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
</span><del>- <link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo( 'stylesheet_directory' ); ?>/print.css" />
</del><span class="cx"> <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
</span><span class="cx"> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</span><span class="cx"> <?php wp_head(); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenprintcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/print.css (13871 => 13872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/print.css 2010-03-28 11:28:25 UTC (rev 13871)
+++ trunk/wp-content/themes/twentyten/print.css 2010-03-29 00:48:03 UTC (rev 13872)
</span><span class="lines">@@ -1,85 +0,0 @@
</span><del>-/*
-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;
-}
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/style.css (13871 => 13872)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/style.css 2010-03-28 11:28:25 UTC (rev 13871)
+++ trunk/wp-content/themes/twentyten/style.css 2010-03-29 00:48:03 UTC (rev 13872)
</span><span class="lines">@@ -1198,4 +1198,93 @@
</span><span class="cx">
</span><span class="cx"> #site-description {
</span><span class="cx"> -webkit-text-size-adjust: none;
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
+
+
+
+/* =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;
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>