From 19b4c1422594ab721e641fe89119758c834e549b Mon Sep 17 00:00:00 2001
From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Tue, 11 Jun 2013 12:43:25 -0700
Subject: [PATCH] More fixes to forms

---
 app/assets/stylesheets/common.css.scss | 11 ++++++++---
 app/views/user/account.html.erb        | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 8456c4b2f..3b78905f2 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -132,7 +132,7 @@ h6:first-child {
 
 .column-1 {
   width: 50%;
-  margin-bottom: $lineheight/2;
+  margin: 0 0 $lineheight/2 0;
 }
 
 .small_icon {
@@ -362,6 +362,7 @@ table {
     padding: 0;
     width: 15px;
     height: 15px;
+    min-width: 0;
     text-indent: -1000px;
     overflow: hidden;
     background: image-url("sprite.png") 0 0 no-repeat;
@@ -1301,8 +1302,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .content_map.settings_map {
-  float: none;
   width: 50%;
+  float: none;
 }
 
 /* Rules for message in/out box page */
@@ -1451,7 +1452,11 @@ input[type="url"],
 input[type="password"],
 textarea {
   border: 1px solid #ccc;
-  padding: 2px;
+  padding: 2px 5px;
+}
+
+textarea {
+  padding: 5px;
 }
 
 /* Rules for user images */
diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 759502706..f7408dfe5 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -132,8 +132,9 @@
     </div>
   </fieldset>
 
-  <fieldset id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> >
-    <p class="form-help"><%= t 'user.account.home location' %></p>
+<fieldset>
+  <p class="form-help"><%= t 'user.account.home location' %></p>
+  <div id="homerow" <% unless @user.home_lat and @user.home_lon %>class="nohome"<%end%> >
     <p class="message form-help deemphasize"><%= t 'user.account.no home location' %></p>
     <div class="location">
       <label><%= t 'user.account.latitude' %></label>
@@ -141,19 +142,18 @@
       <label><%= t 'user.account.longitude' %></label>
       <%= f.text_field :home_lon, :id => "home_lon" %>
     </div>
-  </fieldset>
+  </div>
 
-  <fieldset class="form-row">
-      <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
-      <% content_for :head do %>
-        <%= javascript_include_tag "user" %>
-      <% end %>
-      <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
-  </fieldset>
+  <div class="form-row">
+    <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
+    <% content_for :head do %>
+      <%= javascript_include_tag "user" %>
+    <% end %>
+    <%= content_tag "div", "", :id => "map", :class => "content_map settings_map set_location" %>
+  </div>
+</fieldset>
 
-  <fieldset class="form-row">
-    <%= submit_tag t('user.account.save changes button') %>
-  </fieldset>
+  <%= submit_tag t('user.account.save changes button') %>
 <% end %>
 
 <% unless @user.data_public? %>
-- 
2.43.2