Merge branch 'master' into talmdal_dev

2 files changed, 8 insertions, 3 deletions

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 43920815..cd72d01e 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -99,7 +99,6 @@ class gallery_event_Core {
 
   static function user_menu($menu, $theme) {
     if ($theme->page_type != "login") {
-      Kohana::log("alert", "in gallery::user_menu");
       $user = identity::active_user();
       if ($user->guest) {
         $menu->append(Menu::factory("dialog")
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 3342bd83..4aa02023 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -107,7 +107,7 @@ table {
 }
 
 #g-content table {
-  margin: 1em 0 3em 0;
+  margin: .6em 0 2em 0;
 }
 
 caption,
@@ -131,7 +131,8 @@ th {
  * 2) Reusable content blocks
  *********************************************************************/
 
-.g-block {
+.g-block,
+#g-content #g-admin-dashboard .g-block {
   background-color: #fff;
   border: 1px solid #ccc;
   padding: 1em;
@@ -146,6 +147,11 @@ th {
   margin-top: 1em;
 }
 
+#g-content .g-block {
+  border: none;
+  padding: 0;
+}
+
 #g-sidebar .g-block-content {
   padding: 0;
 }