aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-28 20:08:16 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-28 20:08:16 +0000
commit6d47049d72562d74f0c6838fc2d9d3d89c016a47 (patch)
treeac74bd578e4cf22148fd97484528c4827b4cb30e
parent21578472f91912c8a5c1b52d8d9863173d284583 (diff)
downloadelgg-6d47049d72562d74f0c6838fc2d9d3d89c016a47.tar.gz
elgg-6d47049d72562d74f0c6838fc2d9d3d89c016a47.tar.bz2
Refs #3236 updated the button css so that disable plugin button looks like a button
git-svn-id: http://code.elgg.org/elgg/trunk@9047 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php2
-rw-r--r--views/default/css/admin.php17
-rw-r--r--views/default/forms/profile/fields/reset.php2
3 files changed, 17 insertions, 4 deletions
diff --git a/languages/en.php b/languages/en.php
index 5fbf50142..42712cadf 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -650,7 +650,7 @@ $english = array(
'admin:plugins:warning:elgg_version_unknown' => 'This plugin uses a legacy manifest file and does not specify a compatible Elgg version. It probably will not work!',
'admin:plugins:warning:unmet_dependencies' => 'This plugin has unmet dependencies and cannot be activated. Check dependencies under more info.',
'admin:plugins:warning:invalid' => '%s is not a valid Elgg plugin. Check <a href="http://docs.elgg.org/Invalid_Plugin">the Elgg documentation</a> for troubleshooting tips.',
- 'admin:plugins:cannot_activate' => 'Cannot Activate',
+ 'admin:plugins:cannot_activate' => 'cannot activate',
'admin:plugins:set_priority:yes' => "Reordered %s.",
'admin:plugins:set_priority:no' => "Could not reorder %s.",
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index ae3002dcb..68720b89a 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -429,7 +429,7 @@ input {
textarea {
height: 100px;
}
-input[type="submit"], .elgg-button-submit, .elgg-button-action {
+input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
font-size: 14px;
font-weight: bold;
color: white;
@@ -453,9 +453,22 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
background-color: #000;
text-decoration: none;
}
-.elgg-button-submit, .elgg-button-action {
+.elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
padding: 4px 8px;
}
+.elgg-button-cancel {
+ color: #333;
+ background-color: #999;
+}
+.elgg-button-cancel:hover {
+ color: #222;
+ background-color: #666;
+ text-decoration: none;
+}
+.elgg-button-action.elgg-state-disabled {
+ background-color: #aaa;
+}
+
/* ***************************************
PAGINATION
*************************************** */
diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php
index 57dc00e85..4e0f51dc6 100644
--- a/views/default/forms/profile/fields/reset.php
+++ b/views/default/forms/profile/fields/reset.php
@@ -5,6 +5,6 @@
$params = array(
'value' => elgg_echo('profile:resetdefault'),
- 'class' => 'elgg-button elgg-button-action elgg-state-disabled',
+ 'class' => 'elgg-button-cancel',
);
echo elgg_view('input/submit', $params);