Merge remote-tracking branch 'refs/remotes/origin/master' into latest

ProjectNami · Aug 3, 2018 · 3e18614 · 3e18614
2 parents 9eefc25 + 731b2b4
commit 3e18614
Show file tree

Hide file tree

Showing 107 changed files with 4,572 additions and 4,303 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Project Nami
 ===============
 
-### Version: `1.9.7` ###
+### Version: `1.9.8` ###
 
 ### Description: ###
 [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://deploy.azure.com/?repository=https://github.com/ProjectNami/projectnami/tree/latest)

diff --git a/wp-admin/about.php b/wp-admin/about.php
@@ -11,7 +11,8 @@
 
 wp_enqueue_script( 'underscore' );
 
-$title = __( 'About' );
+/* translators: Page title of the About WordPress page in the admin. */
+$title = _x( 'About', 'page title' );
 
 list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
 
@@ -35,7 +36,27 @@
 			<p>
 				<?php
 				printf(
-				/* translators: 1: WordPress version number, 2: plural number of bugs. */
+					/* 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.',
+						46
+					),
+					'4.9.8',
+					number_format_i18n( 46 )
+				);
+
+				printf(
+					/* translators: %s: Codex URL */
+					__( 'For more information, see <a href="%s">the release notes</a>.' ),
+					'https://codex.wordpress.org/Version_4.9.8'
+				);
+				?>
+			</p>
+			<p>
+				<?php
+				printf(
+					/* translators: 1: WordPress version number, 2: plural number of bugs. */
 					_n(
 						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
 						'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.',

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
@@ -67,6 +67,7 @@
 	'get-post-thumbnail-html', 'get-community-events', 'edit-theme-plugin-file',
 	'wp-privacy-export-personal-data',
 	'wp-privacy-erase-personal-data',
+	'update-try-gutenberg-panel',
 );
 
 // Deprecated

diff --git a/wp-admin/css/common-rtl.css b/wp-admin/css/common-rtl.css
@@ -764,6 +764,7 @@ img.emoji {
 
 /* @todo can we combine these into a class or use an existing dashicon one? */
 .welcome-panel .welcome-panel-close:before,
+.try-gutenberg-panel .try-gutenberg-panel-close:before,
 .tagchecklist .ntdelbutton .remove-tag-icon:before,
 #bulk-titles div a:before,
 .notice-dismiss:before {

diff --git a/wp-admin/css/common-rtl.min.css b/wp-admin/css/common-rtl.min.css
diff --git a/wp-admin/css/common.css b/wp-admin/css/common.css
@@ -764,6 +764,7 @@ img.emoji {
 
 /* @todo can we combine these into a class or use an existing dashicon one? */
 .welcome-panel .welcome-panel-close:before,
+.try-gutenberg-panel .try-gutenberg-panel-close:before,
 .tagchecklist .ntdelbutton .remove-tag-icon:before,
 #bulk-titles div a:before,
 .notice-dismiss:before {

diff --git a/wp-admin/css/common.min.css b/wp-admin/css/common.min.css
diff --git a/wp-admin/css/dashboard-rtl.css b/wp-admin/css/dashboard-rtl.css
@@ -98,7 +98,8 @@
 }
 
 /* Welcome Panel */
-.welcome-panel {
+.welcome-panel,
+.try-gutenberg-panel {
 	position: relative;
 	overflow: auto;
 	margin: 16px 0;
@@ -110,7 +111,8 @@
 	line-height: 2.1em;
 }
 
-.welcome-panel h2 {
+.welcome-panel h2,
+.try-gutenberg-panel h2 {
 	margin: 0;
 	font-size: 21px;
 	font-weight: 400;
@@ -122,25 +124,43 @@
 	font-size: 16px;
 }
 
-.welcome-panel li {
+.try-gutenberg-panel h3 {
+	margin: 17px 0 0;
+	font-size: 16px;
+	line-height: 1.4;
+}
+
+.welcome-panel li,
+.try-gutenberg-panel li {
 	font-size: 14px;
 }
 
-.welcome-panel p {
+.welcome-panel p,
+.try-gutenberg-panel p {
 	color: #72777c;
 }
 
-.welcome-panel a {
+.welcome-panel a,
+.try-gutenberg-action a {
 	text-decoration: none;
 }
 
-.welcome-panel .about-description {
+.welcome-panel .about-description,
+.try-gutenberg-panel .about-description {
 	font-size: 16px;
 	margin: 0;
 }
 
-.welcome-panel .welcome-panel-close {
+.try-gutenberg-panel-content hr {
+	margin: 20px -23px 0 -23px;
+	border-top: 1px solid #f3f4f5;
+	border-bottom: none;
+}
+
+.welcome-panel .welcome-panel-close,
+.try-gutenberg-panel .try-gutenberg-panel-close {
 	position: absolute;
+	z-index: 10;
 	top: 10px;
 	left: 10px;
 	padding: 10px 21px 10px 15px;
@@ -149,7 +169,8 @@
 	text-decoration: none;
 }
 
-.welcome-panel .welcome-panel-close:before {
+.welcome-panel .welcome-panel-close:before,
+.try-gutenberg-panel .try-gutenberg-panel-close:before {
 	position: absolute;
 	top: 8px;
 	right: 0;
@@ -164,11 +185,23 @@
 	white-space: normal;
 }
 
-.welcome-panel-content {
-	margin-right: 13px;
+.welcome-panel-content,
+.try-gutenberg-panel-content {
+	margin: 0 13px;
 	max-width: 1500px;
 }
 
+.try-gutenberg-panel img {
+	margin-top: 23px;
+	width: calc( 100% - 40px );
+	border: 1px solid #f3f4f5;
+}
+
+.try-gutenberg-panel .install-now.updating-message:before,
+.try-gutenberg-panel .install-now.updated-message:before {
+	margin-top: 11px;
+}
+
 .welcome-panel .welcome-panel-column-container {
 	clear: both;
 	position: relative;
@@ -180,6 +213,10 @@
 	float: right;
 }
 
+.try-gutenberg-panel .try-gutenberg-panel-column > * {
+	padding-left: 40px;
+}
+
 .ie8 .welcome-panel .welcome-panel-column {
 	min-width: 230px;
 }
@@ -188,11 +225,27 @@
 	width: 36%;
 }
 
+.try-gutenberg-panel .try-gutenberg-panel-column-container {
+	display: -ms-grid;
+	display: grid;
+	-ms-grid-columns: 36% 32% 32%;
+	grid-template-columns: 36% 32% 32%;
+	margin-bottom: 13px;
+}
+
+.try-gutenberg-panel .try-gutenberg-panel-column:not(.try-gutenberg-panel-image-column) {
+	display: -ms-grid;
+	display: grid;
+	-ms-grid-rows: auto 100px;
+	grid-template-rows: auto 100px;
+}
+
 .welcome-panel-column p.hide-if-no-customize {
 	margin-top: 10px;
 }
 
-.welcome-panel-column p {
+.welcome-panel-column p,
+.try-gutenberg-panel-column p {
 	margin-top: 7px;
 	color: #444;
 }
@@ -202,7 +255,7 @@
 }
 
 .welcome-panel .welcome-panel-column ul {
-	margin: 0.8em 0 1em 1em;
+		margin: 0.8em 0 1em 1em;
 }
 
 .welcome-panel .welcome-panel-column li {
@@ -1207,6 +1260,17 @@ a.rsswidget {
 	}
 }
 
+@media screen and (max-width: 1024px) {
+	.try-gutenberg-panel .try-gutenberg-panel-column-container {
+		-ms-grid-columns: 50% 50%;
+		grid-template-columns: 50% 50%;
+	}
+
+	.try-gutenberg-panel .try-gutenberg-panel-image-column {
+		display: none;
+	}
+}
+
 @media screen and (max-width: 870px) {
 	.welcome-panel .welcome-panel-column,
 	.welcome-panel .welcome-panel-column:first-child {
@@ -1215,6 +1279,11 @@ a.rsswidget {
 		width: 100%;
 	}
 
+	.try-gutenberg-panel .try-gutenberg-panel-column-container {
+		-ms-grid-columns: 100%;
+		grid-template-columns: 100%;
+	}
+
 	.welcome-panel .welcome-panel-column li {
 		display: inline-block;
 		margin-left: 13px;
@@ -1223,7 +1292,6 @@ a.rsswidget {
 	.welcome-panel .welcome-panel-column ul {
 		margin: 0.4em 0 0;
 	}
-
 }
 
 @media screen and ( max-width: 782px ) {
@@ -1266,7 +1334,8 @@ a.rsswidget {
 /* Smartphone */
 @media screen and (max-width: 600px) {
 	/* Keep the close icon from overlapping the Welcome text. */
-	.welcome-panel .welcome-panel-close {
+	.welcome-panel .welcome-panel-close,
+	.try-gutenberg-panel .try-gutenberg-panel-close {
 		overflow: hidden;
 		text-indent: 40px;
 		white-space: nowrap;
@@ -1278,7 +1347,8 @@ a.rsswidget {
 	}
 
 	/* Make the close icon larger for tappability. */
-	.welcome-panel .welcome-panel-close:before {
+	.welcome-panel .welcome-panel-close:before,
+	.try-gutenberg-panel .try-gutenberg-panel-close:before {
 		font-size: 20px;
 		top: 5px;
 		right: -35px;

diff --git a/wp-admin/css/dashboard-rtl.min.css b/wp-admin/css/dashboard-rtl.min.css