From 66caf92bd923065064deec45cb325ee06e4131ab Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 21 Mar 2012 10:43:05 +0000
Subject: [PATCH] Improve styling of notice boxes to match new sidebar styling

---
 app/assets/stylesheets/common.css.scss | 20 +++++++++++---------
 app/assets/stylesheets/ltr.css.scss    | 10 ----------
 app/assets/stylesheets/rtl.css.scss    | 10 ----------
 app/views/layouts/site.html.erb        |  4 ++--
 4 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index fe0e074b9..735f36408 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -121,16 +121,18 @@ h2 {
  * donation drives.
  */
 
-.notice {
-  width: 170px;
-  margin: 5px;
-  padding: 5px;
-  border: 1px solid #ccc;
+.sidebar-notice {
+  padding: 0px 5px 0.1px 5px;
+  border-top: 1px solid #ccc;
+  margin-top: 4px;
+  margin-bottom: -4px;
   background: #ea0;
-  line-height: 20px;
-  font-size: 14px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  font-size: 13px;
+  line-height: 17px;
+
+  p {
+    margin: 5px;
+  }
 }
 
 /* Rules for the menu displayed in the left sidebar */
diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss
index 5d9b9aa6e..38dfe1b8c 100644
--- a/app/assets/stylesheets/ltr.css.scss
+++ b/app/assets/stylesheets/ltr.css.scss
@@ -6,16 +6,6 @@ html body {
   text-align: left;
 }
 
-/*
- * Rules for notice boxes shown in the left sidebar when important, but
- * non-critical information needs to be conveyed such as notices about
- * donation drives.
- */
-
-.notice {
-  text-align: left;
-}
-
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss
index f044cf1f4..a8cf95cd3 100644
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -6,16 +6,6 @@ html body {
   text-align: right;
 }
 
-/*
- * Rules for notice boxes shown in the left sidebar when important, but
- * non-critical information needs to be conveyed such as notices about
- * donation drives.
- */
-
-.notice {
-  text-align: right;
-}
-
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 58376d857..1123ff555 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -96,8 +96,8 @@
       <% end %>
 
       <% if false %>
-      <div id="donate" class="notice">
-        <%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %>
+      <div class="sidebar-notice">
+        <p><%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %></p>
       </div>
       <% end %>
 
-- 
2.43.2