Index: wp-content/themes/twentythirteen/style.css =================================================================== --- wp-content/themes/twentythirteen/style.css (revision 24388) +++ wp-content/themes/twentythirteen/style.css (working copy) @@ -257,8 +257,7 @@ } blockquote cite, -blockquote small, -.quote-caption { +blockquote small { font-size: 14px; font-weight: normal; text-transform: uppercase; @@ -480,7 +479,7 @@ .featured-post:before, .date a:before, .entry-meta .author a:before, -.format-audio .entry-media:before, +.format-audio .entry-content:before, .comments-link a:before, .tags-links a:first-child:before, .categories-links a:first-child:before, @@ -502,7 +501,6 @@ /* Clearing floats */ .clear:after, -.entry-media:after, .attachment .entry-header:after, .site-footer .widget-area:after, .entry-content:after, @@ -516,8 +514,6 @@ .clear:before, .clear:after, -.entry-media:before, -.entry-media:after, .attachment .entry-header:before, .attachment .entry-header:after, .site-footer .widget-area:before, @@ -676,7 +672,6 @@ height: auto; } -.entry-media img, img.size-full, img.size-large, img.wp-post-image { @@ -1126,8 +1121,7 @@ } .entry-content blockquote cite, -.entry-content blockquote small, -.entry-content .quote-caption { +.entry-content blockquote small { font-size: 16px; } @@ -1365,23 +1359,6 @@ * ---------------------------------------------------------------------------- */ -.entry-media { - margin: 0 auto 24px; - max-width: 724px; - width: 100%; -} - -.sidebar .entry-media { - max-width: 1040px; - padding: 0 316px 0 0; -} - -.entry-media .wp-caption, -.entry-media .wp-caption-text, -.entry-media [class*="align"] { - margin: 0 auto; -} - /* Aside */ .format-aside { background-color: #f7f5e7; @@ -1424,16 +1401,7 @@ font-weight: bold; } -.format-audio .entry-media { - max-width: 604px; -} - -.sidebar .format-audio .entry-media { - max-width: 1040px; - padding: 0 374px 0 60px; -} - -.format-audio .entry-media:before { +.format-audio .entry-content:before { content: "\f109"; float: left; font-size: 64px; @@ -1682,21 +1650,20 @@ text-decoration: none; } -.format-quote .quote-caption, .format-quote blockquote small, .format-quote blockquote cite { display: block; font-size: 16px; } -.format-quote .quote { +.format-quote blockquote { font-style: italic; font-weight: 300; padding-left: 75px; position: relative; } -.format-quote .quote:before { +.format-quote blockquote:before { content: '\201C'; font-size: 140px; font-weight: 400; @@ -2714,10 +2681,6 @@ } @media (max-width: 1069px) { - .sidebar .entry-media { - padding: 0 376px 0 60px; - } - .sidebar img.alignleft, .sidebar .wp-caption.alignleft { margin-left: 0; @@ -2784,9 +2747,7 @@ .sidebar #respond #commentform, .sidebar .featured-gallery, .sidebar .post-navigation .nav-links, - .author.sidebar .author-info, - .format-audio .entry-media, - .sidebar .format-audio .entry-media { + .author.sidebar .author-info { max-width: 604px; padding-left: 0; padding-right: 0; @@ -2804,11 +2765,6 @@ max-width: 604px; } - .sidebar .entry-media { - max-width: 724px; - } - - .sidebar .entry-media, .sidebar .archive-meta, .attachment .entry-header, .search.sidebar .page-content, @@ -2889,11 +2845,6 @@ margin-right: 0; } - .entry-media, - .sidebar .entry-media { - max-width: 604px; - } - .attachment .image-navigation, .attachment .entry-attachment .attachment { max-width: 604px; @@ -2911,7 +2862,6 @@ font-size: 30px; } - #content .entry-media, #content .entry-header, #content .entry-content, #content .entry-summary, @@ -3027,8 +2977,7 @@ } .format-quote blockquote small, - .format-quote blockquote cite, - .format-quote .quote-caption { + .format-quote blockquote cite { font-size: 13px; } @@ -3069,16 +3018,16 @@ } /* Audio */ + .format-audio .entry-content:before { + display: none; + } + .format-audio .audio-content { background-image: none; float: none; padding-left: 0; width: auto; } - - .format-audio .entry-media:before { - display: none; - } } /* Mobile devices */ Index: wp-content/themes/twentythirteen/js/functions.js =================================================================== --- wp-content/themes/twentythirteen/js/functions.js (revision 24388) +++ wp-content/themes/twentythirteen/js/functions.js (working copy) @@ -8,7 +8,6 @@ var html = $( 'html' ), body = $( 'body' ), _window = $( window ), - captions = $( '.quote-caption' ), adjustFooter, /** @@ -71,12 +70,6 @@ } } ); - /** Better styles for Quote post formats with a linked source. - * - */ - if ( captions ) - captions.has( 'a' ).addClass( 'linked' ); - /** * Arranges footer widgets vertically. */ Index: wp-content/themes/twentythirteen/content-image.php =================================================================== --- wp-content/themes/twentythirteen/content-image.php (revision 24388) +++ wp-content/themes/twentythirteen/content-image.php (working copy) @@ -9,10 +9,6 @@ ?>
> -
- -
-

@@ -24,7 +20,7 @@
- →', 'twentythirteen' ) ); ?> + →', 'twentythirteen' ) ); ?> '
' . __( 'Pages:', 'twentythirteen' ) . '', 'after' => '
', 'link_before' => '', 'link_after' => '' ) ); ?>
Index: wp-content/themes/twentythirteen/css/ie.css =================================================================== --- wp-content/themes/twentythirteen/css/ie.css (revision 24388) +++ wp-content/themes/twentythirteen/css/ie.css (working copy) @@ -10,7 +10,7 @@ .menu-toggle:after:hover, .date a:before:hover, .entry-meta .author a:before:hover, -.format-audio .entry-media:before:hover, +.format-audio .entry-content:before:hover, .comments-link a:before:hover, .tags-links a:first-child:before:hover, .categories-links a:first-child:before:hover, @@ -280,12 +280,8 @@ left: auto; } -.ie7 .format-quote .quote { - padding: 0; -} - /* RTL for Internet Explorer 7 & 8 */ -.rtl .format-audio .entry-media:before, +.rtl .format-audio .entry-content:before, .rtl .comment-reply-link:before, .rtl .comment-reply-login:before { -ms-filter: "FlipH"; Index: wp-content/themes/twentythirteen/css/editor-style.css =================================================================== --- wp-content/themes/twentythirteen/css/editor-style.css (revision 24388) +++ wp-content/themes/twentythirteen/css/editor-style.css (working copy) @@ -14,8 +14,7 @@ * 5.0 - Alignment * 6.0 - Tables * 7.0 - Images - * 8.0 - Post Formats - * 9.0 - RTL + * 8.0 - RTL * ---------------------------------------------------------------------------- */ @@ -365,154 +364,9 @@ padding: 0; } -/** - * 8.0 Post Formats - * ---------------------------------------------------------------------------- - */ -/* Aside */ -.post-format-aside { - background-color: #f7f5e7; -} - -.post-format-aside blockquote { - font-size: 100%; - font-weight: normal; -} - -.post-format-aside cite { - font-size: 100%; - text-transform: none; -} - -.post-format-aside cite:before { - content: "\2014"; - margin-right: 5px; -} - -/* Audio */ -.post-format-audio { - background-color: #db572f; -} - -.post-format-audio a { - color: #fbfaf3; -} - -/* Chat */ -.post-format-chat { - background-color: #eadaa6; -} - -.post-format-chat a { - color: #722d19; -} - -/* Gallery */ -.post-format-gallery { - background-color: #fbca3c; -} - -.post-format-gallery a { - color: #722d19; -} - -/* Image: same as Standard/Defaults */ - -/* Link */ -.post-format-link { - background-color: #f7f5e7; -} - -/* Quote */ -.post-format-quote { - background-color: #210d10; - color: #f7f5e7; -} - -.post-format-quote blockquote { - font-size: 28px; - font-style: italic; - font-weight: 300; - margin: 0; - padding-left: 75px; - position: relative; -} - -.post-format-quote blockquote:before { - content: '\201C'; - font-size: 140px; - font-weight: 400; - line-height: .8; - padding-right: 25px; - position: absolute; - left: -15px; - top: -3px; -} - -.post-format-quote a { - color: #e63f2a; -} - -.post-format-quote .quote-caption, -.post-format-quote blockquote small, -.post-format-quote blockquote cite { - display: block; - font-size: 16px; -} - -/* Status */ -.post-format-status { - background-color: #722d19; - color: #f7f5e7; - font-style: italic; - font-weight: 300; - padding: 0; - padding-left: 35px; -} - -.post-format-status.mceContentBody { - font-size: 24px; -} - -.post-format-status:before { - background-size: 4px 4px; - background: url(../images/dotted-line.png) repeat-y left bottom; - content: ""; - display: block; - height: 100%; - position: absolute; - left: 15px; - top: 0; - width: 1px; -} - -.post-format-status p:first-child:before { - background-color: rgba(0, 0, 0, 0.65); - content: ""; - height: 3px; - width: 13px; - margin-top: 13px; - position: absolute; - left: 9px; -} - -.post-format-status a { - color: #eadaa6; -} - -/* Video */ -.post-format-video { - background-color: #db572f; -} - -.post-format-video a { - color: #fbfaf3; -} - - /** - * 9.0 RTL + * 8.0 RTL * ---------------------------------------------------------------------------- */ Index: wp-content/themes/twentythirteen/rtl.css =================================================================== --- wp-content/themes/twentythirteen/rtl.css (revision 24388) +++ wp-content/themes/twentythirteen/rtl.css (working copy) @@ -151,11 +151,6 @@ * ---------------------------------------------------------------------------- */ -.sidebar .entry-media { - padding-left: 316px; - padding-right: 0; -} - .sidebar .entry-header, .sidebar .entry-content, .sidebar .entry-summary, @@ -245,7 +240,6 @@ * ---------------------------------------------------------------------------- */ -.entry-media a, .entry-content a { display: inline; } @@ -260,7 +254,7 @@ margin-left: 5px; } -.format-audio .entry-media:before { +.format-audio .entry-content:before { float: right; -webkit-transform: scaleX(-1); -moz-transform: scaleX(-1); @@ -269,12 +263,6 @@ transform: scaleX(-1); } -.format-audio .entry-media, -.sidebar .format-audio .entry-media { - padding-left: 374px; - padding-right: 60px; -} - .format-audio .audio-content { background-position: right top; float: left; @@ -343,12 +331,12 @@ right: 64px; } -.format-quote .quote { +.format-quote blockquote { padding-left: 0; padding-right: 75px; } -.format-quote .quote:before { +.format-quote blockquote:before { content: '\201D'; padding-left: 25px; padding-right: 0; @@ -608,13 +596,6 @@ */ @media (max-width: 1069px) { - .sidebar .entry-media, - .format-audio .entry-media, - .sidebar .format-audio .entry-media { - padding-left: 376px; - padding-right: 60px; - } - ul.nav-menu, div.nav-menu > ul { margin-left: auto; @@ -656,13 +637,6 @@ padding-right: 0; } - .sidebar .entry-media, - .format-audio .entry-media, - .sidebar .format-audio .entry-media { - padding-left: 0; - padding-right: 0; - } - .site-main .widget-area { float: none; margin-left: auto; Index: wp-content/themes/twentythirteen/content-gallery.php =================================================================== --- wp-content/themes/twentythirteen/content-gallery.php (revision 24388) +++ wp-content/themes/twentythirteen/content-gallery.php (working copy) @@ -24,7 +24,7 @@ →', 'twentythirteen' ) ); ?> '
' . __( 'Pages:', 'twentythirteen' ) . '', 'after' => '
', 'link_before' => '', 'link_after' => '' ) ); ?> - + Index: wp-content/themes/twentythirteen/functions.php =================================================================== --- wp-content/themes/twentythirteen/functions.php (revision 24388) +++ wp-content/themes/twentythirteen/functions.php (working copy) @@ -436,7 +436,8 @@ * @return string The Link format URL. */ function twentythirteen_get_link_url() { - $has_url = get_the_post_format_url(); + $content = get_the_content(); + $has_url = get_content_url( $content ); return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() ); } @@ -472,7 +473,6 @@ * @return array The filtered body class list. */ function twentythirteen_body_class( $classes ) { - // Enable custom font class only if the font CSS is queued to load. if ( wp_style_is( 'twentythirteen-fonts', 'enqueued' ) ) $classes[] = 'custom-font'; @@ -498,34 +498,16 @@ * @return void */ function twentythirteen_content_width() { - if ( has_post_format( 'video' ) || is_attachment() ) { - global $content_width; + global $content_width; + + if ( is_attachment() ) $content_width = 724; - } + elseif ( has_post_format( 'audio' ) ) + $content_width = 484; } add_action( 'template_redirect', 'twentythirteen_content_width' ); /** - * Adjusts content_width value for video shortcodes in video post formats. - * - * @since Twenty Thirteen 1.0 - * - * @param array $atts The attribute list. - * @return array The filtered attribute list. - */ -function twentythirteen_video_width( $atts ) { - if ( ! is_admin() && has_post_format( 'video' ) ) { - $new_width = 724; - $atts['height'] = round( ( $atts['height'] * $new_width ) / $atts['width'] ); - $atts['width'] = $new_width; - } - - return $atts; -} -add_action( 'embed_defaults', 'twentythirteen_video_width' ); -add_action( 'shortcode_atts_video', 'twentythirteen_video_width' ); - -/** * Switches default core markup for search form to output valid HTML5. * * @param string $format Expected markup format, default is `xhtml` Index: wp-content/themes/twentythirteen/content-audio.php =================================================================== --- wp-content/themes/twentythirteen/content-audio.php (revision 24388) +++ wp-content/themes/twentythirteen/content-audio.php (working copy) @@ -19,15 +19,11 @@ -
+
- + →', 'twentythirteen' ) ); ?> + '
' . __( 'Pages:', 'twentythirteen' ) . '', 'after' => '
', 'link_before' => '', 'link_after' => '' ) ); ?>
-
- -
- →', 'twentythirteen' ) ); ?> - '
' . __( 'Pages:', 'twentythirteen' ) . '', 'after' => '
', 'link_before' => '', 'link_after' => '' ) ); ?>