From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Wed, 12 Jun 2013 23:23:58 +0000 (-0400)
Subject: Cleanup notes and fix CSS error
X-Git-Tag: live~4905
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/34edfdb9bae297144331b46dfe52319d13e519a3?ds=sidebyside

Cleanup notes and fix CSS error
---

diff --git a/app/assets/javascripts/templates/notes/new.jst.ejs b/app/assets/javascripts/templates/notes/new.jst.ejs
index 2f12227fd..a4ea5079a 100644
--- a/app/assets/javascripts/templates/notes/new.jst.ejs
+++ b/app/assets/javascripts/templates/notes/new.jst.ejs
@@ -5,7 +5,7 @@
     <input type="hidden" name="lat">
     <textarea class="comment" name="text" cols="40" rows="10"></textarea>
     <br/>
-    <div class="buttons">
+    <div class="buttons clearfix">
       <input type="submit" name="add" value="<%- I18n.t('javascripts.notes.new.add') %>" data-url="<%- create_url %>" disabled="1">
     </div>
   </form>
diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index 25dc10735..cc81bb9d3 100644
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -23,16 +23,16 @@
   <% if (note.status == "open") { %>
   <form action="#">
     <textarea class="comment" name="text" cols="40" rows="5"></textarea>
-    <div class="buttons">
-      <input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
+    <div class="buttons clearfix">
       <input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.resolve') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.close_url %>">
+      <input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
       <input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" data-method="POST" data-url="<%- note.comment_url %>" disabled="1">
     </div>
   </form>
   <% } else { %>
   <form action="#">
     <input type="hidden" name="text" value="">
-    <div class="buttons">
+    <div class="buttons clearfix">
       <input type="submit" name="hide" value="<%- I18n.t('javascripts.notes.show.hide') %>" class="hide_unless_moderator" data-method="DELETE" data-url="<%- note.url %>">
       <input type="submit" name="reopen" value="<%- I18n.t('javascripts.notes.show.reactivate') %>" class="hide_unless_logged_in" data-method="POST" data-url="<%- note.reopen_url %>">
     </div>
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 148d4368a..7331e201a 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -391,7 +391,7 @@ table {
 
 .donate {
   display: block;
-  width: 164px;
+  width: 163px;
   padding: $lineheight/4;
   border: 1px solid #AED1A0;
   background: #cbeea7;
@@ -440,7 +440,7 @@ table {
 }
 
 #tabnav {
-  height: 30px;
+  height: 29px;
   margin-bottom:0;
   overflow: hidden;
   li {
@@ -1034,6 +1034,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the user profile page */
 
 #userinformation {
+
   min-height: 100px;
   .userinformation-inner {
     float: left;
@@ -1072,13 +1073,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .activity-details p {
-  margin-left: 72px;
+  margin-left: 70px;
   margin-bottom: 0;
 }
 
 #friends-container .contact-activity ul {
-  margin-left: 72px;
-  }
+  margin-left: 70px;
+}
 
 .user-view {
   p#no_home_location {
@@ -1101,16 +1102,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .user_popup {
   min-width: 200px;
-
   p {
-    padding-top: 0;
-    padding-bottom: 5px;
-    margin-top: 0;
-    margin-bottom: 0;
-    margin-left: 60px;
+    padding: 0 0 5px 0;
+    margin-top: 0 0 0 60px;
     font-size: 12px;
   }
-
   img.user_thumbnail {
     float: left;
     margin: 0 $lineheight/2 0 0;
@@ -1599,6 +1595,8 @@ ul.secondary-actions {
 
 .inner12 { padding: $lineheight/2 $lineheight;}
 
+.inner11 { padding: $lineheight/2;}
+
 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
@@ -1923,16 +1921,8 @@ a.button {
   border-bottom: 1px solid #ccc;
 }
 
-.ads {
-  width: 370px;
-  position: absolute;
-  left: 0%;
-}
-
 .ad {
-  float: left;
-  height: 120px;
-  padding: $lineheight/2;
-  border: 0px;
+  height: 100px;
+  border: 0;
   background: #fff;
 }
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 542bcca2a..65723d97f 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -65,7 +65,7 @@
         </li>
         <%= yield :left_menu %>
       </ul>
-      <div class='ad-container'>
+      <div class='ad-container inner11'>
         <div class='ads'>
           <%= ad = [{:image => 'sotm-birmingham-ad.png',
                      :title => 'State of the Map Birmingham',