From be585d140336313b0f94c695dde71cc97a00b1f4 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 21 Mar 2012 10:38:12 +0000 Subject: [PATCH] Improve styling of alert boxes to match new sidebar styling --- app/assets/stylesheets/common.css.scss | 23 +++++++++++++---------- app/assets/stylesheets/ltr.css.scss | 10 ---------- app/assets/stylesheets/rtl.css.scss | 10 ---------- app/views/layouts/site.html.erb | 8 ++++---- 4 files changed, 17 insertions(+), 34 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 45656f953..fe0e074b9 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -100,16 +100,19 @@ h2 { * undergoing maintenance. */ -#alert { - width: 170px; - margin: 5px; - padding: 5px; - border: 1px solid #ccc; - background: #d00; - line-height: 1.2em; - font-size: 14px; - border-radius: 5px; - -moz-border-radius: 5px; +.sidebar-alert { + padding: 0px 5px 0.1px 5px; + border-top: 1px solid #ccc; + margin-top: 4px; + margin-bottom: -4px; + background: #e00; + font-size: 13px; + font-weight: bold; + line-height: 17px; + + p { + margin: 5px; + } } /* diff --git a/app/assets/stylesheets/ltr.css.scss b/app/assets/stylesheets/ltr.css.scss index 5eba8ddb9..5d9b9aa6e 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 alert boxes shown in the left sidebar when important - * information needs to be conveyed such as when the site is - * undergoing maintenance. - */ - -#alert { - 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 diff --git a/app/assets/stylesheets/rtl.css.scss b/app/assets/stylesheets/rtl.css.scss index b9223e522..f044cf1f4 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 alert boxes shown in the left sidebar when important - * information needs to be conveyed such as when the site is - * undergoing maintenance. - */ - -#alert { - 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 diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index 33e95f6a2..58376d857 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -86,12 +86,12 @@ <% end %> <% if STATUS == :database_offline or STATUS == :api_offline %> -
- <%= t 'layouts.osm_offline' %> + <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -
- <%= t 'layouts.osm_read_only' %> + <% end %> -- 2.43.2