Commit a843ee7e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix votes block. twbs3 progress bars

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 8e900113
...@@ -36,3 +36,8 @@ ...@@ -36,3 +36,8 @@
display: inline-block; display: inline-block;
margin: 0 8px; margin: 0 8px;
} }
.votes-holder {
float: right;
width: 250px;
}
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
%i.icon-edit %i.icon-edit
Edit Edit
.pull-right .votes-holder
.col-md-3#votes= render 'votes/votes_block', votable: @issue #votes= render 'votes/votes_block', votable: @issue
.back-link .back-link
= link_to project_issues_path(@project) do = link_to project_issues_path(@project) do
......
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
%i.icon-edit %i.icon-edit
Edit Edit
.pull-right .votes-holder
.col-md-3#votes= render 'votes/votes_block', votable: @merge_request #votes= render 'votes/votes_block', votable: @merge_request
.back-link .back-link
= link_to project_merge_requests_path(@project) do = link_to project_merge_requests_path(@project) do
......
...@@ -24,4 +24,4 @@ ...@@ -24,4 +24,4 @@
&nbsp; &nbsp;
%span.light #{milestone.percent_complete}% complete %span.light #{milestone.percent_complete}% complete
.progress.progress-info .progress.progress-info
.bar{style: "width: #{milestone.percent_complete}%;"} .progress-bar{style: "width: #{milestone.percent_complete}%;"}
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#{@milestone.open_items_count} open #{@milestone.open_items_count} open
%span.pull-right= @milestone.expires_at %span.pull-right= @milestone.expires_at
.progress.progress-info .progress.progress-info
.bar{style: "width: #{@milestone.percent_complete}%;"} .progress-bar{style: "width: #{@milestone.percent_complete}%;"}
- if @milestone.description.present? - if @milestone.description.present?
......
= render 'nav' = render 'nav'
.pull-right
= render 'main_links'
%h3.page-title %h3.page-title
Editing - Editing -
%span.light #{@wiki.title.titleize} %span.light #{@wiki.title.titleize}
= render 'main_links'
%hr %hr
= render 'form' = render 'form'
......
.votes.votes-block .votes.votes-block
.progress .progress
.bar.bar-success{style: "width: #{votable.upvotes_in_percent}%;"} .progress-bar.progress-bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
.bar.bar-danger{style: "width: #{votable.downvotes_in_percent}%;"} .progress-bar.progress-bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
.upvotes= "#{votable.upvotes} up" .upvotes= "#{votable.upvotes} up"
.downvotes= "#{votable.downvotes} down" .downvotes= "#{votable.downvotes} down"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment