replace individual padding styles with generic box class

on correspondence boxes, comment boxes, the state form
and the "followup" notice that shared the state form styles.

This makes these styles, which are meant to be consistent,
easier to maintain and overrider if necessary for theme developers.

7 files changed, 7 insertions, 14 deletions

diff --git a/app/assets/stylesheets/responsive/_request_style.scss b/app/assets/stylesheets/responsive/_request_style.scss
index e6f36674a..ebd0c0056 100644
--- a/app/assets/stylesheets/responsive/_request_style.scss
+++ b/app/assets/stylesheets/responsive/_request_style.scss
@@ -3,10 +3,6 @@
 div.correspondence {
   border: 1px solid #ccc;
   margin: 0 0 1em;
-  padding: 1em;
-  @include respond-min( $main_menu-mobile_menu_cutoff ){
-    padding: 1.5em;
-  }
 
   h2 {
     text-align:right;
@@ -31,7 +27,6 @@ div.correspondence {
 div.comment_in_request {
   border: 1px dotted #ccc;
   margin:0 0 1em 3em;
-  padding:0 0.5em;
 
   h2 {
     font-size:1em;
@@ -42,9 +37,9 @@ div.comment_in_request {
 }
 
 .event_actions {
+  margin-bottom: 0;
   text-align:right;
   line-height: 1em;
-  margin-bottom: 1em;
 }
 
 .comment_in_request_text {
@@ -64,7 +59,6 @@ div.comment_in_request {
   height:36px;
   float:left;
   vertical-align:middle;
-  margin-top: 0.5em;
   margin-right:0.5em;
 }
 
@@ -90,7 +84,6 @@ a img.attachment_image {
   border-radius:3px;
   -moz-border-radius:3px;
   margin:1em 0;
-  padding:0.5em 1em;
 }
 
 .describe_state_form {
diff --git a/app/views/comment/_single_comment.html.erb b/app/views/comment/_single_comment.html.erb
index 07017dabf..badc39d9a 100644
--- a/app/views/comment/_single_comment.html.erb
+++ b/app/views/comment/_single_comment.html.erb
@@ -1,4 +1,4 @@
-<div class="comment_in_request" id="comment-<%=comment.id.to_s%>">
+<div class="comment_in_request box" id="comment-<%=comment.id.to_s%>">
     <% if comment.user && comment.user.profile_photo && !@render_to_file %>
         <div class="user_photo_on_comment">
             <img src="<%= get_profile_photo_url(:url_name => comment.user.url_name) %>" alt="">
diff --git a/app/views/request/_followup.html.erb b/app/views/request/_followup.html.erb
index 2643b767f..24cede824 100644
--- a/app/views/request/_followup.html.erb
+++ b/app/views/request/_followup.html.erb
@@ -20,7 +20,7 @@
         </h2>
     <% end %>
 <% if @info_request.who_can_followup_to(incoming_message).count > 0 %>
-<div id="other_recipients">
+<div id="other_recipients" class="box">
   <%= _("Don't want to address your message to {{person_or_body}}?  You can also write to:", :person_or_body => name_for_followup) %>
   <ul>
 <% @info_request.who_can_followup_to(incoming_message).each do |name, email, id|  %>
diff --git a/app/views/request/_incoming_correspondence.html.erb b/app/views/request/_incoming_correspondence.html.erb
index 70bd25c7f..9d205204e 100644
--- a/app/views/request/_incoming_correspondence.html.erb
+++ b/app/views/request/_incoming_correspondence.html.erb
@@ -1,4 +1,4 @@
-<div class="incoming correspondence <%= incoming_message.prominence %>" id="incoming-<%=incoming_message.id.to_s%>">
+<div class="incoming correspondence box <%= incoming_message.prominence %>" id="incoming-<%=incoming_message.id.to_s%>">
   <%- if not incoming_message.user_can_view?(@user) %>
     <%= render :partial => 'request/hidden_correspondence', :locals => { :message => incoming_message }%>
   <%- else %>
diff --git a/app/views/request/_outgoing_correspondence.html.erb b/app/views/request/_outgoing_correspondence.html.erb
index dced5c94c..3b85cae7f 100644
--- a/app/views/request/_outgoing_correspondence.html.erb
+++ b/app/views/request/_outgoing_correspondence.html.erb
@@ -1,4 +1,4 @@
-<div class="outgoing correspondence" id="outgoing-<%=outgoing_message.id.to_s%>">
+<div class="outgoing correspondence box" id="outgoing-<%=outgoing_message.id.to_s%>">
   <%- if not outgoing_message.user_can_view?(@user) %>
     <%= render :partial => 'request/hidden_correspondence', :locals => { :message => outgoing_message }%>
   <%- else %>
diff --git a/app/views/request/_resent_outgoing_correspondence.html.erb b/app/views/request/_resent_outgoing_correspondence.html.erb
index 17b6b635b..287a5cac5 100644
--- a/app/views/request/_resent_outgoing_correspondence.html.erb
+++ b/app/views/request/_resent_outgoing_correspondence.html.erb
@@ -1,4 +1,4 @@
-<div class="outgoing correspondence" id="outgoing-<%=outgoing_message.id.to_s%>">
+<div class="outgoing correspondence box" id="outgoing-<%=outgoing_message.id.to_s%>">
   <h2>
     <%= simple_date(info_request_event.created_at) %>
   </h2>
diff --git a/app/views/request/show.html.erb b/app/views/request/show.html.erb
index 78e022aa9..e1a1f43d5 100644
--- a/app/views/request/show.html.erb
+++ b/app/views/request/show.html.erb
@@ -146,7 +146,7 @@
     <% end %>
 
     <% if @info_request.awaiting_description && ! @info_request.is_external? %>
-        <div class="describe_state_form" id="describe_state_form_2">
+        <div class="describe_state_form box" id="describe_state_form_2">
         <%= render :partial => 'describe_state', :locals => { :id_suffix => "2" } %>
         </div>
     <% end %>