Download as
Browse Code »

Commit 4451b8df8ad6d4b6d79fbce77687c6c2fd37d0a9

Authored by Dmitriy Zaporozhets
1 parent 86829cae
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

3 events on dashboard, fixed issue gl#250

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/assets/stylesheets/style.scss
  Diff comments   View file @4451b8d
... ... @@ -564,7 +564,7 @@ body.dashboard-page header{margin-bottom: 0}
564 564 body.dashboard-page .news-feed{padding-left: 1em; margin-right: 450px; min-height: 600px; margin-left: 1%}
565 565 body.dashboard-page .dashboard-content{ position: relative; float: left; width: 100%; height: 100%; }
566 566 body.dashboard-page .news-feed h2{float: left;}
567   -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 }
  567 +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 }
568 568 body.dashboard-page aside h4{margin: 0; border-bottom: 1px solid #ccc; padding: 10px 10px; font-size: 11px; font-weight: bold; text-transform: uppercase;}
569 569 body.dashboard-page aside h4 a.button-small{float: right; text-transform: none; border-radius: 4px; margin-right: 2%; margin-top: -4px; display: block;}
570 570 body.dashboard-page aside .project-list {list-style: none; margin: 0; padding: 0;}
... ...
app/views/dashboard/index.html.haml
  Diff comments   View file @4451b8d
... ... @@ -23,7 +23,7 @@
23 23 .project-box.project-updates.ui-box.ui-box-small.ui-box-big
24 24 %h3= project.name
25 25 .data
26   - - project.updates(4).each do |update|
  26 + - project.updates(3).each do |update|
27 27 %a.project-update{:href => dashboard_feed_path(project, update)}
28 28 = image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
29 29 %span.update-title
... ...