diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php index 55a7902979..df5df6b713 100644 --- a/src/wp-admin/about.php +++ b/src/wp-admin/about.php @@ -16,7 +16,7 @@ list( $display_version ) = explode( '-', get_bloginfo( 'version' ) ); include( ABSPATH . 'wp-admin/admin-header.php' ); ?> -
+
@@ -26,14 +26,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-
- +
+ <?php _e( 'Code is Poetry' ); ?>
@@ -67,11 +61,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
- +
-

+

@@ -84,7 +78,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

+

- +
-

+

@@ -126,7 +120,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

- +
@@ -134,7 +128,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
- +
@@ -142,26 +136,26 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

+

-

+

-

+

-

-

+

+

- +
@@ -169,10 +163,10 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

+

-

+

-

+

-

+
@@ -26,14 +28,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-
- +
+ <?php _e( 'Code is Poetry' ); ?>
@@ -56,35 +52,55 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-
+
+
+

+ +

+ worldwide team of passionate individuals. Get involved in WordPress.' ), + __( 'https://wordpress.org/about/' ), + __( 'https://make.wordpress.org/' ) + ); + } else { + printf( + /* translators: %s: https://make.wordpress.org/ */ + __( 'Want to see your name in lights on this page? Get involved in WordPress.' ), + __( 'https://make.wordpress.org/' ) + ); + } + ?> +

+
+ +
+ +
+
+ '; - printf( - /* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */ - __( 'WordPress is created by a worldwide team of passionate individuals. Get involved in WordPress.' ), - __( 'https://wordpress.org/about/' ), - __( 'https://make.wordpress.org/' ) - ); - echo '

'; - echo '
'; echo '
'; include( ABSPATH . 'wp-admin/admin-footer.php' ); exit; } -echo '

' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "

\n"; +$previous_type = ''; -echo '

' . sprintf( - /* translators: %s: https://make.wordpress.org/ */ - __( 'Want to see your name in lights on this page? Get involved in WordPress.' ), - __( 'https://make.wordpress.org/' ) -) . '

'; +foreach ( $credits['groups'] as $group_slug => $group_data ) : + ?> + '; + } + ?> +
+
-foreach ( $credits['groups'] as $group_slug => $group_data ) { + $group_data ) { $title = translate( $group_data['name'] ); } - echo '

' . esc_html( $title ) . "

\n"; + echo '

' . esc_html( $title ) . "

\n"; } if ( ! empty( $group_data['shuffle'] ) ) { @@ -120,7 +136,7 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { foreach ( $group_data['data'] as $person_data ) { echo '
  • ' . "\n\t"; echo ''; - $size = 'compact' == $group_data['type'] ? 30 : 60; + $size = 'compact' == $group_data['type'] ? 40 : 80; $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) ); $size *= 2; $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) ); @@ -135,10 +151,12 @@ foreach ( $credits['groups'] as $group_slug => $group_data ) { echo "\n"; break; } -} + $previous_type = $group_data['type']; + ?> -?> +
    • +
    div { + display: flex; +} + +.about__header > div > * { + align-self: flex-end; +} + +.about__header-title { + -ms-grid-column: 1; + grid-column: 1; + -ms-grid-row: 1; + -ms-grid-row-span: 2; + grid-row: 1/span 2; + padding: 32px; + background-color: #BD3854; + background-color: var(--accent-1); + color: white; + padding: 32px; +} + +.about__header-title h1 { + padding: 0; + color: inherit; +} + +.about__header-title h1 span { + display: block; + font-weight: bold; + font-size: 1.2em; + line-height: 1; +} + +.about__header-badge { + -ms-grid-column: 2; + grid-column: 2; + -ms-grid-row: 1; + grid-row: 1; + background-color: #5F1B29; + background-color: var(--accent-2); + margin: 0; + padding: 32px; + justify-content: flex-end; +} + +.about__header-badge img { + align-self: flex-start; + max-width: 100%; +} + +.about__header-text { + -ms-grid-column: 2; + grid-column: 2; + -ms-grid-row: 2; + grid-row: 2; + padding: 32px; + background-color: #321017; + background-color: var(--accent-3); + color: white; + font-size: 1.6em; + line-height: 1.4; +} + +.about__header-text p { + margin: 0; +} + +.about__header-navigation { + -ms-grid-column: 1; + -ms-grid-column-span: 2; + grid-column: 1/span 2; + -ms-grid-row: 3; + grid-row: 3; + padding-top: 0; + background: #FEFCF7; + background: var(--base-1); + color: #7B776C; + color: var(--base-4); + border-bottom: 3px solid currentColor; +} + +.about__header-navigation .nav-tab { + margin-left: 0; + margin-bottom: -3px; + padding: 24px 32px; + font-size: 1.4em; + line-height: 1; + border-width: 0 0 3px; + border-style: solid; + border-color: transparent; + background: transparent; + color: inherit; +} + +.about__header-navigation .nav-tab-active { + color: #BD3854; + color: var(--accent-1); + border-color: currentColor; +} + +@media screen and (max-width: 782px) { + .about__container .about__header-text { + font-size: 1.4em; + } +} + +@media screen and (max-width: 600px) { + .about__header { + display: block; + min-height: unset; + max-height: unset; + height: auto; + } + + .about__header-badge { + justify-content: flex-start; + } + + .about__header-navigation .nav-tab { + margin-top: 0; + margin-right: 0; + padding: 24px 16px; + } +} + +@media screen and (max-width: 480px) { + .about__header-navigation .nav-tab { + float: none; + display: block; + margin-bottom: 0; + padding: 16px 16px; + border-left-width: 3px; + border-bottom: none; + } + + .about__header-navigation .nav-tab-active { + border-bottom: none; + border-left-width: 3px; + background: #F4EFE1; + background: var(--base-2); + } +} + + +/*------------------------------------------------------------------------------ + 2.0 - Credits Page +------------------------------------------------------------------------------*/ + +.about__section .wp-people-group-title { + margin-bottom: 2em; + font-size: 1.4em; +} + +.about__section .wp-people-group { + margin: 0; +} + +.about__section .wp-person { + display: inline-block; + vertical-align: top; + box-sizing: border-box; + padding: 0 1em 1em 0; + height: 6em; + width: calc( 33% - 4px ); + min-width: 280px; +} + +.about__section .compact .wp-person { + height: auto; + width: calc( 25% - 4px ); + min-width: 220px; + padding-bottom: 0.5em; +} + +.about__section .wp-person .gravatar { + float: left; + margin: -4px 0.85em 0.85em 0; + padding: 1px; + width: 80px; + height: 80px; + border-radius: 100%; +} + +.about__section .compact .wp-person .gravatar { + width: 40px; + height: 40px; +} + +.about__section .wp-person .web { + font-size: 1.4em; + font-weight: 700; + text-decoration: none; + color: #413E38; + color: var(--text); +} + +.about__section .wp-person .web:hover { + text-decoration: underline; +} + +.about__section .compact .wp-person .web { + font-size: 1.2em; +} + +.about__section .wp-person .title { + display: block; + margin-top: 0.5em; +} + + +/*------------------------------------------------------------------------------ + 3.0 - Freedoms Page +------------------------------------------------------------------------------*/ + +.about__section .column .freedoms-image { + margin-bottom: 1em; +} + + +/*------------------------------------------------------------------------------ + x.2.0 - Legacy About Styles: Global ------------------------------------------------------------------------------*/ .about-wrap { @@ -98,7 +672,7 @@ line-height: 1.33333333; } -/* 1.1 - Typography */ +/* x.2.1 - Typography */ .about-wrap h1 { margin: 0.2em 200px 0 0; @@ -159,7 +733,7 @@ color: #555d66; } -/* 1.2 - Structure */ +/* x.2.2 - Structure */ .about-wrap .has-1-columns, .about-wrap .has-2-columns, @@ -281,18 +855,21 @@ } .about-wrap .is-vertically-aligned-top { + -ms-grid-row-align: start; align-self: start; } .about-wrap .is-vertically-aligned-center { + -ms-grid-row-align: center; align-self: center; } .about-wrap .is-vertically-aligned-bottom { + -ms-grid-row-align: end; align-self: end; } -/* 1.3 - Point Releases */ +/* x.2.3 - Point Releases */ .about-wrap .point-releases { margin-top: 5px; @@ -316,10 +893,10 @@ } /*------------------------------------------------------------------------------ - 2.0 - About Page + x.3.0 - Legacy About Styles: About Page ------------------------------------------------------------------------------*/ -/* 2.1 - Typography */ +/* x.3.1 - Typography */ .about-wrap .lead-description { font-size: 1.5em; @@ -330,7 +907,7 @@ margin-top: 0.6em; } -/* 2.2 - Structure */ +/* x.3.2 - Structure */ .about-wrap .headline-feature { margin: 0 auto 40px; @@ -360,7 +937,7 @@ } /*------------------------------------------------------------------------------ - 3.0 - Credits & Freedoms Pages + x.4.0 - Legacy About Styles: Credits & Freedoms Pages ------------------------------------------------------------------------------*/ /* Credits */ @@ -471,7 +1048,7 @@ } /*------------------------------------------------------------------------------ - 4.0 - Media Queries + x.5.0 - Legacy About Styles: Media Queries ------------------------------------------------------------------------------*/ @media screen and (max-width: 782px) { diff --git a/src/wp-admin/freedoms.php b/src/wp-admin/freedoms.php index 4fe0cef9ba..3305a07301 100644 --- a/src/wp-admin/freedoms.php +++ b/src/wp-admin/freedoms.php @@ -21,7 +21,7 @@ list( $display_version ) = explode( '-', get_bloginfo( 'version' ) ); include( ABSPATH . 'wp-admin/admin-header.php' ); ?> -
    +
    @@ -31,14 +31,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
    -
    - +
    + <?php _e( 'Code is Poetry' ); ?>
    @@ -61,44 +55,47 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
    -
    -
    -

    -

    - license, the GPL.' ), - __( 'https://wordpress.org/about/license/' ) - ); - ?> -

    -
    +
    +

    -
    -
    -
    -

    -

    -
    -
    -
    -

    -

    -
    -
    -
    -

    -

    -
    -
    -
    -

    -

    -
    -
    +

    + license, the GPL.' ), + __( 'https://wordpress.org/about/license/' ) + ); + ?> +

    +
    -
    +
    + +
    +
    +
    +

    +

    +
    +
    +
    +

    +

    +
    +
    +
    +

    +

    +
    +
    +
    +

    +

    +
    +
    + +
    +

    -

    +
    @@ -25,14 +25,8 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
    -
    - +
    + <?php _e( 'Code is Poetry' ); ?>
    @@ -55,28 +49,32 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
    -
    -

    +
    +
    +

    -

    - WordPress.org stats page.' ), - __( 'https://wordpress.org/about/stats/' ) - ); - ?> -

    +

    -

    - WordPress.org/about/privacy.' ), - __( 'https://wordpress.org/about/privacy/' ) - ); - ?> -

    +

    + WordPress.org stats page.' ), + __( 'https://wordpress.org/about/stats/' ) + ); + ?> +

    + +

    + WordPress.org/about/privacy.' ), + __( 'https://wordpress.org/about/privacy/' ) + ); + ?> +

    +