Merge

staylor · Jun 19, 2015 · 7c42ad1 · 7c42ad1
2 parents 79dbbab + 777d3ba
commit 7c42ad1
Show file tree

Hide file tree

Showing 106 changed files with 8,677 additions and 878 deletions.
diff --git a/wp-admin/credits.php b/wp-admin/credits.php
@@ -109,8 +109,6 @@ function _wp_credits_build_object_link( &$data ) {
 
 echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
 
-$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
-
 foreach ( $credits['groups'] as $group_slug => $group_data ) {
 	if ( $group_data['name'] ) {
 		if ( 'Translators' == $group_data['name'] ) {
@@ -144,8 +142,11 @@ function _wp_credits_build_object_link( &$data ) {
 			foreach ( $group_data['data'] as $person_data ) {
 				echo '<li class="wp-person" id="wp-person-' . $person_data[2] . '">' . "\n\t";
 				echo '<a href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">';
-				$size = 'compact' == $group_data['type'] ? '30' : '60';
-				echo '<img src="' . $gravatar . $person_data[1] . '?s=' . $size . '" srcset="' . $gravatar . $person_data[1] . '?s=' . $size * 2 . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
+				$size = 'compact' == $group_data['type'] ? 30 : 60;
+				$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 ) );
+				echo '<img src="' . esc_attr( $data['url'] ) . '" srcset="' . esc_attr( $data2x['url'] ) . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
 				echo '<a class="web" href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">' . $person_data[0] . "</a>\n\t";
 				if ( ! $compact )
 					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";

diff --git a/wp-admin/css/common-rtl.css b/wp-admin/css/common-rtl.css
@@ -1443,14 +1443,6 @@ form.upgrade .hint {
 	margin: 0 0 0 20px;
 }
 
-#screen-meta-links a {
-	padding: 3px 16px 3px 6px;
-}
-
-#screen-meta-links a:focus {
-	outline: none;
-}
-
 /* screen options and help tabs revert */
 #screen-meta {
 	display: none;
@@ -1480,26 +1472,23 @@ form.upgrade .hint {
 	top: 0;
 }
 
-#screen-meta-links a {
+#screen-meta-links .show-settings {
+	border: 0;
+	background: none;
+	-webkit-border-radius: 0;
+	border-radius: 0;
 	color: #777;
+	line-height: 1.7;
+	padding: 3px 16px 3px 6px;
 }
 
-#screen-meta-links a:hover,
-#screen-meta-links a:active,
-#screen-meta-links a:focus {
+#screen-meta-links .show-settings:hover,
+#screen-meta-links .show-settings:active,
+#screen-meta-links .show-settings:focus {
 	color: #32373c;
 }
 
-#screen-meta-links a.show-settings {
-	display: block;
-	font-size: 13px;
-	height: 22px;
-	line-height: 22px;
-	text-decoration: none;
-	z-index: 1;
-}
-
-#screen-meta-links a:after {
+#screen-meta-links .show-settings:after {
 	left: 0;
 	content: '\f140';
 	font: normal 20px/1 'dashicons';
@@ -1515,13 +1504,10 @@ form.upgrade .hint {
 	color: #b4b9be;
 }
 
-#screen-meta-links a.screen-meta-active:after {
+#screen-meta-links .screen-meta-active:after {
 	content: '\f142';
 }
 
-#screen-meta-links a.show-settings:hover {
-	text-decoration: none;
-}
 /* end screen options and help tabs */
 
 .toggle-arrow {
@@ -2070,6 +2056,13 @@ td.media-icon img {
 	margin-top: 0;
 }
 
+.edit-comment-author {
+	font-size: 14px;
+	line-height: 1.4;
+	font-weight: 600;
+	color: #222;
+}
+
 #namediv h3 label {
 	vertical-align: baseline;
 }

diff --git a/wp-admin/css/common.css b/wp-admin/css/common.css
@@ -1443,14 +1443,6 @@ form.upgrade .hint {
 	margin: 0 20px 0 0;
 }
 
-#screen-meta-links a {
-	padding: 3px 6px 3px 16px;
-}
-
-#screen-meta-links a:focus {
-	outline: none;
-}
-
 /* screen options and help tabs revert */
 #screen-meta {
 	display: none;
@@ -1480,26 +1472,23 @@ form.upgrade .hint {
 	top: 0;
 }
 
-#screen-meta-links a {
+#screen-meta-links .show-settings {
+	border: 0;
+	background: none;
+	-webkit-border-radius: 0;
+	border-radius: 0;
 	color: #777;
+	line-height: 1.7;
+	padding: 3px 6px 3px 16px;
 }
 
-#screen-meta-links a:hover,
-#screen-meta-links a:active,
-#screen-meta-links a:focus {
+#screen-meta-links .show-settings:hover,
+#screen-meta-links .show-settings:active,
+#screen-meta-links .show-settings:focus {
 	color: #32373c;
 }
 
-#screen-meta-links a.show-settings {
-	display: block;
-	font-size: 13px;
-	height: 22px;
-	line-height: 22px;
-	text-decoration: none;
-	z-index: 1;
-}
-
-#screen-meta-links a:after {
+#screen-meta-links .show-settings:after {
 	right: 0;
 	content: '\f140';
 	font: normal 20px/1 'dashicons';
@@ -1515,13 +1504,10 @@ form.upgrade .hint {
 	color: #b4b9be;
 }
 
-#screen-meta-links a.screen-meta-active:after {
+#screen-meta-links .screen-meta-active:after {
 	content: '\f142';
 }
 
-#screen-meta-links a.show-settings:hover {
-	text-decoration: none;
-}
 /* end screen options and help tabs */
 
 .toggle-arrow {
@@ -2070,6 +2056,13 @@ td.media-icon img {
 	margin-top: 0;
 }
 
+.edit-comment-author {
+	font-size: 14px;
+	line-height: 1.4;
+	font-weight: 600;
+	color: #222;
+}
+
 #namediv h3 label {
 	vertical-align: baseline;
 }

diff --git a/wp-admin/css/customize-controls-rtl.css b/wp-admin/css/customize-controls-rtl.css
@@ -174,8 +174,8 @@ body {
 #customize-controls .control-section .accordion-section-title:hover,
 #customize-controls .control-section.open .accordion-section-title,
 #customize-controls .control-section .accordion-section-title:focus {
-	color: #fff;
-	background: #0073aa;
+	color: #23282d;
+	background: #f5f5f5;
 }
 
 .js .control-section:hover .accordion-section-title,
@@ -189,7 +189,7 @@ body {
 #customize-theme-controls .control-section .accordion-section-title:hover:after,
 #customize-theme-controls .control-section.open .accordion-section-title:after,
 #customize-theme-controls .control-section .accordion-section-title:focus:after {
-	color: #fff;
+	color: #23282d;
 }
 
 #customize-theme-controls .control-section.open {
@@ -210,13 +210,15 @@ body {
 }
 
 #customize-theme-controls .accordion-section-content {
-	margin: 0;
 	position: absolute;
-	right: 100%;
 	top: 0;
-	width: -webkit-calc(100% - 24px);
-	width: calc(100% - 24px);
-	padding: 12px;
+	right: 100%;
+	width: 100%;
+	margin: 0;
+ 	padding: 12px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 .customize-section-description-container {
@@ -406,9 +408,8 @@ h3.customize-section-title {
 .customize-panel-back:focus,
 .customize-section-back:hover,
 .customize-section-back:focus {
-	background: #0073aa;
-	border-color: #ccc;
-	color: #fff;
+	color: #23282d;
+	background: #f5f5f5;
 	outline: none;
 	-webkit-box-shadow: none;
 	box-shadow: none;
@@ -1073,7 +1074,6 @@ p.customize-section-description {
 	display: none;
 	padding: 0 8px;
 	background: #f1f1f1;
-	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;

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
@@ -174,8 +174,8 @@ body {
 #customize-controls .control-section .accordion-section-title:hover,
 #customize-controls .control-section.open .accordion-section-title,
 #customize-controls .control-section .accordion-section-title:focus {
-	color: #fff;
-	background: #0073aa;
+	color: #23282d;
+	background: #f5f5f5;
 }
 
 .js .control-section:hover .accordion-section-title,
@@ -189,7 +189,7 @@ body {
 #customize-theme-controls .control-section .accordion-section-title:hover:after,
 #customize-theme-controls .control-section.open .accordion-section-title:after,
 #customize-theme-controls .control-section .accordion-section-title:focus:after {
-	color: #fff;
+	color: #23282d;
 }
 
 #customize-theme-controls .control-section.open {
@@ -210,13 +210,15 @@ body {
 }
 
 #customize-theme-controls .accordion-section-content {
-	margin: 0;
 	position: absolute;
-	left: 100%;
 	top: 0;
-	width: -webkit-calc(100% - 24px);
-	width: calc(100% - 24px);
-	padding: 12px;
+	left: 100%;
+	width: 100%;
+	margin: 0;
+ 	padding: 12px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 .customize-section-description-container {
@@ -406,9 +408,8 @@ h3.customize-section-title {
 .customize-panel-back:focus,
 .customize-section-back:hover,
 .customize-section-back:focus {
-	background: #0073aa;
-	border-color: #ccc;
-	color: #fff;
+	color: #23282d;
+	background: #f5f5f5;
 	outline: none;
 	-webkit-box-shadow: none;
 	box-shadow: none;
@@ -1073,7 +1074,6 @@ p.customize-section-description {
 	display: none;
 	padding: 0 8px;
 	background: #f1f1f1;
-	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;

diff --git a/wp-admin/css/customize-controls.min.css b/wp-admin/css/customize-controls.min.css