3 events on dashboard, fixed issue gl#250

diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
index c7d5b77..c735599 100644 (file)
--- a/app/assets/stylesheets/style.scss
+++ b/app/assets/stylesheets/style.scss
@@ -564,7 +564,7 @@ body.dashboard-page header{margin-bottom: 0}
 body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%}
 body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; }
 body.dashboard-page .news-feed h2{float: left;}
-body.dashboard-page aside{ min-height: 700px; position: absolute; top: 0; bottom: 0; right: 0; width: 420px;  float: right;  background-color: #f7f7f7; border-left: 1px solid #ccc }
+body.dashboard-page aside{ min-height: 820px; position: relative; top: 0; bottom: 0; right: 0; width: 420px;  float: right;  background-color: #f7f7f7; border-left: 1px solid #ccc }
 body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
 body.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;}
 body.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;}

diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index aa8b9db..ef01c0a 100644 (file)
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -23,7 +23,7 @@
       .project-box.project-updates.ui-box.ui-box-small.ui-box-big
         %h3= project.name
         .data
-          - project.updates(4).each do |update|
+          - project.updates(3).each do |update|
             %a.project-update{:href => dashboard_feed_path(project, update)}
               = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
               %span.update-title