1 files changed, 35 insertions, 43 deletions

diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index 7f11aa69e..a37ae094b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -2,12 +2,13 @@
 	Modules
 *************************************** */
 .elgg-module {
+	overflow: hidden;
 	margin-bottom: 20px;
 }
 
 /* Aside */
 .elgg-module-aside .elgg-head {
-	border-bottom: 1px solid #CCCCCC;
+	border-bottom: 1px solid #CCC;
 	
 	margin-bottom: 5px;
 	padding-bottom: 5px;
@@ -18,17 +19,19 @@
 	background: #e4e4e4;
 	padding: 5px;
 	margin-bottom: 10px;
+	
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
+	border-radius: 3px;
 }
 .elgg-module-info > .elgg-head * {
-	color: #333333;
+	color: #333;
 }
 
 /* Popup */
 .elgg-module-popup {
 	background-color: white;
-	border: 1px solid #cccccc;
+	border: 1px solid #ccc;
 	
 	z-index: 9999;
 	margin-bottom: 0;
@@ -51,8 +54,8 @@
 /* Dropdown */
 .elgg-module-dropdown {
 	background-color:white;
+	border:5px solid #CCC;
 	
-	border:5px solid #CCCCCC;
 	-webkit-border-radius: 5px 0 5px 5px;
 	-moz-border-radius: 5px 0 5px 5px;
 	border-radius: 5px 0 5px 5px;
@@ -60,25 +63,26 @@
 	display:none;
 	
 	width: 210px;
-	padding:12px;
+	padding: 12px;
 	margin-right: 0px;
-	
 	z-index:100;
+	
 	-webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
 	-moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
+	box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
 	
-	
-	<?php //@todo cleaner way to do this? ?>
 	position:absolute;
 	right: 0px;
-	top: 35px;
+	top: 100%;
 }
 
 /* Featured */
 .elgg-module-featured {
 	border: 1px solid #4690D6;
+	
 	-webkit-border-radius: 6px;
 	-moz-border-radius: 6px;
+	border-radius: 6px;
 }
 .elgg-module-featured > .elgg-head {
 	padding: 5px;
@@ -106,7 +110,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 {
@@ -114,7 +118,7 @@
 	margin: 2px 10px;
 	width: 200px;
 	padding: 4px;
-	background-color: #cccccc;
+	background-color: #ccc;
 	border: 2px solid #b0b0b0;
 	font-weight: bold;
 }
@@ -122,17 +126,16 @@
 	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;
 }
 
-<?php //@todo Still too many location-dependent/overly-qualified styles ?>
 .elgg-module-widget {
 	background-color: #dedede;
 	padding: 2px;
@@ -140,58 +143,47 @@
 	position: relative;
 }
 .elgg-module-widget:hover {
-	background-color: #cccccc;
+	background-color: #ccc;
 }
 .elgg-module-widget > .elgg-head {
-	background-color: #dedede;
-	height: 30px;
-	line-height: 30px;
+	background-color: #eeeeee;
+	height: 26px;
 	overflow: hidden;
 }
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
-	padding: 0 45px 0 20px;
-	color: #333333;
+	padding: 4px 45px 0 20px;
+	color: #666;
 }
-.elgg-module-widget.elgg-state-draggable > .elgg-head {
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
 	cursor: move;
 }
-.elgg-module-widget > .elgg-head a {
-	position: absolute;
-	top: 5px;
-	display: block;
-	width: 18px;
-	height: 18px;
-	border: 1px solid transparent;
-}
 a.elgg-widget-collapse-button {
-	left: 5px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
-}
-a.elgg-widget-collapsed {
-	background-position: 0px -365px;
+	color: #c5c5c5;
 }
-a.elgg-widget-delete-button {
-	right: 5px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px;
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+	color: #9d9d9d;
+	text-decoration: none;
 }
-a.elgg-widget-edit-button {
-	right: 25px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
+a.elgg-widget-collapse-button:before {
+	content: "\25BC";
 }
-a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
-	border: 1px solid #cccccc;
+a.elgg-widget-collapsed:before {
+	content: "\25BA";
 }
 .elgg-module-widget > .elgg-body {
 	background-color: white;
 	width: 100%;
 	overflow: hidden;
+	border-top: 2px solid #dedede;
 }
 .elgg-widget-edit {
 	display: none;
 	width: 96%;
 	padding: 2%;
 	border-bottom: 2px solid #dedede;
+	background-color: #f9f9f9;
 }
 .elgg-widget-content {
 	padding: 10px;
@@ -199,4 +191,4 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 .elgg-widget-placeholder {
 	border: 2px dashed #dedede;
 	margin-bottom: 15px;
-}
\ No newline at end of file
+}