1 files changed, 52 insertions, 54 deletions

diff --git a/views/default/css/elements/buttons.php b/views/default/css/elements/buttons.php
index d016eca7c..e9c99cf96 100644
--- a/views/default/css/elements/buttons.php
+++ b/views/default/css/elements/buttons.php
@@ -14,14 +14,22 @@
 .elgg-button {
 	font-size: 14px;
 	font-weight: bold;
+	
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+
 	width: auto;
 	padding: 2px 4px;
 	cursor: pointer;
 	outline: none;
+	
 	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
 	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+	box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+}
+a.elgg-button {
+	padding: 3px 6px;
 }
 
 /* Submit: This button should convey, "you're about to take some definitive action" */
@@ -30,93 +38,77 @@
 	text-shadow: 1px 1px 0px black;
 	text-decoration: none;
 	border: 1px solid #4690d6;
-	background-color: #4690d6;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat: repeat-x;
-	background-position: left 10px;
+	background: #4690d6 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
 }
 
 .elgg-button-submit:hover {
 	border-color: #0054a7;
 	text-decoration: none;
 	color: white;
-	background-color: #0054a7;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat: repeat-x;
-	background-position: left 10px;
+	background: #0054a7 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+}
+
+.elgg-button-submit.elgg-state-disabled {
+	background: #999;
+	border-color: #999;
+	cursor: default;
 }
 
 /* Cancel: This button should convey a negative but easily reversible action (e.g., turning off a plugin) */
 .elgg-button-cancel {
-	color: #333333;
-	background-color: #dddddd;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat: repeat-x;
-	background-position: left 10px;
-	border: 1px solid #999999;
+	color: #333;
+	background: #ddd url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+	border: 1px solid #999;
 }
 .elgg-button-cancel:hover {
-	color: white;
-	background-color: #999999;
+	color: #444;
+	background-color: #999;
 	background-position: left 10px;
 	text-decoration: none;
 }
 
 /* Action: This button should convey a normal, inconsequential action, such as clicking a link */
 .elgg-button-action {
-	background-color:#cccccc;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
-	background-repeat:  repeat-x;
-	background-position: 0 0;
-	border:1px solid #999999;
-	color: #333333;
-	padding: 2px 15px 2px 15px;
+	background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 0;
+	border:1px solid #999;
+	color: #333;
+	padding: 2px 15px;
 	text-align: center;
 	font-weight: bold;
 	text-decoration: none;
 	text-shadow: 0 1px 0 white;
 	cursor: pointer;
+	
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
+	border-radius: 5px;
+	
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
+	box-shadow: none;
 }
 
 .elgg-button-action:hover,
 .elgg-button-action:focus {
-	background-position: 0 -15px;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
-	background-repeat: repeat-x;
-	color: #111111;
+	background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 -15px;
+	color: #111;
 	text-decoration: none;
-	background-color: #cccccc;
-	border: 1px solid #999999;
+	border: 1px solid #999;
 }
 
 /* Delete: This button should convey "be careful before you click me" */
 .elgg-button-delete {
-	width:14px;
-	height:14px;
-	margin:0;
-	padding:0;
-	border:0;
-	float:right;
-	-webkit-box-shadow: 0 0 0;
-	-moz-box-shadow: 0 0 0;
-	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
-}
-.elgg-button-delete a {
-	display:block;
-	cursor: pointer;
-	width:14px;
-	height:14px;
-	background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -200px top;
-	text-indent: -9000px;
-	text-align: left;
+	color: #bbb;
+	text-decoration: none;
+	border: 1px solid #333;
+	background: #555 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+	text-shadow: 1px 1px 0px black;
 }
-.elgg-button-delete a:hover {
-	background-position: -200px -16px;
+.elgg-button-delete:hover {
+	color: #999;
+	background-color: #333;
+	background-position: left 10px;
+	text-decoration: none;
 }
 
 .elgg-button-dropdown {
@@ -128,9 +120,15 @@
 	margin-left:0;
 	color: white;
 	border:1px solid #71B9F7;
+	
 	-webkit-border-radius:4px;
 	-moz-border-radius:4px;
 	border-radius:4px;
+	
+	-webkit-box-shadow: 0 0 0;
+	-moz-box-shadow: 0 0 0;
+	box-shadow: 0 0 0;
+	
 	/*background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
 	background-position:-150px -51px;
 	background-repeat:no-repeat;*/
@@ -147,12 +145,12 @@
 }
 
 .elgg-button-dropdown.elgg-state-active {
-	background: #cccccc;
+	background: #ccc;
 	outline: none;
-	color: #333333;
+	color: #333;
+	border:1px solid #ccc;
 	
-	border:1px solid #cccccc;
 	-webkit-border-radius:4px 4px 0 0;
 	-moz-border-radius:4px 4px 0 0;
 	border-radius:4px 4px 0 0;
-}
\ No newline at end of file
+}