Merge

staylor · Sep 8, 2015 · d40bcdd · d40bcdd
2 parents fa8c3d2 + 3d8199c
commit d40bcdd
Show file tree

Hide file tree

Showing 161 changed files with 1,230 additions and 528 deletions.
diff --git a/readme.html b/readme.html
@@ -59,7 +59,7 @@ <h1>System Requirements</h1>
 
 <h2>Recommendations</h2>
 <ul>
-	<li><a href="http://php.net/">PHP</a> version <strong>5.4</strong> or higher.</li>
+	<li><a href="http://php.net/">PHP</a> version <strong>5.6</strong> or higher.</li>
 	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.5</strong> or higher.</li>
 	<li>The <a href="http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>

diff --git a/wp-admin/css/admin-menu-rtl.css b/wp-admin/css/admin-menu-rtl.css
@@ -39,7 +39,7 @@
 
 .icon16:before {
 	color: #999;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	padding: 6px 0;
 	height: 34px;
@@ -593,7 +593,7 @@ ul#adminmenu > li.current > a.current:after {
 	top: -3px;
 	color: #a0a5aa;
 	color: rgba(240,245,250,0.6);
-	font: normal 20px/1 'dashicons' !important;
+	font: normal 20px/1 dashicons !important;
 	speak: none;
 	margin: 0 auto;
 	padding: 0 !important;
@@ -904,7 +904,7 @@ li#wp-admin-bar-menu-toggle {
 		content: '\f228';
 		display: inline-block;
 		float: right;
-		font: normal 40px/45px 'Dashicons';
+		font: normal 40px/45px dashicons;
 		vertical-align: middle;
 		outline: none;
 		margin: 0;

diff --git a/wp-admin/css/admin-menu.css b/wp-admin/css/admin-menu.css
@@ -39,7 +39,7 @@
 
 .icon16:before {
 	color: #999;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	padding: 6px 0;
 	height: 34px;
@@ -593,7 +593,7 @@ ul#adminmenu > li.current > a.current:after {
 	top: -3px;
 	color: #a0a5aa;
 	color: rgba(240,245,250,0.6);
-	font: normal 20px/1 'dashicons' !important;
+	font: normal 20px/1 dashicons !important;
 	speak: none;
 	margin: 0 auto;
 	padding: 0 !important;
@@ -904,7 +904,7 @@ li#wp-admin-bar-menu-toggle {
 		content: '\f228';
 		display: inline-block;
 		float: left;
-		font: normal 40px/45px 'Dashicons';
+		font: normal 40px/45px dashicons;
 		vertical-align: middle;
 		outline: none;
 		margin: 0;

diff --git a/wp-admin/css/color-picker-rtl.min.css b/wp-admin/css/color-picker-rtl.min.css
diff --git a/wp-admin/css/color-picker.min.css b/wp-admin/css/color-picker.min.css
diff --git a/wp-admin/css/common-rtl.css b/wp-admin/css/common-rtl.css
@@ -539,7 +539,8 @@ code {
 
 .widefat thead td.check-column,
 .widefat tfoot td.check-column {
-	padding-top: 10px;
+	padding-top: 4px;
+	vertical-align: middle;
 }
 
 .update-php div.updated,
@@ -755,7 +756,7 @@ img.emoji {
 	color: #b4b9be;
 	content: '\f153';
 	display: block;
-	font: normal 16px/20px 'dashicons';
+	font: normal 16px/20px dashicons;
 	speak: none;
 	height: 20px;
 	text-align: center;
@@ -1065,7 +1066,7 @@ th.action-links {
 	color: #777;
 	-webkit-transition: color .1s ease-in 0;
 	transition: color .1s ease-in 0;
-	font-family: "dashicons";
+	font-family: dashicons;
 	font-size: 16px;
 	line-height: 1;
 	text-align: center;
@@ -1492,7 +1493,7 @@ form.upgrade .hint {
 #screen-meta-links .show-settings:after {
 	left: 0;
 	content: '\f140';
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: inline-block;
 	padding: 0 0 0 5px;
@@ -2150,7 +2151,7 @@ div.star-holder .star-rating {
 	-webkit-font-smoothing: antialiased;
 	font-size: 20px;
 	line-height: 1;
-	font-family: 'dashicons';
+	font-family: dashicons;
 	text-decoration: inherit;
 	font-weight: normal;
 	font-style: normal;
@@ -2726,7 +2727,7 @@ img {
 .js .sidebar-name .sidebar-name-arrow:before,
 .js .meta-box-sortables .postbox .handlediv:before {
 	left: 12px;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: inline-block;
 	padding: 8px 10px;
@@ -2866,7 +2867,7 @@ img {
 	content: '\f140';
 	border: none;
 	background: none;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: block;
 	padding: 0;

diff --git a/wp-admin/css/common.css b/wp-admin/css/common.css
@@ -539,7 +539,8 @@ code {
 
 .widefat thead td.check-column,
 .widefat tfoot td.check-column {
-	padding-top: 10px;
+	padding-top: 4px;
+	vertical-align: middle;
 }
 
 .update-php div.updated,
@@ -755,7 +756,7 @@ img.emoji {
 	color: #b4b9be;
 	content: '\f153';
 	display: block;
-	font: normal 16px/20px 'dashicons';
+	font: normal 16px/20px dashicons;
 	speak: none;
 	height: 20px;
 	text-align: center;
@@ -1065,7 +1066,7 @@ th.action-links {
 	color: #777;
 	-webkit-transition: color .1s ease-in 0;
 	transition: color .1s ease-in 0;
-	font-family: "dashicons";
+	font-family: dashicons;
 	font-size: 16px;
 	line-height: 1;
 	text-align: center;
@@ -1492,7 +1493,7 @@ form.upgrade .hint {
 #screen-meta-links .show-settings:after {
 	right: 0;
 	content: '\f140';
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: inline-block;
 	padding: 0 5px 0 0;
@@ -2150,7 +2151,7 @@ div.star-holder .star-rating {
 	-webkit-font-smoothing: antialiased;
 	font-size: 20px;
 	line-height: 1;
-	font-family: 'dashicons';
+	font-family: dashicons;
 	text-decoration: inherit;
 	font-weight: normal;
 	font-style: normal;
@@ -2726,7 +2727,7 @@ img {
 .js .sidebar-name .sidebar-name-arrow:before,
 .js .meta-box-sortables .postbox .handlediv:before {
 	right: 12px;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: inline-block;
 	padding: 8px 10px;
@@ -2866,7 +2867,7 @@ img {
 	content: '\f140';
 	border: none;
 	background: none;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: block;
 	padding: 0;

diff --git a/wp-admin/css/customize-controls-rtl.css b/wp-admin/css/customize-controls-rtl.css
@@ -647,7 +647,7 @@ p.customize-section-description {
 
 .customize-control .dropdown-arrow:after {
 	content: "\f140";
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: block;
 	padding: 0;
@@ -1208,6 +1208,16 @@ body.cheatin {
 	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
 }
 
+body.cheatin h1 {
+	border-bottom: 1px solid #dadada;
+	clear: both;
+	color: #666;
+	font: 24px "Open Sans", sans-serif;
+	margin: 30px 0 0 0;
+	padding: 0;
+	padding-bottom: 7px;
+}
+
 body.cheatin p {
 	font-size: 14px;
 	line-height: 1.5;

diff --git a/wp-admin/css/customize-controls-rtl.min.css b/wp-admin/css/customize-controls-rtl.min.css
diff --git a/wp-admin/css/customize-controls.css b/wp-admin/css/customize-controls.css
@@ -647,7 +647,7 @@ p.customize-section-description {
 
 .customize-control .dropdown-arrow:after {
 	content: "\f140";
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	speak: none;
 	display: block;
 	padding: 0;
@@ -1208,6 +1208,16 @@ body.cheatin {
 	box-shadow: 0 1px 3px rgba(0,0,0,0.13);
 }
 
+body.cheatin h1 {
+	border-bottom: 1px solid #dadada;
+	clear: both;
+	color: #666;
+	font: 24px "Open Sans", sans-serif;
+	margin: 30px 0 0 0;
+	padding: 0;
+	padding-bottom: 7px;
+}
+
 body.cheatin p {
 	font-size: 14px;
 	line-height: 1.5;

diff --git a/wp-admin/css/customize-controls.min.css b/wp-admin/css/customize-controls.min.css
diff --git a/wp-admin/css/customize-nav-menus-rtl.css b/wp-admin/css/customize-nav-menus-rtl.css
@@ -91,13 +91,13 @@
 }
 
 /* Menu-item reordering nav. */
-.customize-control-nav_menu .reordering .reorder,
+.reordering .customize-control-nav_menu .reorder,
 .customize-control-nav_menu .reorder-done {
 	display: none;
 }
 
 .customize-control-nav_menu .reorder,
-.customize-control-nav_menu .reordering .reorder-done {
+.reordering .customize-control-nav_menu .reorder-done {
 	display: inline-block;
 	padding: 5px 8px;
 }
@@ -327,7 +327,7 @@
 	border: none;
 	content: "\f111";
 	display: block;
-	font: 18px/1 "dashicons";
+	font: 18px/1 dashicons;
 	padding: 5px;
 	text-align: center;
 	text-decoration: none !important;
@@ -506,7 +506,7 @@
 	position: relative;
 	right: -2px;
 	top: -1px;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	vertical-align: middle;
 	-webkit-transition: all 0.2s;
 	transition: all 0.2s;
@@ -629,7 +629,7 @@
 
 #available-menu-items .accordion-section-title .toggle-indicator:after {
 	content: '\f140';
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	color: #a0a5aa;
 	vertical-align: top;
 	speak: none;

diff --git a/wp-admin/css/customize-nav-menus-rtl.min.css b/wp-admin/css/customize-nav-menus-rtl.min.css
diff --git a/wp-admin/css/customize-nav-menus.css b/wp-admin/css/customize-nav-menus.css
@@ -91,13 +91,13 @@
 }
 
 /* Menu-item reordering nav. */
-.customize-control-nav_menu .reordering .reorder,
+.reordering .customize-control-nav_menu .reorder,
 .customize-control-nav_menu .reorder-done {
 	display: none;
 }
 
 .customize-control-nav_menu .reorder,
-.customize-control-nav_menu .reordering .reorder-done {
+.reordering .customize-control-nav_menu .reorder-done {
 	display: inline-block;
 	padding: 5px 8px;
 }
@@ -327,7 +327,7 @@
 	border: none;
 	content: "\f111";
 	display: block;
-	font: 18px/1 "dashicons";
+	font: 18px/1 dashicons;
 	padding: 5px;
 	text-align: center;
 	text-decoration: none !important;
@@ -506,7 +506,7 @@
 	position: relative;
 	left: -2px;
 	top: -1px;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	vertical-align: middle;
 	-webkit-transition: all 0.2s;
 	transition: all 0.2s;
@@ -629,7 +629,7 @@
 
 #available-menu-items .accordion-section-title .toggle-indicator:after {
 	content: '\f140';
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	color: #a0a5aa;
 	vertical-align: top;
 	speak: none;

diff --git a/wp-admin/css/customize-nav-menus.min.css b/wp-admin/css/customize-nav-menus.min.css
diff --git a/wp-admin/css/customize-widgets-rtl.css b/wp-admin/css/customize-widgets-rtl.css
@@ -182,7 +182,7 @@
 	left: 0;
 	width: 100%;
 	height: 100%;
-	font: normal 20px/43px 'dashicons';
+	font: normal 20px/43px dashicons;
 	text-align: center;
 	text-indent: 0;
 	-webkit-font-smoothing: antialiased;
@@ -256,7 +256,7 @@
 	position: absolute;
 	top: 12px;
 	right: 10px;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
@@ -316,7 +316,7 @@
 	position: relative;
 	right: -2px;
 	top: -1px;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	vertical-align: middle;
 	-webkit-transition: all 0.2s;
 	transition: all 0.2s;
@@ -466,7 +466,7 @@ body.adding-widget #customize-preview {
 	width: 20px;
 	height: 20px;
 	color: #32373c;
-	font: normal 20px/1 'dashicons';
+	font: normal 20px/1 dashicons;
 	text-align: center;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;