From 49d38d62565deaad9b8bade6793561ada7bc0f39 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Tue, 10 Sep 2019 00:04:39 -0500
Subject: [PATCH] views: fix positioning of form hints.

Position <span class="hint"> elements to the right of normal <input>
elements and underneath <textarea> elements. Fixes form hints being
badly positioned on some pages.
---
 app/javascript/src/styles/base/020_base.scss       |  1 -
 app/javascript/src/styles/common/simple_form.scss  | 11 +++++++++--
 app/javascript/src/styles/specific/artists.scss    | 14 --------------
 .../src/styles/specific/moderator_dashboard.scss   | 12 ------------
 .../src/styles/specific/news_updates.scss          |  7 -------
 app/javascript/src/styles/specific/pools.scss      |  4 ----
 app/javascript/src/styles/specific/uploads.scss    |  4 ----
 app/javascript/src/styles/specific/users.scss      |  5 -----
 app/javascript/src/styles/specific/wiki_pages.scss |  4 ----
 app/views/artists/_form.html.erb                   |  2 +-
 app/views/wiki_pages/_form.html.erb                |  2 +-
 11 files changed, 11 insertions(+), 55 deletions(-)
 delete mode 100644 app/javascript/src/styles/specific/news_updates.scss

diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss
index 3849154bc..d2e8c5838 100644
--- a/app/javascript/src/styles/base/020_base.scss
+++ b/app/javascript/src/styles/base/020_base.scss
@@ -90,7 +90,6 @@ table tfoot {
 .hint {
   color: #666;
   font-style: italic;
-  max-width: 70%;
 }
 
 .tn {
diff --git a/app/javascript/src/styles/common/simple_form.scss b/app/javascript/src/styles/common/simple_form.scss
index 4350da3c3..ea24e0e36 100644
--- a/app/javascript/src/styles/common/simple_form.scss
+++ b/app/javascript/src/styles/common/simple_form.scss
@@ -20,11 +20,18 @@ form.simple_form {
       max-width: 20em;
     }
 
-    span.hint {
-      display: block;
+    .hint {
+      padding-left: 1em;
       font-size: 70%;
     }
 
+    &.text {
+      .hint {
+        padding-left: 0em;
+        display: block;
+      }
+    }
+
     textarea {
       width: 70%;
       font-size: 1.2em;
diff --git a/app/javascript/src/styles/specific/artists.scss b/app/javascript/src/styles/specific/artists.scss
index 1149ef5ce..563cbef61 100644
--- a/app/javascript/src/styles/specific/artists.scss
+++ b/app/javascript/src/styles/specific/artists.scss
@@ -10,20 +10,6 @@ div#c-artists, div#excerpt {
     margin-left: 1em;
   }
 
-  div#a-edit, div#a-new {
-    textarea {
-      height: 10em;
-      
-      &#artist_other_names_string {
-        height: 3em;
-      }
-    }
-
-    .hint {
-      display: block;
-    } 
-  }
-
   div.recent-posts {
     margin-top: 1em;
 
diff --git a/app/javascript/src/styles/specific/moderator_dashboard.scss b/app/javascript/src/styles/specific/moderator_dashboard.scss
index 9ec1dc419..774464738 100644
--- a/app/javascript/src/styles/specific/moderator_dashboard.scss
+++ b/app/javascript/src/styles/specific/moderator_dashboard.scss
@@ -14,18 +14,6 @@ div#c-moderator-dashboards {
     margin-bottom: 1em;
   }
 
-  div#ip-addr-search {
-    margin-bottom: 2em;
-
-    .hint {
-      display: block;
-    }
-  }
-
-  div#activity-search {
-    margin-bottom: 2em;
-  }
-
   table {
     width: 100%;
   }
diff --git a/app/javascript/src/styles/specific/news_updates.scss b/app/javascript/src/styles/specific/news_updates.scss
deleted file mode 100644
index 8ca16154d..000000000
--- a/app/javascript/src/styles/specific/news_updates.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-div#c-news-updates {
-  div#a-edit, div#a-new {
-    .hint {
-      display: block;
-    } 
-  }
-}
diff --git a/app/javascript/src/styles/specific/pools.scss b/app/javascript/src/styles/specific/pools.scss
index afb1dfe64..30f1d0191 100644
--- a/app/javascript/src/styles/specific/pools.scss
+++ b/app/javascript/src/styles/specific/pools.scss
@@ -31,10 +31,6 @@ div#add-to-pool-dialog {
   h1 {
     font-size: $h3_size;
   }
-  
-  .hint {
-    display: block;
-  }
 }
 
 div#c-pools {
diff --git a/app/javascript/src/styles/specific/uploads.scss b/app/javascript/src/styles/specific/uploads.scss
index f63d6ddf9..8920f9c19 100644
--- a/app/javascript/src/styles/specific/uploads.scss
+++ b/app/javascript/src/styles/specific/uploads.scss
@@ -37,10 +37,6 @@ div#c-uploads {
       width: 100%;
     }
 
-    .hint {
-      display: block;
-    }
-
     div.field_with_errors {
       display: inline;
     }
diff --git a/app/javascript/src/styles/specific/users.scss b/app/javascript/src/styles/specific/users.scss
index a5e86833c..3139500d7 100644
--- a/app/javascript/src/styles/specific/users.scss
+++ b/app/javascript/src/styles/specific/users.scss
@@ -56,11 +56,6 @@ div#c-users {
       margin-bottom: 2em;
     }
 
-    div.input span.hint {
-      display: block;
-      max-width: 70%;
-    }
-
     .active {
       color: black;
     }
diff --git a/app/javascript/src/styles/specific/wiki_pages.scss b/app/javascript/src/styles/specific/wiki_pages.scss
index 20ff2c680..64b657fd8 100644
--- a/app/javascript/src/styles/specific/wiki_pages.scss
+++ b/app/javascript/src/styles/specific/wiki_pages.scss
@@ -1,8 +1,4 @@
 div#c-wiki-pages {
-  form span.hint {
-    display: block;
-  }
-
   #a-new {
     div.notice {
       font-size: 0.8em;
diff --git a/app/views/artists/_form.html.erb b/app/views/artists/_form.html.erb
index 73bc1c70c..ca8904038 100644
--- a/app/views/artists/_form.html.erb
+++ b/app/views/artists/_form.html.erb
@@ -7,7 +7,7 @@
     <p><%= @artist.name %></p>
   <% end %>
 
-  <%= f.input :other_names_string, label: "Other names", as: :text, hint: '<b style="color: red;">NEW</b> Separate names with spaces, not commas. Use underscores for spaces inside names.'.html_safe %>
+  <%= f.input :other_names_string, label: "Other names", as: :text, input_html: { size: "50x1" }, hint: '<b style="color: red;">NEW</b> Separate names with spaces, not commas. Use underscores for spaces inside names.'.html_safe %>
   <%= f.input :group_name %>
   <%= f.input :url_string, :label => "URLs", :as => :text, :input_html => {:size => "50x5", :value => params.dig(:artist, :url_string) || @artist.urls.join("\n")}, :hint => "You can prefix a URL with - to mark it as dead." %>
 
diff --git a/app/views/wiki_pages/_form.html.erb b/app/views/wiki_pages/_form.html.erb
index 48ebbd2db..4d8b9963b 100644
--- a/app/views/wiki_pages/_form.html.erb
+++ b/app/views/wiki_pages/_form.html.erb
@@ -10,7 +10,7 @@
       <h1 id="wiki-page-title"><%= @wiki_page.pretty_title %></h1>
     <% end %>
 
-    <%= f.input :other_names_string, as: :text, label: "Other names (#{link_to "help", wiki_pages_path(title: "help:translated_tags")})".html_safe, hint: "Names used for this tag on other sites such as Pixiv. Separate with spaces." %>
+    <%= f.input :other_names_string, as: :text, input_html: { size: "30x1" }, label: "Other names (#{link_to "help", wiki_pages_path(title: "help:translated_tags")})".html_safe, hint: "Names used for this tag on other sites such as Pixiv. Separate with spaces." %>
 
     <%= dtext_field "wiki_page", "body" %>