Ticket #25045: 25045.1.diff
File 25045.1.diff, 9.8 KB (added by , 11 years ago) |
---|
-
wp-content/themes/twentyfourteen/functions.php
68 68 ) ); 69 69 70 70 /* 71 * Switches default core markup for search form, comment form, and comments 72 * to output valid HTML5. 73 */ 74 add_theme_support( 'html5', array( 75 'search-form', 'comment-form', 'comment-list', 76 ) ); 77 78 /* 71 79 * Enable support for Post Formats. 72 80 * See http://codex.wordpress.org/Post_Formats 73 81 */ 74 82 add_theme_support( 'post-formats', array( 75 'aside', 'image', 'video', 'quote', 'link', 'gallery' 83 'aside', 'image', 'video', 'quote', 'link', 'gallery', 76 84 ) ); 77 85 78 86 /* -
wp-content/themes/twentyfourteen/comments.php
40 40 wp_list_comments( array( 41 41 'style' => 'ol', 42 42 'short_ping' => true, 43 44 // TODO: Remove callback and update styles.45 'callback'=>'twentyfourteen_comment',46 43 ) ); 47 44 ?> 48 45 </ol><!-- .comment-list --> -
wp-content/themes/twentyfourteen/inc/template-tags.php
84 84 } 85 85 endif; 86 86 87 if ( ! function_exists( 'twentyfourteen_comment' ) ) :88 /**89 * Template for comments and pingbacks.90 *91 * Used as a callback by wp_list_comments() for displaying the comments.92 *93 */94 function twentyfourteen_comment( $comment, $args, $depth ) {95 $GLOBALS['comment'] = $comment;96 switch ( $comment->comment_type ) :97 case 'pingback' :98 case 'trackback' :99 ?>100 <li class="post pingback">101 <p><?php _e( 'Pingback:', 'twentyfourteen' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyfourteen' ), ' ' ); ?></p>102 <?php103 break;104 default :105 ?>106 <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">107 <article id="comment-<?php comment_ID(); ?>" class="comment">108 <footer>109 <div class="comment-author vcard">110 <span class="comment-author-avatar"><?php echo get_avatar( $comment, 32 ); ?></span>111 <?php printf( __( '%s', 'twentyfourteen' ), sprintf( '<cite class="fn">%s</cite> says:', get_comment_author_link() ) ); ?>112 </div><!-- .comment-author .vcard -->113 </footer>114 115 <div class="comment-content">116 <?php comment_text(); ?>117 <?php if ( $comment->comment_approved == '0' ) : ?>118 <p><em><?php _e( 'Your comment is awaiting moderation.', 'twentyfourteen' ); ?></em></p>119 <?php endif; ?>120 </div>121 122 <div class="comment-meta commentmetadata">123 <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><time pubdate datetime="<?php comment_time( 'c' ); ?>">124 <?php125 /* translators: 1: date, 2: time */126 printf( __( '%1$s at %2$s', 'twentyfourteen' ), get_comment_date(), get_comment_time() ); ?>127 </time></a>128 <?php comment_reply_link( array_merge( $args, array( 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>129 <?php edit_comment_link( __( 'Edit', 'twentyfourteen' ), ' ' );130 ?>131 </div><!-- .comment-meta .commentmetadata -->132 </article><!-- #comment-## -->133 134 <?php135 break;136 endswitch;137 }138 endif; // ends check for twentyfourteen_comment()139 140 87 if ( ! function_exists( 'twentyfourteen_posted_on' ) ) : 141 88 /** 142 89 * Prints HTML with meta information for the current post-date/time and author. -
wp-content/themes/twentyfourteen/style.css
1850 1850 margin: 0 0 48px 0; 1851 1851 margin: 0 0 4.8rem 0; 1852 1852 } 1853 .comment-meta ,1853 .comment-metadata, 1854 1854 .comment-author { 1855 1855 font-size: 14px; 1856 1856 font-size: 1.4rem; 1857 1857 line-height: 1.7142857142; 1858 1858 } 1859 .comment-author cite{1859 .comment-author .fn { 1860 1860 font-weight: 900; 1861 1861 text-transform: uppercase; 1862 1862 } 1863 1863 .comment-author a { 1864 1864 color: #2b2b2b; 1865 1865 } 1866 .comment-meta a,1867 .comment-list li.trackback a,1868 .comment-list li.pingback a {1866 .comment-metadata a, 1867 .comment-list .trackback a, 1868 .comment-list .pingback a { 1869 1869 color: #767676; 1870 1870 } 1871 1871 .comment-author a:hover, 1872 .comment-meta a:hover,1872 .comment-metadata a:hover, 1873 1873 .comment-list .trackback a:hover, 1874 1874 .comment-list .pingback a:hover { 1875 1875 color: #24890d; 1876 1876 text-decoration: none; 1877 1877 } 1878 .comment-edit-link:before, 1879 .comment-reply-link:before { 1878 .comment-edit-link:before { 1880 1879 color: rgba(0, 0, 0, 0.2); 1881 1880 content: '\007c\0020'; 1882 1881 } … … 1896 1895 background: none; 1897 1896 min-height: 48px; 1898 1897 min-height: 4.8rem; 1899 position: relative;1900 1898 } 1901 1899 .comment-author { 1902 1900 padding-left: 36px; 1903 1901 padding-left: 3.6rem; 1904 1902 position: relative; 1905 1903 } 1906 .comment-author . comment-author-avatar {1904 .comment-author .avatar { 1907 1905 border: 1px solid rgba(0, 0, 0, 0.1); 1908 1906 padding: 2px; 1909 1907 padding: 0.2rem; … … 1916 1914 height: 22px; 1917 1915 height: 2.2rem; 1918 1916 } 1919 .bypostauthor . comment-author .comment-author-avatar {1917 .bypostauthor .avatar { 1920 1918 background-color: #24890d; 1921 1919 } 1922 .comment-author cite{1920 .comment-author .fn { 1923 1921 font-style: normal; 1924 1922 } 1925 1923 .comment-author .avatar { … … 1933 1931 height: 22px; 1934 1932 height: 2.2rem; 1935 1933 } 1936 .comment-meta ,1934 .comment-metadata, 1937 1935 .comment-content { 1938 1936 padding-left: 36px; 1939 1937 padding-left: 3.6rem; … … 2412 2410 .content-area .entry-date a:before, 2413 2411 .content-area .byline a:before, 2414 2412 .content-area .comments-link a:before, 2415 . content-area .edit-link a:before,2413 .entry-meta .edit-link a:before, 2416 2414 .attachment .entry-date:before, 2417 2415 .content-area .full-size-link a:before, 2418 2416 .content-area .parent-post-link a:before { … … 2475 2473 margin: -1px 2px 0 0; 2476 2474 margin: -0.1rem 0.2rem 0 0; 2477 2475 } 2478 . content-area .edit-link a:before {2476 .entry-meta .edit-link a:before { 2479 2477 content: '\F411'; 2480 2478 margin: -1px 2px 0 0; 2481 2479 margin: -0.1rem 0.2rem 0 0; … … 2486 2484 .content-area .parent-post-link a:before { 2487 2485 content: '\F301'; 2488 2486 } 2489 .page . content-area .edit-link a:before {2487 .page .entry-meta .edit-link a:before { 2490 2488 margin: 5px 2px 0 0; 2491 2489 margin: 0.5rem 0.2rem 0 0; 2492 2490 } … … 2605 2603 margin-top: 0; 2606 2604 } 2607 2605 .comments-area article, 2608 .comment-list li.trackback,2609 .comment-list li.pingback {2606 .comment-list .trackback, 2607 .comment-list .pingback { 2610 2608 margin-bottom: 36px; 2611 2609 margin-bottom: 3.6rem; 2612 2610 padding-top: 36px; 2613 2611 padding-top: 3.6rem; 2614 2612 } 2615 .comment-author {2616 padding-left: 60px;2617 padding-left: 6.0rem;2618 }2619 .comment-author .comment-author-avatar,2620 2613 .comment-author .avatar { 2621 2614 width: 32px; 2622 2615 width: 3.2rem; 2623 2616 height: 32px; 2624 2617 height: 3.2rem; 2625 2618 } 2626 .comment-meta, 2619 .comment-author, 2620 .comment-metadata, 2627 2621 .comment-content { 2628 2622 padding-left: 60px; 2629 2623 padding-left: 6.0rem; … … 2632 2626 .no-comments, 2633 2627 .comment-respond, 2634 2628 .comments-area article, 2635 .comment-list li.trackback,2636 .comment-list li.pingback,2629 .comment-list .trackback, 2630 .comment-list .pingback, 2637 2631 .post-navigation [rel="prev"], 2638 2632 .post-navigation [rel="next"] { 2639 2633 padding-right: 9.12778904%; … … 2652 2646 .full-width .comments-title, 2653 2647 .full-width .comment-respond, 2654 2648 .full-width .comments-area article, 2655 .full-width .comment-list li.trackback,2656 .full-width .comment-list li.pingback {2649 .full-width .comment-list .trackback, 2650 .full-width .comment-list .pingback { 2657 2651 padding-right: 6.04307432%; 2658 2652 padding-left: 6.04307432%; 2659 2653 } … … 2728 2722 .no-comments, 2729 2723 .comment-respond, 2730 2724 .comments-area article, 2731 .comment-list li.trackback,2732 .comment-list li.pingback,2725 .comment-list .trackback, 2726 .comment-list .pingback, 2733 2727 .post-navigation [rel="prev"], 2734 2728 .post-navigation [rel="next"] { 2735 2729 padding-right: 12.39493534%; … … 2752 2746 .full-width .comments-title, 2753 2747 .full-width .comment-respond, 2754 2748 .full-width .comments-area article, 2755 .full-width .comment-list li.trackback,2756 .full-width .comment-list li.pingback {2749 .full-width .comment-list .trackback, 2750 .full-width .comment-list .pingback { 2757 2751 padding-right: 11.30926724%; 2758 2752 padding-left: 11.30926724%; 2759 2753 } … … 2923 2917 .no-comments, 2924 2918 .comment-respond, 2925 2919 .comments-area article, 2926 .comment-list li.trackback,2927 .comment-list li.pingback,2920 .comment-list .trackback, 2921 .comment-list .pingback, 2928 2922 .post-navigation [rel="prev"], 2929 2923 .post-navigation [rel="next"] { 2930 2924 padding-right: 9.87001616%; … … 2943 2937 .full-width .comments-title, 2944 2938 .full-width .comment-respond, 2945 2939 .full-width .comments-area article, 2946 .full-width .comment-list li.trackback,2947 .full-width .comment-list li.pingback {2940 .full-width .comment-list .trackback, 2941 .full-width .comment-list .pingback { 2948 2942 padding-right: 5.882236%; 2949 2943 padding-left: 5.882236%; 2950 2944 } … … 2997 2991 .no-comments, 2998 2992 .comment-respond, 2999 2993 .comments-area article, 3000 .comment-list li.trackback,3001 .comment-list li.pingback,2994 .comment-list .trackback, 2995 .comment-list .pingback, 3002 2996 .post-navigation [rel="prev"], 3003 2997 .post-navigation [rel="next"] { 3004 2998 padding-right: 12.44146986%; … … 3035 3029 .full-width .comments-title, 3036 3030 .full-width .comment-respond, 3037 3031 .full-width .comments-area article, 3038 .full-width .comment-list li.trackback,3039 .full-width .comment-list li.pingback {3032 .full-width .comment-list .trackback, 3033 .full-width .comment-list .pingback { 3040 3034 padding-right: 11.21868265%; 3041 3035 padding-left: 11.21868265%; 3042 3036 } … … 3075 3069 .full-width .comments-title, 3076 3070 .full-width .comment-respond, 3077 3071 .full-width .comments-area article, 3078 .full-width .comment-list li.trackback,3079 .full-width .comment-list li.pingback {3072 .full-width .comment-list .trackback, 3073 .full-width .comment-list .pingback { 3080 3074 padding-right: 0; 3081 3075 } 3082 3076 } 3077 No newline at end of file