diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-02 00:59:06 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-02 00:59:06 +0400 |
| commit | a843ee7ece776810131a0bc8241d94b439506b93 (patch) | |
| tree | dc2a7db47d4946667124bd5078afabc66caf1434 /app/views/projects | |
| parent | 8e90011369507911ea02ba357f19f0a4d18f03af (diff) | |
Fix votes block. twbs3 progress bars
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_title.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/edit.html.haml | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index e8daaf23f85..82f6b1193c7 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -24,8 +24,8 @@ %i.icon-edit Edit -.pull-right - .col-md-3#votes= render 'votes/votes_block', votable: @issue +.votes-holder + #votes= render 'votes/votes_block', votable: @issue .back-link = link_to project_issues_path(@project) do diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml index 09495ece59d..08a3fdf869a 100644 --- a/app/views/projects/merge_requests/show/_mr_title.html.haml +++ b/app/views/projects/merge_requests/show/_mr_title.html.haml @@ -34,8 +34,8 @@ %i.icon-edit Edit -.pull-right - .col-md-3#votes= render 'votes/votes_block', votable: @merge_request +.votes-holder + #votes= render 'votes/votes_block', votable: @merge_request .back-link = link_to project_merge_requests_path(@project) do diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml index bc3368b765c..4dec3838d97 100644 --- a/app/views/projects/milestones/_milestone.html.haml +++ b/app/views/projects/milestones/_milestone.html.haml @@ -24,4 +24,4 @@ %span.light #{milestone.percent_complete}% complete .progress.progress-info - .bar{style: "width: #{milestone.percent_complete}%;"} + .progress-bar{style: "width: #{milestone.percent_complete}%;"} diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 94c0abae5a3..df65298d4df 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -40,7 +40,7 @@ #{@milestone.open_items_count} open %span.pull-right= @milestone.expires_at .progress.progress-info - .bar{style: "width: #{@milestone.percent_complete}%;"} + .progress-bar{style: "width: #{@milestone.percent_complete}%;"} - if @milestone.description.present? diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index fccc9ae61fb..47b236083b3 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -1,8 +1,9 @@ = render 'nav' +.pull-right + = render 'main_links' %h3.page-title Editing - %span.light #{@wiki.title.titleize} -= render 'main_links' %hr = render 'form' |