Merge branch 'master' into debates-moderation-530

2015-09-21 15:52:25 +02:00
parent 757205a93e efee531612
commit 12f1796e7b
2 changed files with 12 additions and 2 deletions
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -204,9 +204,19 @@ body.admin {
 }

 .proposal-description {
-  height: rem-calc(60);
+  max-height: rem-calc(65);
  overflow: hidden;
  max-width: rem-calc(750);
+
+  &:hover {
+    cursor: text;
+    max-height: rem-calc(1000);
+    outline: 3px solid #ffbf47;
+    padding: rem-calc(12);
+    transition: max-height 0.9s;
+    -moz-transition: max-height 0.9s;
+    -webkit-transition: max-height 0.9s;
+  }
 }

 // 04. Stats
--- a/app/views/moderation/proposals/index.html.erb
+++ b/app/views/moderation/proposals/index.html.erb
@@ -40,7 +40,7 @@
          <span class="bullet">&nbsp;&bull;&nbsp;</span>
          <%= proposal.author.username %>
          <br>
-          <div style="proposal-description">
+          <div class="proposal-description">
            <%= proposal.description %>
          </div>
        </td>