From 52fd58087d2d5c7358013e288e15f3ce47c3549f Mon Sep 17 00:00:00 2001
From: Toks <tttoksss@gmail.com>
Date: Mon, 23 Dec 2013 13:22:25 -0500
Subject: [PATCH] Restyle expandable blocks

---
 app/assets/javascripts/dtext.js              |  8 +++++++-
 app/assets/stylesheets/common/dtext.css.scss | 18 ++++--------------
 app/logical/d_text.rb                        |  2 +-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/dtext.js b/app/assets/javascripts/dtext.js
index 759cb5c06..8b7b13428 100644
--- a/app/assets/javascripts/dtext.js
+++ b/app/assets/javascripts/dtext.js
@@ -14,7 +14,13 @@
   Danbooru.Dtext.initialize_expandables = function($parent) {
     $parent.find(".expandable-content").hide();
     $parent.find(".expandable-button").click(function(e) {
-      $(this).parent().next().fadeToggle("fast");
+      var button = $(this);
+      button.parent().next().fadeToggle("fast");
+      if (button.val() === "Show") {
+        button.val("Hide");
+      } else {
+        button.val("Show");
+      }
     });
   }
 
diff --git a/app/assets/stylesheets/common/dtext.css.scss b/app/assets/stylesheets/common/dtext.css.scss
index 07ab46925..af33f2f06 100644
--- a/app/assets/stylesheets/common/dtext.css.scss
+++ b/app/assets/stylesheets/common/dtext.css.scss
@@ -61,30 +61,20 @@ div.prose {
 
   div.expandable {
     margin-bottom: 1em;
-    border: 1px solid #666;
-    background: #EEE;
+    border: 1px inset #666;
   }
 
   div.expandable-header {
-    padding: 0.7em;
+    padding: 0.4em;
 
     span {
-      margin-right: 1em;
+      margin-right: 0.5em;
       font-weight: bold;
     }
   }
 
-  div.expandable-button {
-    padding: 0.3em;
-    display: inline-block;
-    border: 1px solid #666;
-    border-radius: 3px;
-    background: #CCC;
-    cursor: pointer;
-  }
-
   div.expandable-content {
-    padding: 0.7em;
+    padding: 0.4em;
     border-top: 1px solid #666;
 
     > :last-child {
diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index 7db38e7f5..0123c3791 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -214,7 +214,7 @@ class DText
         stack << "expandable"
         expand_html = '<div class="expandable"><div class="expandable-header">'
         expand_html << "<span>#{h($1)}</span>" if $1.present?
-        expand_html << '<div class="expandable-button">Show</div></div>'
+        expand_html << '<input type="button" value="Show" class="expandable-button"/></div>'
         expand_html << '<div class="expandable-content">'
         expand_html