Refs #3109: More CSS cleanup. Fixes bugs introduced by last cleanup where background-color: was being used instead of background:

git-svn-id: http://code.elgg.org/elgg/trunk@8707 36083f99-b078-4883-b0ff-0f9b5a30f544

8 files changed, 55 insertions, 80 deletions

diff --git a/views/default/css/elements/buttons.php b/views/default/css/elements/buttons.php
index bfab6d5e7..b8bf6e212 100644
--- a/views/default/css/elements/buttons.php
+++ b/views/default/css/elements/buttons.php
@@ -38,47 +38,35 @@ a.elgg-button {
 	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;
 }
 
 /* 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: #444444;
-	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;
@@ -96,7 +84,7 @@ a.elgg-button {
 
 .elgg-button-action:hover,
 .elgg-button-action:focus {
-	background-color: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 -15px;
+	background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 -15px;
 	color: #111;
 	text-decoration: none;
 	border: 1px solid #999;
@@ -104,18 +92,15 @@ a.elgg-button {
 
 /* Delete: This button should convey "be careful before you click me" */
 .elgg-button-delete {
-	color: #bbbbbb;
+	color: #bbb;
 	text-decoration: none;
-	border: 1px solid #333333;
-	background-color: #555555;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
-	background-repeat: repeat-x;
-	background-position: left 10px;
+	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:hover {
-	color: #999999;
-	background-color: #333333;
+	color: #999;
+	background-color: #333;
 	background-position: left 10px;
 	text-decoration: none;
 }
@@ -156,7 +141,7 @@ a.elgg-button {
 .elgg-button-dropdown.elgg-state-active {
 	background: #ccc;
 	outline: none;
-	color: #333333;
+	color: #333;
 	border:1px solid #ccc;
 	
 	-webkit-border-radius:4px 4px 0 0;
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 1d0fbf366..df1632db4 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -91,28 +91,28 @@
 *************************************** */
 .elgg-table {
 	width: 100%;
-	border-top: 1px solid #cccccc;
+	border-top: 1px solid #ccc;
 }
 .elgg-table td, .elgg-table th {
 	padding: 4px 8px;
-	border: 1px solid #cccccc;
+	border: 1px solid #ccc;
 }
 .elgg-table th {
-	background-color: #dddddd;
+	background-color: #ddd;
 }
 .elgg-table tr:nth-child(odd), .elgg-table tr.odd {
-	background-color: #ffffff;
+	background-color: #fff;
 }
 .elgg-table tr:nth-child(even), .elgg-table tr.even {
 	background-color: #f0f0f0;
 }
 .elgg-table-alt {
 	width: 100%;
-	border-top: 1px solid #cccccc;
+	border-top: 1px solid #ccc;
 }
 .elgg-table-alt td {
 	padding: 2px 4px 2px 4px;
-	border-bottom: 1px solid #cccccc;
+	border-bottom: 1px solid #ccc;
 }
 .elgg-table-alt td:first-child {
 	width: 200px;
@@ -161,10 +161,10 @@
 	River
 *************************************** */
 .elgg-river {
-	border-top: 1px solid #CCCCCC;
+	border-top: 1px solid #CCC;
 }
 .elgg-river > li {
-	border-bottom: 1px solid #CCCCCC;
+	border-bottom: 1px solid #CCC;
 }
 .elgg-river-item {
 	padding: 7px 0;
@@ -173,13 +173,13 @@
 	margin-right: 20px;
 }
 .elgg-river-timestamp {
-	color: #666666;
+	color: #666;
 	font-size: 85%;
 	font-style: italic;
 	line-height: 1.2em;
 }
 .elgg-river-content {
-	border-left: 1px solid #CCCCCC;
+	border-left: 1px solid #CCC;
 	font-size: 85%;
 	line-height: 1.5em;
 	margin: 8px 0 5px 0;
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 9a379e742..d783b5123 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -19,13 +19,13 @@ fieldset > div:last-child {
 
 label {
 	font-weight: bold;
-	color: #333333;
+	color: #333;
 	font-size: 110%;
 }
 
 input, textarea {
-	border: 1px solid #cccccc;
-	color: #666666;
+	border: 1px solid #ccc;
+	color: #666;
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	width: 100%;
@@ -81,8 +81,8 @@ input[type="radio"] {
 .friends-picker-container h3 {
 	font-size:4em !important;
 	text-align: left;
-	margin:10px 0 20px 0 !important;
-	color:#999999 !important;
+	margin:10px 0 20px !important;
+	color:#999 !important;
 	background: none !important;
 	padding:0 !important;
 }
@@ -140,9 +140,9 @@ input[type="radio"] {
 	min-height: 230px;
 }
 .friends-picker-navigation {
-	margin: 0 0 10px 0;
-	padding:0 0 10px 0;
-	border-bottom:1px solid #cccccc;
+	margin: 0 0 10px;
+	padding:0 0 10px;
+	border-bottom:1px solid #ccc;
 }
 .friends-picker-navigation ul {
 	list-style: none;
@@ -172,7 +172,7 @@ input[type="radio"] {
 	color:#333 !important;
 }
 .friends-picker-navigation li a:hover {
-	background: #333333;
+	background: #333;
 	color:white !important;
 }
 .friends-picker-navigation li a.current {
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 343da430e..ad289e793 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -89,10 +89,7 @@
 }
 
 .elgg-ajax-loader {
-	background-color: white;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
-	background-repeat: no-repeat;
-	background-position: center center;
+	background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center;
 	min-height: 33px;
 	min-width: 33px;
 }
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index 6ac9999f2..ea01b8c45 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -62,10 +62,7 @@
 /***** PAGE HEADER ******/
 .elgg-page-header {
 	position: relative;
-	background-color: #4690D6;
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png);
-	background-repeat: repeat-x;
-	background-position: bottom left;
+	background-color: #4690D6 url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png) repeat-x bottom left;
 }
 .elgg-page-header > .elgg-inner {
 	position: relative;
@@ -79,14 +76,10 @@
 	padding: 10px 0;
 }
 .elgg-layout-one-sidebar {
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
-	background-repeat: repeat-y;
-	background-position: right top;
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
 }
 .elgg-layout-two-sidebar {
-	background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif);
-	background-repeat: repeat-y;
-	background-position: right top;
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif) repeat-y right top;
 }
 .elgg-sidebar {
 	position: relative;
@@ -118,8 +111,8 @@
 	position: relative;
 }
 .elgg-page-footer {
-	color: #999999;
+	color: #999;
 }
 .elgg-page-footer a:hover {
-	color: #666666;
+	color: #666;
 }
\ No newline at end of file
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index 6be695618..c8ba4f735 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -17,10 +17,10 @@
 *************************************** */
 
 #current-user-avatar {
-	border-right:1px solid #cccccc;
+	border-right:1px solid #ccc;
 }
 #avatar-croppingtool {
-	border-top: 1px solid #cccccc;
+	border-top: 1px solid #ccc;
 }
 #user-avatar {
 	float: left;
@@ -38,7 +38,7 @@
 *************************************** */
 
 #friends_collections_accordian li {
-	color: #666666;
+	color: #666;
 }
 #friends_collections_accordian li h2 {
 	-webkit-border-radius: 8px;
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index 31d53bd33..1a5c7e593 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -53,7 +53,7 @@
 /* Dropdown */
 .elgg-module-dropdown {
 	background-color:white;
-	border:5px solid #CCCCCC;
+	border:5px solid #CCC;
 	
 	-webkit-border-radius: 5px 0 5px 5px;
 	-moz-border-radius: 5px 0 5px 5px;
@@ -109,7 +109,7 @@
 	padding: 10px;
 	margin: 0 5px 15px;
 	background: #dedede;
-	border: 2px solid #cccccc;
+	border: 2px solid #ccc;
 }
 <?php //@todo location-dependent style: make an extension of elgg-gallery ?>
 .elgg-widgets-add-panel li {
@@ -117,7 +117,7 @@
 	margin: 2px 10px;
 	width: 200px;
 	padding: 4px;
-	background-color: #cccccc;
+	background-color: #ccc;
 	border: 2px solid #b0b0b0;
 	font-weight: bold;
 }
@@ -125,14 +125,14 @@
 	display: block;
 }
 .elgg-widgets-add-panel .elgg-state-available {
-	color: #333333;
+	color: #333;
 	cursor: pointer;
 }
 .elgg-widgets-add-panel .elgg-state-available:hover {
 	background-color: #bcbcbc;
 }
 .elgg-widgets-add-panel .elgg-state-unavailable {
-	color: #888888;
+	color: #888;
 }
 
 .elgg-module-widget {
@@ -142,7 +142,7 @@
 	position: relative;
 }
 .elgg-module-widget:hover {
-	background-color: #cccccc;
+	background-color: #ccc;
 }
 .elgg-module-widget > .elgg-head {
 	background-color: #dedede;
@@ -153,7 +153,7 @@
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
 	padding: 0 45px 0 20px;
-	color: #333333;
+	color: #333;
 }
 .elgg-module-widget.elgg-state-draggable > .elgg-head {
 	cursor: move;
@@ -182,7 +182,7 @@
 	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
 }
 .elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
-	border: 1px solid #cccccc;
+	border: 1px solid #ccc;
 }
 .elgg-module-widget > .elgg-body {
 	background-color: white;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 613c6f7f2..a098759a5 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -395,7 +395,7 @@ li:hover > .elgg-menu-site-more {
 	width: 165px;
 	border: solid 1px;
 	border-color: #E5E5E5 #999 #999 #E5E5E5;
-	background-color: #FFFFFF;
+	background-color: #FFF;
 	
 	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
 	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);