Improve styling of notice boxes to match new sidebar styling

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index fe0e074b9fc35a522af3cfcdbfff1a40a76218e9..735f36408c14f4cbb6e2a7d1d4c7b6e8e730bdb4 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -121,16 +121,18 @@ h2 {
  * donation drives.
  */
 
  * 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;
   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 */
 }
 
 /* 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 5d9b9aa6ed7394778246ddccf23b223007a89002..38dfe1b8cbe60a1f6f4fa591e10f02bce74b85dd 100644 (file)
--- a/app/assets/stylesheets/ltr.css.scss
+++ b/app/assets/stylesheets/ltr.css.scss
@@ -6,16 +6,6 @@ html body {
   text-align: left;
 }
 
   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 {
 /* 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 f044cf1f40c541aada509fdaf23fb2c2e3bae1fc..a8cf95cd3ff4dabf92085d59f6981fd9bf5a7330 100644 (file)
--- a/app/assets/stylesheets/rtl.css.scss
+++ b/app/assets/stylesheets/rtl.css.scss
@@ -6,16 +6,6 @@ html body {
   text-align: right;
 }
 
   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 {
 /* 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 58376d857d5ffd11e57d3b3166aa21883a1c1adf..1123ff55532789b1a3af2a06f8c8d4757d46df4b 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -96,8 +96,8 @@
       <% end %>
 
       <% if false %>
       <% 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 %>
 
       </div>
       <% end %>