Changeset 46710
- Timestamp:
- 11/11/2019 08:46:56 PM (5 years ago)
- Location:
- branches/5.3
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.3
- Property svn:mergeinfo changed
/trunk merged: 46705,46709
- Property svn:mergeinfo changed
-
branches/5.3/src/wp-admin/about.php
r46617 r46710 27 27 </div> 28 28 29 <div class="about__header-badge"> 30 <img src="https://wordpress.org/images/core/5.4/code-is-poetry-rc.svg" alt="<?php _e( 'Code is Poetry' ); ?>" /> 31 </div> 29 <div class="about__header-badge"></div> 32 30 33 31 <div class="about__header-text"> … … 53 51 <div class="about__section is-feature"> 54 52 <p> 55 <?php _e( '5.3 expands and refines the block editor introduced in WordPress 5.0 with new blocks, more intuitive interactions, and improved accessibility. New features in the editor increase design freedoms, provide additional layout options and style variations to allow designers complete control over the look of a site. This release also introduces the Twenty Twenty theme giving the user more design flexibility and integration with the block editor. Creating beautiful web pages and advanced layouts has never been easier.' ); ?>53 <?php _e( '5.3 expands and refines the block editor introduced in WordPress 5.0 with a new block, more intuitive interactions, and improved accessibility. New features in the editor increase design freedoms, provide additional layout options and style variations to allow designers complete control over the look of a site. This release also introduces the Twenty Twenty theme giving the user more design flexibility and integration with the block editor. Creating beautiful web pages and advanced layouts has never been easier.' ); ?> 56 54 </p> 57 55 </div> … … 93 91 <li><?php _e( 'The Columns block now supports fixed column widths' ); ?></li> 94 92 <li><?php _e( 'The new Predefined layouts make it a cinch to arrange content into advanced designs' ); ?></li> 95 <li><?php _e( 'Heading blocks now offer controls for text and backgroundcolor' ); ?></li>93 <li><?php _e( 'Heading blocks now offer controls for text color' ); ?></li> 96 94 <li><?php _e( 'Additional style options allow you to set your preferred style for any block that supports this feature' ); ?></li> 97 95 </ul> -
branches/5.3/src/wp-admin/credits.php
r46617 r46710 29 29 </div> 30 30 31 <div class="about__header-badge"> 32 <img src="https://wordpress.org/images/core/5.4/code-is-poetry-rc.svg" alt="<?php _e( 'Code is Poetry' ); ?>" /> 33 </div> 31 <div class="about__header-badge"></div> 34 32 35 33 <div class="about__header-text"> … … 88 86 exit; 89 87 } 88 ?> 90 89 91 $previous_type = ''; 90 <hr /> 92 91 93 foreach ( $credits['groups'] as $group_slug => $group_data ) :94 ?>95 <?php96 if ( $previous_type !== $group_data['type'] ) {97 echo '<hr />';98 }99 ?>100 92 <div class="about__section"> 101 <div class="column <?php echo 'titles' === $group_data['type'] ? 'has-subtle-background-color' : ''; ?>"> 102 103 <?php 104 if ( $group_data['name'] ) { 105 if ( 'Translators' == $group_data['name'] ) { 106 // Considered a special slug in the API response. (Also, will never be returned for en_US.) 107 $title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' ); 108 } elseif ( isset( $group_data['placeholders'] ) ) { 109 // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText 110 $title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] ); 111 } else { 112 // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText 113 $title = translate( $group_data['name'] ); 114 } 115 116 echo '<h2 class="wp-people-group-title">' . esc_html( $title ) . "</h2>\n"; 117 } 118 119 if ( ! empty( $group_data['shuffle'] ) ) { 120 shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt. 121 } 122 123 switch ( $group_data['type'] ) { 124 case 'list': 125 array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] ); 126 echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n"; 127 break; 128 case 'libraries': 129 array_walk( $group_data['data'], '_wp_credits_build_object_link' ); 130 echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n"; 131 break; 132 default: 133 $compact = 'compact' == $group_data['type']; 134 $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' ); 135 echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n"; 136 foreach ( $group_data['data'] as $person_data ) { 137 echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t"; 138 echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '" class="web">'; 139 $size = 'compact' == $group_data['type'] ? 40 : 80; 140 $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) ); 141 $size *= 2; 142 $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) ); 143 echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n"; 144 echo esc_html( $person_data[0] ) . "</a>\n\t"; 145 if ( ! $compact ) { 146 // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText 147 echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n"; 148 } 149 echo "</li>\n"; 150 } 151 echo "</ul>\n"; 152 break; 153 } 154 $previous_type = $group_data['type']; 155 ?> 156 93 <div class="column has-subtle-background-color"> 94 <?php wp_credits_section_title( $credits['groups']['core-developers'] ); ?> 95 <?php wp_credits_section_list( $credits, 'core-developers' ); ?> 96 <?php wp_credits_section_list( $credits, 'contributing-developers' ); ?> 157 97 </div> 158 98 </div> 159 <?php endforeach; ?> 99 100 <hr /> 101 102 <div class="about__section"> 103 <div class="column"> 104 <?php wp_credits_section_title( $credits['groups']['props'] ); ?> 105 <?php wp_credits_section_list( $credits, 'props' ); ?> 106 </div> 107 </div> 108 109 <hr /> 110 111 <?php if ( isset( $credits['groups']['translators'] ) || isset( $credits['groups']['validators'] ) ) : ?> 112 <div class="about__section"> 113 <div class="column"> 114 <?php wp_credits_section_title( $credits['groups']['validators'] ); ?> 115 <?php wp_credits_section_list( $credits, 'validators' ); ?> 116 <?php wp_credits_section_list( $credits, 'translators' ); ?> 117 </div> 118 </div> 119 120 <hr /> 121 <?php endif; ?> 122 123 <div class="about__section"> 124 <div class="column"> 125 <?php wp_credits_section_title( $credits['groups']['libraries'] ); ?> 126 <?php wp_credits_section_list( $credits, 'libraries' ); ?> 127 </div> 128 </div> 160 129 </div> 161 130 <?php -
branches/5.3/src/wp-admin/css/about.css
r46617 r46710 19 19 ------------------------------------------------------------------------------*/ 20 20 21 :root { 22 /* Beiges, used as text backgrounds. */ 23 --base-1: #FEFCF7; 24 --base-2: #F4EFE1; 25 --base-3: #D7D2C5; 26 --base-4: #7B776C; 27 --text: #413E38; 28 /* Reds, used as accents, backgrounds, etc */ 29 --accent-1: #BD3854; 30 --accent-2: #5F1B29; 21 .about__container { 22 /* Section backgrounds */ 23 --background: #f4efe1; 24 --subtle-background: #d7d2c5; 25 /* Main text color */ 26 --text: #413e38; 27 /* Navigation colors. */ 28 --nav-background: #fefcf7; 29 --nav-color: #716d64; 30 /* Reds, used as accents & in header. */ 31 --accent-1: #bd3854; 32 --accent-2: #5f1b29; 31 33 --accent-3: #321017; 32 34 } … … 35 37 1.0 - Global: About, Credits, Freedoms, Privacy 36 38 ------------------------------------------------------------------------------*/ 39 40 .about-php, 41 .credits-php, 42 .freedoms-php, 43 .privacy-php { 44 background: #fff; 45 } 37 46 38 47 .about-php #wpcontent, … … 56 65 max-width: 1000px; 57 66 margin: 24px auto; 67 clear: both; 58 68 } 59 69 … … 87 97 .about__section { 88 98 background: #F4EFE1; 89 background: var(--ba se-2);99 background: var(--background); 90 100 } 91 101 … … 97 107 .about__container .has-subtle-background-color { 98 108 background-color: #D7D2C5; 99 background-color: var(-- base-3);109 background-color: var(--subtle-background); 100 110 } 101 111 … … 296 306 } 297 307 308 .about__section a, 309 .about__section a:hover, 310 .about__section a:active, 311 .about__section a:focus { 312 color: inherit; 313 } 314 298 315 .about__container ul { 299 316 list-style: disc; … … 326 343 } 327 344 345 .about__container div.updated, 346 .about__container div.error, 347 .about__container .notice { 348 display: none !important; 349 } 350 328 351 .about__section { 329 352 font-size: 1.2em; … … 332 355 .about__section.is-feature { 333 356 font-size: 1.6em; 334 font-weight: bold;357 font-weight: 600; 335 358 } 336 359 … … 395 418 .about__header-title h1 span { 396 419 display: block; 397 font-weight: bold;420 font-weight: 600; 398 421 font-size: 1.2em; 399 422 line-height: 1; … … 426 449 background-color: var(--accent-3); 427 450 color: white; 428 font-size: 1. 6em;451 font-size: 1.5em; 429 452 line-height: 1.4; 430 453 } … … 442 465 padding-top: 0; 443 466 background: #FEFCF7; 444 background: var(-- base-1);445 color: #7 B776C;446 color: var(-- base-4);467 background: var(--nav-background); 468 color: #716d64; 469 color: var(--nav-color); 447 470 border-bottom: 3px solid currentColor; 448 471 } … … 450 473 .about__header-navigation .nav-tab { 451 474 margin-left: 0; 452 margin-bottom: -3px;453 475 padding: 24px 32px; 454 476 font-size: 1.4em; … … 461 483 } 462 484 485 .about__header-navigation .nav-tab:hover, 486 .about__header-navigation .nav-tab:active { 487 background-color: #F4EFE1; 488 background-color: var(--background); 489 } 490 463 491 .about__header-navigation .nav-tab-active { 492 margin-bottom: -3px; 493 border-width: 0 0 6px; 464 494 color: #BD3854; 465 495 color: var(--accent-1); 496 border-color: currentColor; 497 } 498 499 .about__header-navigation .nav-tab-active:hover, 500 .about__header-navigation .nav-tab-active:active { 501 background-color: transparent; 466 502 border-color: currentColor; 467 503 } … … 506 542 border-left-width: 3px; 507 543 background: #F4EFE1; 508 background: var(--ba se-2);544 background: var(--background); 509 545 } 510 546 } … … 514 550 2.0 - Credits Page 515 551 ------------------------------------------------------------------------------*/ 516 517 .about__section .wp-people-group-title {518 margin-bottom: 2em;519 font-size: 1.4em;520 }521 552 522 553 .about__section .wp-people-group { … … 557 588 .about__section .wp-person .web { 558 589 font-size: 1.4em; 559 font-weight: 700;590 font-weight: 600; 560 591 text-decoration: none; 561 592 color: #413E38; … … 574 605 display: block; 575 606 margin-top: 0.5em; 607 } 608 609 @media screen and (max-width: 480px) { 610 .about__section .wp-person { 611 min-width: 100%; 612 } 613 614 .about__section .wp-person .gravatar { 615 width: 60px; 616 height: 60px; 617 } 618 619 .about__section .wp-person .web { 620 font-size: 1em; 621 } 622 623 .about__section .compact .wp-person .web { 624 font-size: 1em; 625 } 576 626 } 577 627 … … 685 735 686 736 .about-wrap h2 { 687 margin: 40px 0 .6em;737 margin: 40px 0 0.6em; 688 738 font-size: 2.7em; 689 739 line-height: 1.3; … … 693 743 694 744 .about-wrap h3 { 695 margin: 1.25em 0 .6em;745 margin: 1.25em 0 0.6em; 696 746 font-size: 1.4em; 697 747 line-height: 1.5; -
branches/5.3/src/wp-admin/freedoms.php
r46617 r46710 32 32 </div> 33 33 34 <div class="about__header-badge"> 35 <img src="https://wordpress.org/images/core/5.4/code-is-poetry-rc.svg" alt="<?php _e( 'Code is Poetry' ); ?>" /> 36 </div> 34 <div class="about__header-badge"></div> 37 35 38 36 <div class="about__header-text"> -
branches/5.3/src/wp-admin/includes/credits.php
r42343 r46710 77 77 $data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>'; 78 78 } 79 80 /** 81 * Display a the title for a given group of contributors. 82 * 83 * @since 5.3.0 84 * 85 * @param array $group_data The current contributor group. 86 */ 87 function wp_credits_section_title( $group_data = array() ) { 88 if ( ! count( $group_data ) ) { 89 return; 90 } 91 92 if ( $group_data['name'] ) { 93 if ( 'Translators' === $group_data['name'] ) { 94 // Considered a special slug in the API response. (Also, will never be returned for en_US.) 95 $title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' ); 96 } elseif ( isset( $group_data['placeholders'] ) ) { 97 // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText 98 $title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] ); 99 } else { 100 // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText 101 $title = translate( $group_data['name'] ); 102 } 103 104 echo '<h2 class="wp-people-group-title">' . esc_html( $title ) . "</h2>\n"; 105 } 106 } 107 108 /** 109 * Display a list of contributors for a given group. 110 * 111 * @since 5.3.0 112 * 113 * @param array $credits The credits groups returned from the API. 114 * @param string $slug The current group to display. 115 */ 116 function wp_credits_section_list( $credits = array(), $slug = '' ) { 117 $group_data = isset( $credits['groups'][ $slug ] ) ? $credits['groups'][ $slug ] : array(); 118 $credits_data = $credits['data']; 119 if ( ! count( $group_data ) ) { 120 return; 121 } 122 123 if ( ! empty( $group_data['shuffle'] ) ) { 124 shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt. 125 } 126 127 switch ( $group_data['type'] ) { 128 case 'list': 129 array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits_data['profiles'] ); 130 echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n"; 131 break; 132 case 'libraries': 133 array_walk( $group_data['data'], '_wp_credits_build_object_link' ); 134 echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n"; 135 break; 136 default: 137 $compact = 'compact' === $group_data['type']; 138 $classes = 'wp-people-group ' . ( $compact ? 'compact' : '' ); 139 echo '<ul class="' . $classes . '" id="wp-people-group-' . $slug . '">' . "\n"; 140 foreach ( $group_data['data'] as $person_data ) { 141 echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t"; 142 echo '<a href="' . esc_url( sprintf( $credits_data['profiles'], $person_data[2] ) ) . '" class="web">'; 143 $size = $compact ? 40 : 80; 144 $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) ); 145 $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size * 2 ) ); 146 echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="" />' . "\n"; 147 echo esc_html( $person_data[0] ) . "</a>\n\t"; 148 if ( ! $compact ) { 149 // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText 150 echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n"; 151 } 152 echo "</li>\n"; 153 } 154 echo "</ul>\n"; 155 break; 156 } 157 } -
branches/5.3/src/wp-admin/privacy.php
r46617 r46710 26 26 </div> 27 27 28 <div class="about__header-badge"> 29 <img src="https://wordpress.org/images/core/5.4/code-is-poetry-rc.svg" alt="<?php _e( 'Code is Poetry' ); ?>" /> 30 </div> 28 <div class="about__header-badge"></div> 31 29 32 30 <div class="about__header-text">
Note: See TracChangeset
for help on using the changeset viewer.