From 92ba0b637407b2f8d9be74f65189b21868832ec7 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 5 Oct 2015 01:57:34 +0200
Subject: [PATCH] Move poll.scss

---
 app/assets/stylesheets/_application.scss      |  2 +-
 .../{new_styles/_poll.scss => poll.scss}      | 28 +++++++++++--------
 app/assets/templates/poll_tpl.jst.hbs         |  4 +--
 3 files changed, 19 insertions(+), 15 deletions(-)
 rename app/assets/stylesheets/{new_styles/_poll.scss => poll.scss} (75%)

diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index 390edbf5d..d1de1a6c2 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -41,7 +41,7 @@
 @import 'footer';
 @import 'opengraph';
 @import 'single-post-view';
-@import 'new_styles/poll';
+@import 'poll';
 
 /* map*/
 @import 'leaflet';
diff --git a/app/assets/stylesheets/new_styles/_poll.scss b/app/assets/stylesheets/poll.scss
similarity index 75%
rename from app/assets/stylesheets/new_styles/_poll.scss
rename to app/assets/stylesheets/poll.scss
index 1bb65f328..a561aeff2 100644
--- a/app/assets/stylesheets/new_styles/_poll.scss
+++ b/app/assets/stylesheets/poll.scss
@@ -1,18 +1,20 @@
 .poll_form {
-  border-top: 1px solid $border-grey;
   border-bottom: 1px solid $border-grey;
-  margin: 10px 0px 10px 0px;
-  padding: 10px 0px 5px 0px;
+  border-top: 1px solid $border-grey;
+  margin: 10px 0;
+  padding: 10px 0 5px;
 
-  .poll_content {
+  .poll-content {
     margin-top: 5px;
   }
-  .toggle_result_wrapper {
+
+  .toggle-result-wrapper {
     display: inline-block;
     margin-top: 10px;
   }
+
   form {
-    margin-bottom: 0px;
+    margin-bottom: 0;
   }
 
   .result-row > label { width: 100%; }
@@ -20,21 +22,23 @@
   .progress {
     background-image: none;
     box-shadow: 0 0 0;
+    height: 10px;
     margin-bottom: 5px;
-    height: 10px !important;
 
     .bar {
       background: $border-dark-grey none;
       color: $text-dark-grey;
-      text-align: left;
       height: 100%;
+      text-align: left;
     }
   }
-  .submit[disabled] {
-    cursor: default;
-    color: $text-grey;
 
-    &:hover, &:active {
+  .submit[disabled] {
+    color: $text-grey;
+    cursor: default;
+
+    &:hover,
+    &:active {
       background-image: none;
     }
   }
diff --git a/app/assets/templates/poll_tpl.jst.hbs b/app/assets/templates/poll_tpl.jst.hbs
index 3c834fcf8..9fda886df 100644
--- a/app/assets/templates/poll_tpl.jst.hbs
+++ b/app/assets/templates/poll_tpl.jst.hbs
@@ -6,7 +6,7 @@
         {{t "poll.count" count=poll.participation_count}}
       </div>
     </div>
-    <div class="poll_content">
+    <div class="poll-content">
       {{#if show_form}}
         <form action="/posts/{{poll.post_id}}/poll_participations" method="POST">
           {{#poll.poll_answers}}
@@ -21,7 +21,7 @@
               </label>
             </div>
           {{/poll.poll_answers}}
-          <div class="toggle_result_wrapper">
+          <div class="toggle-result-wrapper">
             <a class="toggle_result" href="#">{{t "poll.show_result"}}</a>
           </div>
           <input type="submit" class="submit pull-right btn btn-default" value="{{t "poll.vote"}}"/>