From 2e5d4e8c298cba469faa21295f5b115d83422ae5 Mon Sep 17 00:00:00 2001
From: Petr Kovar <pkovar@redhat.com>
Date: Fri, 23 Mar 2018 14:36:09 +0100
Subject: [PATCH] [www] Improve CSS for deprecation badges

Based on comments from I67a759440c2e99b33aa925c5e17c11a1b885ac82.

Change-Id: Ib0f348851195014cd823fe6043adbbcb72e7881f
---
 www/static/common/css/deprecated-badge.css | 16 ++++++++--------
 www/templates/deprecated_badge.tmpl        | 11 ++++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/www/static/common/css/deprecated-badge.css b/www/static/common/css/deprecated-badge.css
index 16ee3829e6..efe3f383e0 100644
--- a/www/static/common/css/deprecated-badge.css
+++ b/www/static/common/css/deprecated-badge.css
@@ -2,10 +2,8 @@
 
 .deprecated-badge {
     background: #2A4E68;
-    padding: 15px;
-    text-transform: uppercase;
-    font-size: 1em;
-    box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.46);
+    padding: 5px;
+    box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 0.46);
     -webkit-font-smoothing: subpixel-antialiased;
     color: #edf2f7 !important;
 }
@@ -13,6 +11,7 @@
 .deprecated-badge a, .deprecated-badge p {
     text-decoration: none;
     position: relative;
+    margin-top: 8px;
     color: #edf2f7;
 }
 
@@ -48,11 +47,11 @@ a.deprecated-badge-right {
 }
 
 .deprecated-badge-obsolete {
-  background: #ff0000 !important;
+  background: #b33a3a !important;
 }
 
 .deprecated-badge-eol {
-   background: #ff0000 !important;
+   background: #b33a3a !important;
 }
 
 .deprecated-badge-current {
@@ -68,11 +67,11 @@ a.deprecated-badge-right {
 }
 
 .deprecated-badge-development a, .deprecated-badge-development p {
-    color: #000000 !important;
+  color: #000000 !important;
 }
 
 .deprecated-badge-maintained a, .deprecated-badge-maintained p {
-    color: #000000 !important;
+  color: #000000 !important;
 }
 .deprecated-badge .container
 {
@@ -82,6 +81,7 @@ a.deprecated-badge-right {
 .deprecated-badge .deprecated-badge-close-button{
   position:absolute;
   top:1%;
+  margin-top: 5px;
   left:99%;
   cursor: pointer;
 
diff --git a/www/templates/deprecated_badge.tmpl b/www/templates/deprecated_badge.tmpl
index 8456479105..9e79cd00f8 100644
--- a/www/templates/deprecated_badge.tmpl
+++ b/www/templates/deprecated_badge.tmpl
@@ -15,23 +15,24 @@
     <div class="container">
        {% if SERIES_INFO.status == 'obsolete' %}
            <p class="deprecated-badge-left">
-                This Release is no longer supported by the community. The current, supported release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}</a>
+                This release is no longer supported by the community. The current supported release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}.</a>
            </p>
        {% elif SERIES_INFO.status == 'EOL' %}
             <p class="deprecated-badge-left">
-                This Release is no longer supported by the community. The current, supported release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}</a>
+                This release is no longer supported by the community. The current supported release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}.</a>
             </p>
         {% elif SERIES == RELEASED_SERIES %}
             <p class="deprecated-badge-left">
-                This is the current, supported release.
+                This is the current supported release.
             </p>
         {% elif SERIES_INFO.status == 'maintained' %}
             <p class="deprecated-badge-left">
-                This is maintained, but NOT the current release. The current, supported release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}</a>
+                This is maintained, but <strong>not</strong> the current release. The current supported
+                release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}.</a>
             </p>
         {% elif SERIES_INFO.status == 'development' %}
             <p class="deprecated-badge-left">
-                This release is currently under development. The current, supported release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}</a>
+                This release is under development. The current supported release is <a href="/{{RELEASED_SERIES}}/">{{RELEASED_SERIES.capitalize()}}.</a>
             </p>
         {% endif %}
         <a href="#top" class="deprecated-badge-right"><i class="fa fa-chevron-up" aria-hidden="true"></i>&nbsp;Back to Top</a>