Download as
Browse Code »

Commit a843ee7ece776810131a0bc8241d94b439506b93

Authored by Dmitriy Zaporozhets
1 parent 8e900113
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix votes block. twbs3 progress bars 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 7 changed files with 15 additions and 9 deletions   Show diff stats
app/assets/stylesheets/sections/votes.scss
  Diff comments   View file @a843ee7
@@ -36,3 +36,8 @@ @@ -36,3 +36,8 @@
36 display: inline-block; 36 display: inline-block;
37 margin: 0 8px; 37 margin: 0 8px;
38 } 38 }
  39 +
  40 +.votes-holder {
  41 + float: right;
  42 + width: 250px;
  43 +}
app/views/projects/issues/show.html.haml
  Diff comments   View file @a843ee7
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 %i.icon-edit 24 %i.icon-edit
25 Edit 25 Edit
26 26
27 -.pull-right  
28 - .col-md-3#votes= render 'votes/votes_block', votable: @issue 27 +.votes-holder
  28 + #votes= render 'votes/votes_block', votable: @issue
29 29
30 .back-link 30 .back-link
31 = link_to project_issues_path(@project) do 31 = link_to project_issues_path(@project) do
app/views/projects/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @a843ee7
@@ -34,8 +34,8 @@ @@ -34,8 +34,8 @@
34 %i.icon-edit 34 %i.icon-edit
35 Edit 35 Edit
36 36
37 -.pull-right  
38 - .col-md-3#votes= render 'votes/votes_block', votable: @merge_request 37 +.votes-holder
  38 + #votes= render 'votes/votes_block', votable: @merge_request
39 39
40 .back-link 40 .back-link
41 = link_to project_merge_requests_path(@project) do 41 = link_to project_merge_requests_path(@project) do
app/views/projects/milestones/_milestone.html.haml
  Diff comments   View file @a843ee7
@@ -24,4 +24,4 @@ @@ -24,4 +24,4 @@
24 &nbsp; 24 &nbsp;
25 %span.light #{milestone.percent_complete}% complete 25 %span.light #{milestone.percent_complete}% complete
26 .progress.progress-info 26 .progress.progress-info
27 - .bar{style: "width: #{milestone.percent_complete}%;"} 27 + .progress-bar{style: "width: #{milestone.percent_complete}%;"}
app/views/projects/milestones/show.html.haml
  Diff comments   View file @a843ee7
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 #{@milestone.open_items_count} open 40 #{@milestone.open_items_count} open
41 %span.pull-right= @milestone.expires_at 41 %span.pull-right= @milestone.expires_at
42 .progress.progress-info 42 .progress.progress-info
43 - .bar{style: "width: #{@milestone.percent_complete}%;"} 43 + .progress-bar{style: "width: #{@milestone.percent_complete}%;"}
44 44
45 45
46 - if @milestone.description.present? 46 - if @milestone.description.present?
app/views/projects/wikis/edit.html.haml
  Diff comments   View file @a843ee7
1 = render 'nav' 1 = render 'nav'
  2 +.pull-right
  3 + = render 'main_links'
2 %h3.page-title 4 %h3.page-title
3 Editing - 5 Editing -
4 %span.light #{@wiki.title.titleize} 6 %span.light #{@wiki.title.titleize}
5 -= render 'main_links'  
6 %hr 7 %hr
7 = render 'form' 8 = render 'form'
8 9
app/views/votes/_votes_block.html.haml
  Diff comments   View file @a843ee7
1 .votes.votes-block 1 .votes.votes-block
2 .progress 2 .progress
3 - .bar.bar-success{style: "width: #{votable.upvotes_in_percent}%;"}  
4 - .bar.bar-danger{style: "width: #{votable.downvotes_in_percent}%;"} 3 + .progress-bar.progress-bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
  4 + .progress-bar.progress-bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
5 .upvotes= "#{votable.upvotes} up" 5 .upvotes= "#{votable.upvotes} up"
6 .downvotes= "#{votable.downvotes} down" 6 .downvotes= "#{votable.downvotes} down"