1 files changed, 97 insertions, 106 deletions
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 698d5fdf3..b4f8c7429 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -10,41 +10,30 @@
 	Form Elements
 *************************************** */
 /* default elgg core input field classes */
-.input-text,
-.input-tags,
-.input-url,
-.input-textarea {
-	width:98%;
-}
-.input-access {
-	margin:5px 0 0 0;
-}
-.input-password {
-	width:200px;
-}
-.input-textarea {
-	height: 200px;
-	width:718px;
-}
-input[type="checkbox"],
-input.input-radio {
-	margin:0 3px 0 0;
-	padding:0;
-	border:none;
-}
 label {
 	font-weight: bold;
-	color:#333333;
+	color: #333333;
 	font-size: 110%;
 }
 input {
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	border: 1px solid #cccccc;
-	color:#666666;
+	color: #666666;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 }
+input[type="text"], textarea {
+	width: 96%;
+}
+input[type="password"] {
+	width: 200px;
+}
+input[type="text"]:focus, input[type="password"]:focus {
+	border: solid 1px #4690d6;
+	background: #e4ecf5;
+	color:#333333;
+}
 textarea {
 	font: 120% Arial, Helvetica, sans-serif;
 	border: solid 1px #cccccc;
@@ -52,50 +41,106 @@ textarea {
 	color:#666666;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
+	height: 200px;
+	width: 96%;
 }
-textarea:focus,
-input[type="text"]:focus {
-	border: solid 1px #4690d6;
-	background: #e4ecf5;
-	color:#333333;
-}
-.input-textarea.monospace {
-	font-family:Monaco,"Courier New",Courier,monospace;
-	font-size:13px;
+textarea.monospace {
+	font-family: Monaco,"Courier New",Courier,monospace;
+	font-size: 13px;
 }
 a.longtext-control {
 	float:right;
 	margin-left:14px;
 }
-.elgg-submit-button {
+.elgg-input-access {
+	margin:5px 0 0 0;
+}
+input[type="checkbox"],
+input[type="radio"] {
+	margin:0 3px 0 0;
+	padding:0;
+	border:none;
+}
+
+input[type="submit"],
+input[type="button"],
+.elgg-button {
 	font-size: 14px;
 	font-weight: bold;
-	color: white;
-	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;
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	width: auto;
 	padding: 2px 4px;
-	margin:0 10px 10px 0;
+	margin: 10px 0 10px 0;
 	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);
 }
-.elgg-submit-button:hover {
+input[type="submit"],
+.elgg-submit-button {
 	color: white;
+	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;
+}
+input[type="submit"]:hover,
+.elgg-submit-button:hover {
 	border-color: #0054a7;
-	text-decoration:none;
-	background-color:#0054a7;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+	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;
+}
+.elgg-cancel-button {
+	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;
+}
+.elgg-cancel-button:hover {
+	color: white;
+	background-color: #999999;
+	background-position: left 10px;
+	text-decoration: none;
+}
+.elgg-action-button {
+	background-color:#cccccc;
+	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
 	background-repeat:  repeat-x;
-	background-position:  left 10px;
+	background-position: 0 0;
+	border:1px solid #999999;
+	color: #333333;
+	padding: 2px 15px 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;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+}
+.elgg-action-button:hover,
+.elgg-action-button:focus {
+	background-position: 0 -15px;
+	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
+	background-repeat: repeat-x;
+	color: #111111;
+	text-decoration: none;
+	background-color: #cccccc;
+	border: 1px solid #999999;
 }
+/*
 .elgg-submit-button.disabled {
 	background-color:#999999;
 	border-color:#999999;
@@ -106,64 +151,7 @@ a.longtext-control {
 	border-color:#999999;
 	color:#dedede;
 }
-input[type="password"]:focus {
-	border: solid 1px #4690d6;
-	background-color: #e4ecf5;
-	color:#333333;
-}
-input[type="submit"] {
-	font-size: 14px;
-	font-weight: bold;
-	color: white;
-	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;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	width: auto;
-	padding: 2px 4px;
-	margin:10px 0 10px 0;
-	cursor: pointer;
-	-moz-outline-style: none;
-	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);
-}
-input[type="submit"]:hover {
-	border-color: #0054a7;
-	text-decoration:none;
-	background-color:#0054a7;
-	background-image:  url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat:  repeat-x;
-	background-position:  left 10px;
-}
-.elgg-cancel-button {
-	font-size: 14px;
-	font-weight: bold;
-	text-decoration:none;
-	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;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	width: auto;
-	padding: 2px 4px;
-	margin:10px 0 10px 10px;
-	cursor: pointer;
-}
-.elgg-cancel-button:hover {
-	background-color: #999999;
-	background-position:  left 10px;
-	text-decoration:none;
-	color:white;
-}
+
 .elgg-action-button {
 	margin-left: 10px;
 }
@@ -240,6 +228,9 @@ a.elgg-action-button:focus {
 	color:white;
 	text-shadow:0 -1px 0 black;
 }
+
+*/
+
 /* small round delete button */
 .delete-button {
 	width:14px;