Fix votes block. twbs3 progress bars

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

diff --git a/app/assets/stylesheets/sections/votes.scss b/app/assets/stylesheets/sections/votes.scss
index 49489ba..13f811e 100644 (file)
--- a/app/assets/stylesheets/sections/votes.scss
+++ b/app/assets/stylesheets/sections/votes.scss
@@ -36,3 +36,8 @@
   display: inline-block;
   margin: 0 8px;
 }
+
+.votes-holder {
+  float: right;
+  width: 250px;
+}

diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index e8daaf2..82f6b11 100644 (file)
--- 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 09495ec..08a3fdf 100644 (file)
--- 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 bc3368b..4dec383 100644 (file)
--- 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 94c0aba..df65298 100644 (file)
--- 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 fccc9ae..47b2360 100644 (file)
--- 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'
 

diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
index bded53b..788d906 100644 (file)
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -1,6 +1,6 @@
 .votes.votes-block
   .progress
-    .bar.bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
-    .bar.bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
+    .progress-bar.progress-bar-success{style: "width: #{votable.upvotes_in_percent}%;"}
+    .progress-bar.progress-bar-danger{style: "width: #{votable.downvotes_in_percent}%;"}
   .upvotes= "#{votable.upvotes} up"
   .downvotes= "#{votable.downvotes} down"