Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickebates committed May 22, 2019
2 parents 246c85c + c398733 commit b23e828
Show file tree
Hide file tree
Showing 94 changed files with 2,974 additions and 2,425 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Project Nami
===============

### Version: `2.2.0` ###
### Version: `2.2.1` ###

### Description: ###
[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://deploy.azure.com/?repository=https://github.com/ProjectNami/projectnami/tree/latest)
Expand Down
41 changes: 39 additions & 2 deletions wp-admin/about.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@
?>
</h1>

<p class="about-text"><?php printf( __( 'Congratulations on updating to WordPress 5.2! This update makes it easier than ever to fix your site if something goes wrong.' ), $display_version ); ?></p>
<p class="about-text">
<?php
printf(
/* translators: %s: The current WordPress version number */
__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
$display_version
);
?>
</p>

<div class="wp-badge">
<?php
Expand All @@ -34,12 +42,41 @@
</div>

<nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="about.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</nav>

<div class="changelog point-releases">
<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
<p>
<?php
printf(
/* translators: 1: WordPress version number, 2: plural number of bugs. */
_n(
'<strong>Version %1$s</strong> addressed %2$s bug.',
'<strong>Version %1$s</strong> addressed %2$s bugs.',
33
),
'5.2.1',
number_format_i18n( 33 )
);
?>
<?php
printf(
/* translators: %s: HelpHub URL */
__( 'For more information, see <a href="%s">the release notes</a>.' ),
sprintf(
/* translators: %s: WordPress version */
esc_url( __( 'https://wordpress.org/support/wordpress-version/version-%s/' ) ),
sanitize_title( '5.2.1' )
)
);
?>
</p>
</div>

<div class="headline-feature">
<h2><?php _e( 'Keeping Your Site Safe' ); ?></h2>
<p class="lead-description"><?php _e( 'WordPress 5.2 gives you even more robust tools for identifying and fixing configuration issues and fatal errors. Whether you are a developer helping clients or you manage your site solo, these tools can help get you the right information when you need it.' ); ?></p>
Expand Down
33 changes: 26 additions & 7 deletions wp-admin/credits.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,33 @@
?>
<div class="wrap about-wrap full-width-layout">

<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>

<p class="about-text"><?php printf( __( 'Congratulations on updating to WordPress 5.2! This update makes it easier than ever to fix your site if something goes wrong.' ), $display_version ); ?></p>

<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
<h1>
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version );
?>
</h1>

<p class="about-text">
<?php
printf(
/* translators: %s: The current WordPress version number */
__( 'Congratulations on updating to WordPress %s! This update makes it easier than ever to fix your site if something goes wrong.' ),
$display_version
);
?>
</p>

<div class="wp-badge">
<?php
/* translators: %s: The current WordPress version number */
printf( __( 'Version %s' ), $display_version );
?>
</div>

<nav class="nav-tab-wrapper wp-clearfix" aria-label="<?php esc_attr_e( 'Secondary menu' ); ?>">
<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
<a href="credits.php" class="nav-tab nav-tab-active"><?php _e( 'Credits' ); ?></a>
<a href="credits.php" class="nav-tab nav-tab-active" aria-current="page"><?php _e( 'Credits' ); ?></a>
<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
</nav>
Expand All @@ -38,8 +56,8 @@

if ( ! $credits ) {
echo '<p class="about-description">';
/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
printf(
/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
'https://wordpress.org/about/',
__( 'https://make.wordpress.org/' )
Expand Down Expand Up @@ -123,6 +141,7 @@

// These are strings returned by the API that we want to be translatable
__( 'Project Leaders' );
/* translators: %s: The current WordPress version number */
__( 'Core Contributors to WordPress %s' );
__( 'Noteworthy Contributors' );
__( 'Cofounder, Project Lead' );
Expand Down
8 changes: 8 additions & 0 deletions wp-admin/css/common-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -3686,6 +3686,10 @@ img {
padding-top: 46px;
}

.screen-reader-shortcut:focus {
top: -39px;
}

body {
min-width: 240px;
overflow-x: hidden;
Expand Down Expand Up @@ -3982,6 +3986,10 @@ img {
padding-top: 0;
}

.screen-reader-shortcut:focus {
top: 7px;
}

#wpbody {
padding-top: 46px;
}
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/common-rtl.min.css

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions wp-admin/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -3686,6 +3686,10 @@ img {
padding-top: 46px;
}

.screen-reader-shortcut:focus {
top: -39px;
}

body {
min-width: 240px;
overflow-x: hidden;
Expand Down Expand Up @@ -3982,6 +3986,10 @@ img {
padding-top: 0;
}

.screen-reader-shortcut:focus {
top: 7px;
}

#wpbody {
padding-top: 46px;
}
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/common.min.css

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions wp-admin/css/forms-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,7 @@ table.form-table td .updated p {
border: 1px solid #e5e5e5;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
background: #fff;
box-sizing: border-box;
}

/* Press this styles */
Expand Down Expand Up @@ -1549,6 +1550,9 @@ table.form-table td .updated p {
.wp-list-table.privacy_requests.widefat thead td input {
margin-right: 5px;
}
.regular-text {
max-width: 100%;
}
}

@media only screen and (max-width: 768px) {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/forms-rtl.min.css

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions wp-admin/css/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -801,6 +801,7 @@ table.form-table td .updated p {
border: 1px solid #e5e5e5;
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
background: #fff;
box-sizing: border-box;
}

/* Press this styles */
Expand Down Expand Up @@ -1549,6 +1550,9 @@ table.form-table td .updated p {
.wp-list-table.privacy_requests.widefat thead td input {
margin-left: 5px;
}
.regular-text {
max-width: 100%;
}
}

@media only screen and (max-width: 768px) {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/forms.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-admin/css/login-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-admin/css/login.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-admin/css/nav-menus-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
width: 100%;
}

.nav-menus-php .major-publishing-actions .publishing-action {
.nav-menus-php #nav-menu-header .major-publishing-actions .publishing-action {
padding-top: 1em;
}

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/nav-menus-rtl.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-admin/css/nav-menus.css
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
width: 100%;
}

.nav-menus-php .major-publishing-actions .publishing-action {
.nav-menus-php #nav-menu-header .major-publishing-actions .publishing-action {
padding-top: 1em;
}

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/nav-menus.min.css

Large diffs are not rendered by default.

28 changes: 10 additions & 18 deletions wp-admin/css/site-health-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -153,32 +153,23 @@
.health-check-body .pass::before,
.health-check-body .good::before {
content: "\f147";
display: inline-block;
color: #46b450;
font-family: dashicons;
vertical-align: top;
}

.health-check-body .warning::before {
content: "\f460";
display: inline-block;
color: #ffb900;
font-family: dashicons;
}

.health-check-body .info::before {
content: "\f348";
display: inline-block;
color: #00a0d2;
font-family: dashicons;
}

.health-check-body .fail::before,
.health-check-body .error::before {
content: "\f335";
display: inline-block;
color: #dc3232;
font-family: dashicons;
}

.site-health-copy-buttons {
Expand Down Expand Up @@ -277,13 +268,16 @@
border: 0;
color: #32373c;
cursor: pointer;
display: block;
display: flex;
font-weight: 400;
margin: 0;
padding: 1em 1.5em 1em 3.5em;
min-height: 46px;
position: relative;
text-align: right;
width: 100%;
align-items: center;
justify-content: space-between;
}

.wp-core-ui .button.site-health-view-passed {
Expand All @@ -306,9 +300,9 @@
}

.health-check-accordion-trigger .title {
display: inline-block;
pointer-events: none;
font-weight: 600;
flex-grow: 1;
}

.health-check-accordion-trigger .icon,
Expand All @@ -325,7 +319,6 @@
}

.health-check-accordion-trigger .badge {
float: left;
padding: 0.1rem 0.5rem 0.15rem;
color: #32373c;
font-weight: 600;
Expand Down Expand Up @@ -386,10 +379,10 @@
}

.health-check-wp-paths-sizes.spinner {
position: absolute;
visibility: visible;
float: none;
margin: 0 4px;
flex-shrink: 0;
}

@media screen and (max-width: 782px) {
Expand All @@ -407,14 +400,13 @@
margin-right: 10px;
}

.health-check-accordion-trigger .title {
display: block;
margin-bottom: 1em;
.site-health-issues-wrapper .health-check-accordion-trigger {
flex-direction: column;
align-items: flex-start;
}

.health-check-accordion-trigger .badge {
float: right;
margin: 0;
margin: 1em 0 0;
}
}

Expand Down
Loading

0 comments on commit b23e828

Please sign in to comment.