Download as
Browse Code »

Commit 96308f7534562341efcef65e2d4fbec1b211325a

Authored by randx
1 parent 17d4cac2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Milestones: progressbar from bootstrap. Bradcrumbs styles

Showing 5 changed files with 36 additions and 41 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @96308f7
@@ -484,3 +484,29 @@ table.admin-table { @@ -484,3 +484,29 @@ table.admin-table {
484 display:inline; 484 display:inline;
485 } 485 }
486 486
  487 +ul.breadcrumb {
  488 + background:white;
  489 + border:none;
  490 + li {
  491 + display: inline;
  492 + text-shadow: 0 1px 0 white
  493 + }
  494 +
  495 + a {
  496 + color:#474D57;
  497 + font-weight:bold;
  498 + font-size:14px;
  499 + }
  500 +
  501 + .arrow {
  502 + background: url("images.png") no-repeat -85px -77px;
  503 + width: 19px;
  504 + height: 16px;
  505 + float: left;
  506 + position: relative;
  507 + left: -10px;
  508 + padding:0;
  509 + margin:0;
  510 + }
  511 +}
  512 +
app/assets/stylesheets/tree.scss
  Diff comments   View file @96308f7
@@ -145,20 +145,6 @@ @@ -145,20 +145,6 @@
145 } 145 }
146 } 146 }
147 147
148 - ul.breadcrumb {  
149 - background:white;  
150 - border:none;  
151 - li {  
152 - display: inline;  
153 - text-shadow: 0 1px 0 white  
154 - }  
155 -  
156 - a {  
157 - color:#474D57;  
158 - font-weight:bold;  
159 - font-size:14px;  
160 - }  
161 - }  
162 148
163 #tree-slider { 149 #tree-slider {
164 @include shade; 150 @include shade;
@@ -214,16 +200,6 @@ @@ -214,16 +200,6 @@
214 } 200 }
215 } 201 }
216 202
217 - .arrow {  
218 - background: url("images.png") no-repeat -85px -77px;  
219 - width: 19px;  
220 - height: 16px;  
221 - float: left;  
222 - position: relative;  
223 - left: -10px;  
224 - padding:0;  
225 - margin:0;  
226 - }  
227 } 203 }
228 204
229 .blame_file { 205 .blame_file {
app/views/commits/index.html.haml
  Diff comments   View file @96308f7
@@ -3,8 +3,9 @@ @@ -3,8 +3,9 @@
3 - if params[:path] 3 - if params[:path]
4 %ul.breadcrumb 4 %ul.breadcrumb
5 %li 5 %li
  6 + %span.arrow
6 = link_to project_commits_path(@project) do 7 = link_to project_commits_path(@project) do
7 - = @project.code 8 + = @project.name
8 %span.divider 9 %span.divider
9 \/ 10 \/
10 %li 11 %li
app/views/milestones/_milestone.html.haml
  Diff comments   View file @96308f7
@@ -9,14 +9,11 @@ @@ -9,14 +9,11 @@
9 = link_to project_milestone_path(milestone.project, milestone) do 9 = link_to project_milestone_path(milestone.project, milestone) do
10 %h4.row_title 10 %h4.row_title
11 = truncate(milestone.title, :length => 100) 11 = truncate(milestone.title, :length => 100)
12 - %small= milestone.expires_at 12 + %small
  13 + = milestone.expires_at
13 %br 14 %br
14 - .progress.span3 15 + .progress.progress-success.span3
  16 + .bar{:style => "width: #{milestone.percent_complete}%;"}
  17 +
15 18
16   19  
17 - :javascript  
18 - $(function() {  
19 - $( "##{dom_id(milestone)} .progress" ).progressbar({  
20 - value: #{milestone.percent_complete}  
21 - });  
22 - });  
app/views/milestones/show.html.haml
  Diff comments   View file @96308f7
@@ -31,7 +31,9 @@ @@ -31,7 +31,9 @@
31 #{@milestone.issues.opened.count} open 31 #{@milestone.issues.opened.count} open
32 – 32 –
33 #{@milestone.issues.closed.count} closed 33 #{@milestone.issues.closed.count} closed
34 - .progress 34 + .progress.progress-success
  35 + .bar{:style => "width: #{@milestone.percent_complete}%;"}
  36 +
35 37
36 - if @milestone.description.present? 38 - if @milestone.description.present?
37 .bottom_box_content 39 .bottom_box_content
@@ -65,10 +67,3 @@ @@ -65,10 +67,3 @@
65 = image_tag gravatar_icon(user.email, 24), :width => "24" 67 = image_tag gravatar_icon(user.email, 24), :width => "24"
66   68  
67 = user.name 69 = user.name
68 -  
69 -:javascript  
70 - $(function() {  
71 - $( ".progress" ).progressbar({  
72 - value: #{@milestone.percent_complete}  
73 - });  
74 - });