From b37725917d7151c6ffd4a6e0311eb5aab217e85c Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Fri, 28 Nov 2008 07:35:33 +0000
Subject: [PATCH] Remove "Danger!" red from Cancel links and Deactivate plugins

git-svn-id: https://develop.svn.wordpress.org/trunk@9941 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/css/colors-fresh.css | 12 ------------
 wp-admin/plugins.php          |  2 +-
 wp-admin/wp-admin.css         | 19 ++++++-------------
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index ff6c3b206d..29298abb85 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -1422,18 +1422,6 @@ div.star.select:hover {
 	color: #ccc;
 }
 
-
-form p.submit a.cancel {
-	border-color: red;
-	color: red;
-	text-shadow: none;
-}
-
-form p.submit a.cancel:hover {
-	background: red;
-	color: white;
-}
-
 .misc-pub-section {
 	border-bottom-color: #eee;
 }
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index c8e55629b9..05a476049b 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -280,7 +280,7 @@ function print_plugins_table($plugins, $context = '') {
 		$action_links = array();
 
 		if ( 'active' == $context )
-			$action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '" class="delete">' . __('Deactivate') . '</a>';
+			$action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file, 'deactivate-plugin_' . $plugin_file) . '" title="' . __('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';
 		else //Inactive or Recently deactivated
 			$action_links[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
 
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a1f26a3bed..8529e3cfd9 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -198,17 +198,6 @@ kbd, code {
 	border-bottom-right-radius: 3px;
 }
 
-form p.submit a.cancel {
-	padding: 3px 0 0;
-	background: transparent;
-	border-width: 0 0 1px;
-	border-style: none none solid;
-	-moz-border-radius: 0;
-	-webkit-border-radius: 0;
-	-khtml-border-radius: 0;
-	border-radius: 0;
-}
-
 form p.submit a.cancel:hover {
 	text-decoration: none;
 }
@@ -350,8 +339,12 @@ form p.submit a.cancel:hover {
 	box-sizing: content-box;
 }
 
-a.button {
-	padding: 4px 8px;
+a.button,
+a.button-primary,
+a.button-secondary {
+	line-height: 1.4em;
+	-webkit-border-radius: 10px;
+	padding: 3px 10px;
 }
 
 #doaction,