2 files changed, 9 insertions, 10 deletions
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index fb48cf60e..ab4ad7dcc 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -691,7 +691,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 .elgg-admin form#plugin_settings {
 	margin-top: 10px;
 }
-.elgg-admin form#plugin_settings .elgg-button-action.disabled {
+.elgg-admin form#plugin_settings .elgg-button-action.elgg-state-disabled {
 	margin-top:10px;
 	float:right;
 }
@@ -879,16 +879,16 @@ a.elgg-longtext-control {
 .admin_area .elgg-button-action:active {
 	background-image:none;
 }
-.admin_area .elgg-button-action.disabled {
+.admin_area .elgg-button-action.elgg-state-disabled {
 	color:#999999;
 	padding:2px 7px 2px 7px;
 }
-.admin_area .elgg-button-action.disabled:hover {
+.admin_area .elgg-button-action.elgg-state-disabled:hover {
 	background-position:0 -15px;
 	color:#111111;
 	border:1px solid #999999;
 }
-.admin_area .elgg-button-action.disabled:active {
+.admin_area .elgg-button-action.elgg-state-disabled:active {
 	background-image:none;
 }
 .admin_area .elgg-button-action.download {
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 816accbe7..468c524a8 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -138,13 +138,12 @@ input[type="submit"]:hover,
 	border: 1px solid #999999;
 }
 /*
-<?php //@todo elgg-state-disabled? ?>
-.elgg-button-submit.disabled {
+.elgg-button-submit.elgg-state-disabled {
 	background-color:#999999;
 	border-color:#999999;
 	color:#dedede;
 }
-.elgg-button-submit.disabled:hover {
+.elgg-button-submit.elgg-state-disabled:hover {
 	background-color:#999999;
 	border-color:#999999;
 	color:#dedede;
@@ -188,16 +187,16 @@ a.elgg-button-action:focus {
 .elgg-button-action:active {
 	background-image:none;
 }
-.elgg-button-action.disabled {
+.elgg-button-action.elgg-state-disabled {
 	color:#999999;
 	padding:2px 7px 2px 7px;
 }
-.elgg-button-action.disabled:hover {
+.elgg-button-action.elgg-state-disabled:hover {
 	background-position:0 -15px;
 	color:#111111;
 	border:1px solid #999999;
 }
-.elgg-button-action.disabled:active {
+.elgg-button-action.elgg-state-disabled:active {
 	background-image:none;
 }
 .elgg-button-action.download {