Download as
Browse Code »

Commit 635d3e09b72232b6e92a38de6cc184147e5bcb41

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

Issues, Merge Requests counters

Showing 4 changed files with 27 additions and 13 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @635d3e0
... ... @@ -101,15 +101,24 @@ nav.main_menu {
101 101 border-radius: 4px;
102 102 margin: auto;
103 103 margin:30px $app_padding;
104   - background:#f1f1f1;
  104 + background:#eee;
105 105 border:1px solid #ccc;
106 106 height:38px;
107 107  
108   - background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #f1f1f1), to(#dfdfdf));
109   - background-image: -webkit-linear-gradient(#f1f1f1 6.6%, #dfdfdf);
110   - background-image: -moz-linear-gradient(#f1f1f1 6.6%, #dfdfdf);
111   - background-image: -o-linear-gradient(#f1f1f1 6.6%, #dfdfdf);
  108 + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
  109 + background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
  110 + background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
  111 + background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
112 112  
  113 + -moz-box-shadow: 0 0 3px #ddd;
  114 + -webkit-box-shadow: 0 0 3px #ddd;
  115 + box-shadow: 0 0 3px #ddd;
  116 +
  117 +
  118 + .count {
  119 + color:#bbb;
  120 + margin-left:3px;
  121 + }
113 122  
114 123 .label {
115 124 background:$hover;
... ... @@ -131,12 +140,13 @@ nav.main_menu {
131 140 padding: 10px 25px;
132 141 display: inline-block;
133 142 color: $style_color;
134   - border-right: 1px solid #ccc;
  143 + border-right: 1px solid #d5d5d5;
135 144 position: relative;
136 145 box-shadow: 1px 0 0 rgba(255, 255, 255, 0.1);
137 146 margin: 0;
138 147 float:left;
139 148 text-shadow:0 1px 1px white;
  149 +
140 150  
141 151 &.home {
142 152 padding:7px 35px;
... ... @@ -281,7 +291,11 @@ img.lil_av {
281 291 h5, .title {
282 292 padding: 0 10px;
283 293 background:#f5f5f5;
284   - border-bottom: 1px solid #ccc;
  294 + background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
  295 + background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
  296 + background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
  297 + background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
  298 + border-bottom: 1px solid #eee;
285 299 @include round-borders-top(4px);
286 300 border-top:none;
287 301  
... ...
app/assets/stylesheets/top_panel.scss
  Diff comments   View file @635d3e0
... ... @@ -79,10 +79,6 @@ body header {
79 79 font-weight:bold;
80 80 color:#aaa;
81 81 text-shadow: 0 1px 1px #FFF;
82   -
83   - &:hover {
84   - color:$style_color;
85   - }
86 82 }
87 83  
88 84 img {
... ...
app/views/commits/_commit.html.haml
  Diff comments   View file @635d3e0
1 1 %li.wll.commit
2 2 .right.span2
3   - = link_to "Browse Code", tree_project_ref_path(@project, commit.id), :class => "btn small right"
  3 + = link_to "Browse Code »", tree_project_ref_path(@project, commit.id), :class => "btn small right"
4 4 = link_to project_commit_path(@project, :id => commit.id) do
5 5 %p
6 6 %code.left= commit.id.to_s[0..10]
... ... @@ -12,4 +12,5 @@
12 12 %span.right.cgray
13 13 = time_ago_in_words(commit.committed_date)
14 14 ago
  15 +  
15 16  
... ...
app/views/layouts/_project_menu.html.haml
  Diff comments   View file @635d3e0
... ... @@ -10,10 +10,13 @@
10 10 = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
11 11 - if @project.issues_enabled
12 12 = link_to project_issues_filter_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
13   - Issues
  13 + Issues
  14 + %span.count= @project.issues.opened.count
  15 +
14 16 - if @project.merge_requests_enabled
15 17 = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
16 18 Merge Requests
  19 + %span.count= @project.issues.opened.count
17 20  
18 21 - if @project.wall_enabled
19 22 = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
... ...