starting to use the grid in the widget code

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

3 files changed, 14 insertions, 22 deletions

diff --git a/views/default/core/dashboard/blurb.php b/views/default/core/dashboard/blurb.php
index 821c617f5..0f5b60011 100644
--- a/views/default/core/dashboard/blurb.php
+++ b/views/default/core/dashboard/blurb.php
@@ -5,8 +5,10 @@
  */
 ?>
 
-<div id="dashboard-info">
-	<p>
-		<?php echo elgg_echo("dashboard:nowidgets"); ?>
-	</p>
+<div class="elgg-col-2of3" id="dashboard-info">
+	<div class="elgg-inner">
+		<p>
+			<?php echo elgg_echo("dashboard:nowidgets"); ?>
+		</p>
+	</div>
 </div>
\ No newline at end of file
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 8f8070f77..971b5b734 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -138,22 +138,10 @@ echo elgg_view('css/elements/skin', $vars);
 /* ***************************************
 	WIDGETS
 *************************************** */
-.widget-column {
+.elgg-widgets {
 	float: right;
 	min-height: 30px;
 }
-.widget-1-columns {
-	width: 100%;
-}
-.widget-2-columns {
-	width: 50%;
-}
-.widget-3-columns {
-	width: 33%;
-}
-.widget-4-columns {
-	width: 25%;
-}
 #widget-add-button {
 	padding: 0px;
 	text-align: right;
@@ -844,10 +832,12 @@ p.elgg-likes-owner {
 *************************************** */
 #dashboard-info {
 	float: left;
-	width: 625px;
-	margin: 0 5px 15px;
-	padding: 5px;
+	margin-bottom: 15px;
+}
+#dashboard-info .elgg-inner {
+	margin: 0 5px;
 	border: 2px solid #dedede;
+	padding: 5px;
 }
 
 /* ***************************************
diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php
index e5b63114b..e35e8c6c4 100644
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/layout/shells/widgets.php
@@ -30,11 +30,11 @@ if (elgg_can_edit_widget_layout($context)) {
 
 echo $vars['box'];
 
-$widget_class = "widget-{$num_columns}-columns";
+$widget_class = "elgg-col-1of{$num_columns}";
 for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
 	$column_widgets = $widgets[$column_index];
 
-	echo "<div class=\"widget-column $widget_class\" id=\"widget-col-$column_index\">";
+	echo "<div class=\"$widget_class elgg-widgets\" id=\"widget-col-$column_index\">";
 	if (is_array($column_widgets) && sizeof($column_widgets) > 0) {
 		foreach ($column_widgets as $widget) {
 			echo elgg_view_entity($widget);