From 81957a746ef0b2c4f15048c9f1820e66274a5bb9 Mon Sep 17 00:00:00 2001
From: Chris Burton <cburton@nflibrary.ca>
Date: Fri, 25 Sep 2020 08:10:42 -0400
Subject: [PATCH] LP1895398 Bootstrap OPAC Follow Up #2

1) Fix some whitespace issues
2) Move CSS for language pickuper to style.css.tt2

Signed-off-by: Chris Burton <cburton@nflibrary.ca>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../opac/css/style.css.tt2                    | 21 ++++++++++++++--
 .../opac/parts/css/colors.tt2                 |  9 +++----
 .../opac/parts/pref_locale_picker.tt2         | 24 +------------------
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
index 3027831cda..403a9f9ada 100755
--- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
@@ -3991,6 +3991,23 @@ label[for*=expert_]
     color: #424fa6;
 }
 
-#locale_picker_form label {
-    color: #fff;
+.language_form button {
+    background:none;
+    border:none;
+    margin:0;
+    padding:0;
+    color:[% css_colors.footer_link %];
+}
+.language_form button:disabled {
+    color:[% css_colors.footer_link_disabled %];
 }
+.language_form ul{
+    list-style:none;
+}
+.language_form h6{
+    color:[% css_colors.footer_link %];
+        }
+.language_form{
+    float: right;
+padding: 15px;
+}
\ No newline at end of file
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2
index 622fe57942..6367281c39 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2
@@ -4,14 +4,15 @@
 
 #The counts that appear in the navigation when signed into the OPAC -EX. X Ready For Pickup where x is the modified number
 
-            zero_count = "#c1ffbf", #Logged in item/charges count at 0
+        zero_count = "#c1ffbf", #Logged in item/charges count at 0
         non_zero_count = "#ffc107", #Logged in item/charges count NOT at 0
 
-            facets_back = "#006042", #search list facet backgrounds
+        facets_back = "#006042", #search list facet backgrounds
         facets_text = "#fff",
-            footer_link = "#fff",
+        footer_link = "#fff",
+        footer_link_disabled = "#000",
 
-            nav_separation = "#007a54",
+        nav_separation = "#007a54",
         header_primary = "#007a54", #Primary Header Color
         header_primary_fade = "#007a54", #Fade Header Color, make equal to header_primary for no fade
         footer_primary = "#007a54", #Primary Footer Color
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
index 63c8acc795..a188a64d39 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
@@ -6,29 +6,7 @@
 
     set_locale = CGI.param('set_eg_locale') || CGI.cookie('eg_locale') || base_locale;
 %]
-<style>.language_form button {
-    background:none;
-    border:none;
-    margin:0;
-    padding:0;
-    color:#fff;
-}
-.language_form button:disabled {
-    color:#000;
-}
-    .language_form ul{
-        list-style:none;
-       
-    }
-    .language_form h6{
-        color: #fff;
-            }
-    .language_form{
-        float: right;
-    padding: 15px;
-    }
-    
-</style>
+
 <form id="pref_locale_picker_form" class="language_form" action="[% mkurl() %]" method="post">
     <h6><i class="fas fa-globe"></i> [% l("Language") %]</h6>
     [%- FOREACH param IN CGI.params(); -%]
-- 
2.43.2