Merge upstream master into google-analytics-service

beaulebens · Dec 5, 2017 · cd53a23 · cd53a23
2 parents 189b332 + a7cbb2f
commit cd53a23
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 5 deletions.
diff --git a/admin-ui.php b/admin-ui.php
@@ -50,7 +50,6 @@ function admin_page_load() {
 	function admin_page_header( $screen = false ) {
 		// Output the actual heading + icon for the page
 		echo '<div class="wrap">';
-		screen_icon( 'ms-admin' );
 		switch ( $screen ) {
 		case 'tokens' :
 			echo '<h2>' . __( 'Keyring: Service Connections', 'keyring' ) . ' <a href="' . Keyring_Util::admin_url( false, array( 'action' => 'services' ) ) . '" class="add-new-h2">' . __( 'Add New', 'keyring' ) . '</a></h2>';

diff --git a/includes/services/core/http-basic.php b/includes/services/core/http-basic.php
@@ -29,7 +29,6 @@ function get_display( Keyring_Access_Token $token ) {
 	function request_ui() {
 		// Common Header
 		echo '<div class="wrap">';
-		screen_icon( 'ms-admin' );
 		echo '<h2>' . __( 'Account Details', 'keyring' ) . '</h2>';
 
 		// Handle errors

diff --git a/includes/services/extended/google-contacts.php b/includes/services/extended/google-contacts.php
@@ -150,7 +150,6 @@ function basic_ui() {
 
 		// Common Header
 		echo '<div class="wrap">';
-		screen_icon( 'ms-admin' );
 		echo '<h2>' . __( 'Keyring Service Management', 'keyring' ) . '</h2>';
 		echo '<p><a href="' . Keyring_Util::admin_url( false, array( 'action' => 'services' ) ) . '">' . __( '&larr; Back', 'keyring' ) . '</a></p>';
 		echo '<h3>' . sprintf( __( '%s API Credentials', 'keyring' ), esc_html( $this->get_label() ) ) . '</h3>';

diff --git a/includes/services/extended/instapaper.php b/includes/services/extended/instapaper.php
@@ -45,7 +45,6 @@ function basic_ui_intro() {
 	function request_ui() {
 		// Common Header
 		echo '<div class="wrap">';
-		screen_icon( 'ms-admin' );
 		echo '<h2>' . __( 'Account Details', 'keyring' ) . '</h2>';
 
 		// Handle errors

diff --git a/service.php b/service.php
@@ -143,7 +143,6 @@ function basic_ui() {
 
 		// Common Header
 		echo '<div class="wrap">';
-		screen_icon( 'ms-admin' );
 		echo '<h2>' . __( 'Keyring Service Management', 'keyring' ) . '</h2>';
 		echo '<p><a href="' . Keyring_Util::admin_url( false, array( 'action' => 'services' ) ) . '">' . __( '&larr; Back', 'keyring' ) . '</a></p>';
 		echo '<h3>' . sprintf( __( '%s API Credentials', 'keyring' ), esc_html( $this->get_label() ) ) . '</h3>';