diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss index 60090db..b1594d8 100644 --- a/app/assets/stylesheets/gitlab_bootstrap.scss +++ b/app/assets/stylesheets/gitlab_bootstrap.scss @@ -484,3 +484,29 @@ table.admin-table { display:inline; } +ul.breadcrumb { + background:white; + border:none; + li { + display: inline; + text-shadow: 0 1px 0 white + } + + a { + color:#474D57; + font-weight:bold; + font-size:14px; + } + + .arrow { + background: url("images.png") no-repeat -85px -77px; + width: 19px; + height: 16px; + float: left; + position: relative; + left: -10px; + padding:0; + margin:0; + } +} + diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss index d3146f6..7266df6 100644 --- a/app/assets/stylesheets/tree.scss +++ b/app/assets/stylesheets/tree.scss @@ -145,20 +145,6 @@ } } - ul.breadcrumb { - background:white; - border:none; - li { - display: inline; - text-shadow: 0 1px 0 white - } - - a { - color:#474D57; - font-weight:bold; - font-size:14px; - } - } #tree-slider { @include shade; @@ -214,16 +200,6 @@ } } - .arrow { - background: url("images.png") no-repeat -85px -77px; - width: 19px; - height: 16px; - float: left; - position: relative; - left: -10px; - padding:0; - margin:0; - } } .blame_file { diff --git a/app/views/commits/index.html.haml b/app/views/commits/index.html.haml index e92b33b..9ac2762 100644 --- a/app/views/commits/index.html.haml +++ b/app/views/commits/index.html.haml @@ -3,8 +3,9 @@ - if params[:path] %ul.breadcrumb %li + %span.arrow = link_to project_commits_path(@project) do - = @project.code + = @project.name %span.divider \/ %li diff --git a/app/views/milestones/_milestone.html.haml b/app/views/milestones/_milestone.html.haml index 00e95fe..0bb4bc1 100644 --- a/app/views/milestones/_milestone.html.haml +++ b/app/views/milestones/_milestone.html.haml @@ -9,14 +9,11 @@ = link_to project_milestone_path(milestone.project, milestone) do %h4.row_title = truncate(milestone.title, :length => 100) - %small= milestone.expires_at + %small + = milestone.expires_at %br - .progress.span3 + .progress.progress-success.span3 + .bar{:style => "width: #{milestone.percent_complete}%;"} +   - :javascript - $(function() { - $( "##{dom_id(milestone)} .progress" ).progressbar({ - value: #{milestone.percent_complete} - }); - }); diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml index 5c57d73..b41e413 100644 --- a/app/views/milestones/show.html.haml +++ b/app/views/milestones/show.html.haml @@ -31,7 +31,9 @@ #{@milestone.issues.opened.count} open – #{@milestone.issues.closed.count} closed - .progress + .progress.progress-success + .bar{:style => "width: #{@milestone.percent_complete}%;"} + - if @milestone.description.present? .bottom_box_content @@ -65,10 +67,3 @@ = image_tag gravatar_icon(user.email, 24), :width => "24"   = user.name - -:javascript - $(function() { - $( ".progress" ).progressbar({ - value: #{@milestone.percent_complete} - }); - }); -- libgit2 0.21.2