6 files changed, 50 insertions, 6 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 744211a20..a4d413781 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -158,6 +158,13 @@ table.mceLayout {
 .center {
 	text-align: center;
 }
+.float {
+	float: left;
+}
+.float-alt {
+	float: right;
+}
+
 /* ***************************************
 	PAGE WRAPPER
 *************************************** */
@@ -678,6 +685,9 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-menu-admin-footer > li {
 	padding-right: 25px;
 }
+.elgg-menu-longtext {
+	float: right;
+}
 
 /* ***************************************
 	WIDGETS
@@ -847,9 +857,10 @@ a.elgg-widget-collapsed:before {
 	margin-bottom: 5px;
 }
 
-a.elgg-longtext-control {
-	float: right;
+.elgg-longtext-control {
 	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
 }
 
 /* ***************************************
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 0230cbc54..af7b2be19 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,12 @@ fieldset > div {
 fieldset > div:last-child {
 	margin-bottom: 0;
 }
+.elgg-form-footer {
+}
+.elgg-form-footer-alt {
+	border-top: 1px solid #CCC;
+	padding: 10px 0;
+}
 
 label {
 	font-weight: bold;
@@ -73,9 +79,17 @@ input[type="radio"] {
 	padding-right: 10px;
 }
 
+.elgg-form-account input[type="text"],
+.elgg-form-account input[type="password"] {
+	width: 300px;
+}
+
 /* ***************************************
 	FRIENDS PICKER
 *************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
 .friends-picker-container h3 {
 	font-size:4em !important;
 	text-align: left;
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index d52938aee..a5854f8c1 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -15,6 +15,10 @@
 	PAGE LAYOUT
 *************************************** */
 /***** DEFAULT LAYOUT ******/
+<?php // the width is on the page rather than topbar to handle small viewports ?>
+.elgg-page-default {
+	min-width: 998px;
+}
 .elgg-page-default .elgg-page-header > .elgg-inner {
 	width: 990px;
 	margin: 0 auto;
@@ -35,7 +39,6 @@
 .elgg-page-topbar {
 	background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
 	border-bottom: 1px solid #000000;
-	min-width: 998px;
 	position: relative;
 	height: 24px;
 	z-index: 9000;
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index a5b907ddc..c4808478b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -197,6 +197,7 @@ a.elgg-widget-edit-button {
 	width: 96%;
 	padding: 2%;
 	border-bottom: 2px solid #dedede;
+	background-color: #f9f9f9;
 }
 .elgg-widget-content {
 	padding: 10px;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index e4709cb27..d930d3a89 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -130,7 +130,7 @@
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px;
+	padding: 2px 15px 0;
 	color: #eee;
 	margin-top: 1px;
 }
@@ -144,6 +144,18 @@
 	float: right;
 }
 
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	padding-left: 5px;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
+}
+
 /* ***************************************
 	SITE MENU
 *************************************** */
diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php
index 675af860d..4960e6ade 100644
--- a/views/default/css/elgg.php
+++ b/views/default/css/elgg.php
@@ -26,13 +26,12 @@ if ($old_css_view != elgg_get_config('viewpath')) {
 Base CSS
  * CSS reset
  * core
- * helpers
+ * helpers (moved to end to have a higher priority)
  * grid
 
 *******************************************************************************/
 echo elgg_view('css/elements/reset', $vars);
 echo elgg_view('css/elements/core', $vars);
-echo elgg_view('css/elements/helpers', $vars);
 echo elgg_view('css/elements/grid', $vars);
 
 
@@ -61,5 +60,9 @@ echo elgg_view('css/elements/layout', $vars);
 echo elgg_view('css/elements/misc', $vars);
 
 
+// included last to have higher priority
+echo elgg_view('css/elements/helpers', $vars);
+
+
 // in case plugins are still extending the old 'css' view, display it
 echo elgg_view('css', $vars);