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

README.md

@@ -1,7 +1,7 @@
 Project Nami
 ===============
 
-### Version: `1.5.8` ###
+### Version: `1.6.0` ###
 
 ### Description: ###
 [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://deploy.azure.com/?repository=https://github.com/ProjectNami/projectnami/tree/latest)

wp-admin/admin-ajax.php

@@ -64,7 +64,7 @@
 	'parse-media-shortcode', 'destroy-sessions', 'install-plugin', 'update-plugin', 'press-this-save-post',
 	'press-this-add-category', 'crop-image', 'generate-password', 'save-wporg-username', 'delete-plugin',
 	'search-plugins', 'search-install-plugins', 'activate-plugin', 'update-theme', 'delete-theme',
-	'install-theme', 'get-post-thumbnail-html',
+	'install-theme', 'get-post-thumbnail-html', 'get-community-events',
 );
 
 // Deprecated

wp-admin/admin-footer.php

@@ -80,10 +80,6 @@
  * refers to the global hook suffix of the current page.
  *
  * @since 4.6.0
- *
- * @global string $hook_suffix
- *
- * @param string $hook_suffix The current admin page.
  */
 do_action( "admin_print_footer_scripts-{$hook_suffix}" );
 
@@ -101,9 +97,6 @@
  * refers to the global hook suffix of the current page.
  *
  * @since 2.8.0
- *
- * @global string $hook_suffix
- * @param string $hook_suffix The current admin page.
  */
 do_action( "admin_footer-{$hook_suffix}" );
 

wp-admin/admin.php

@@ -221,8 +221,9 @@
 		 */
 		do_action( $page_hook );
 	} else {
-		if ( validate_file($plugin_page) )
-			wp_die(__('Invalid plugin page'));
+		if ( validate_file( $plugin_page ) ) {
+			wp_die( __( 'Invalid plugin page.' ) );
+		}
 
 		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
 			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));

wp-admin/async-upload.php

@@ -52,7 +52,7 @@
 if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
 	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
+		wp_die( __( 'Invalid post type.' ) );
 	if ( ! current_user_can( 'edit_post', $id ) )
 		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
 

wp-admin/credits.php

@@ -20,7 +20,7 @@
 
 <h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
 
-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.' ), $display_version ); ?></p>
+<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s adds more ways for you to express yourself and represent your brand.' ), $display_version ); ?></p>
 
 <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 

wp-admin/css/about-rtl.css

@@ -40,7 +40,6 @@
 	max-width: 100%;
 	height: auto;
 	vertical-align: middle;
-	border: 1px solid rgba(0, 0, 0, 0.1);
 }
 
 .about-wrap .jetpack-video-wrapper {
@@ -161,43 +160,55 @@
 
 /* 1.2 - Structure */
 
-.about-wrap [class$=col] .col {
-	float: right;
-	position: relative;
-}
-
-.about-wrap .two-col .col {
-	margin-left: 4.799999999%;
-	width: 47.6%;
+.about-wrap [class$="-col"] {
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: -webkit-box;
+	display: -moz-box;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	-moz-box-pack: justify;
+	-ms-flex-pack: justify;
+	justify-content: space-between;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	-moz-box-align: center;
+	-ms-flex-align: center;
+	align-items: center;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap;
+}
+
+.about-wrap .feature-section.one-col {
+	margin: 0 auto;
+	max-width: 700px;
 }
 
-.about-wrap .two-col img {
-	margin-bottom: 1.5em;
+.about-wrap [class$="-col"] .col {
+	-webkit-flex: 1;
+	-ms-flex: 1;
+	-webkit-box-flex: 1;
+	-moz-box-flex: 1;
+	flex: 1;
 }
 
-.about-wrap .feature-section.two-col .col {
-	display: inline-block;
-	float: none;
-	margin-top: 1em;
-	margin-left: 4.799999999%;
-	width: -webkit-calc( 47.6% - 4px );
-	width: calc( 47.6% - 4px );
-	vertical-align: top;
+.about-wrap .two-col .col {
+	min-width: 47%;
+	max-width: 47%;
 }
 
 .about-wrap .three-col .col {
-	margin-left: 4.999999999%;
-	width: 29.95%;
+	-webkit-align-self: flex-start;
+	-ms-flex-item-align: start;
+	align-self: flex-start;
+	min-width: 31%;
+	max-width: 31%;
 }
 
-.about-wrap .two-col .col:nth-of-type(2n),
-.about-wrap .three-col .col:nth-of-type(3n) {
-	margin-left: 0;
-}
-
-.about-wrap .under-the-hood {
-	clear: both;
-	overflow: hidden;
+.about-wrap .two-col img {
+	margin-bottom: 1.5em;
 }
 
 .about-wrap .feature-video .mejs-controls {
@@ -298,11 +309,6 @@
 	padding-top: 35px;
 }
 
-.about-wrap .headline-feature {
-	margin: 0 auto;
-	max-width: 80%;
-}
-
 .about-wrap .feature-section .media-container {
 	overflow: hidden;
 }
@@ -446,6 +452,11 @@
 		column-count: 1;
 	}
 
+	.about-wrap .two-col .col,
+	.about-wrap .three-col .col {
+		min-width: 48% !important;
+	}
+
 	.about-wrap .three-col img {
 		display: block;
 		margin: 0 auto;
@@ -475,8 +486,7 @@
 
 	.about-wrap .two-col .col,
 	.about-wrap .three-col .col {
-		width: 100% !important;
-		float: none !important;
+		min-width: 100% !important;
 	}
 
 	.about-wrap .under-the-hood.three-col .col,