From 2568a1c43d1737efb79cd4227ae37a6fe8c3bf04 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 21 Nov 2022 18:17:45 +0000
Subject: [PATCH] Bug 32310: Correct CSS in the staff interface which still
 uses old color scheme

This patch updates staff interface CSS so that it better conforms to the
color scheme of the updated staff interface.

To test, apply the patch and rebuild the staff interface CSS.

- Go to Tools -> Calendar. Corrected are the borders around the calendar
  and around the "Add new holiday" panel which appears when you click a
  date on the calendar.
- Go to Patrons and perform a search which will return multiple results.
  - Check the checkbox for some patrons. The color of the "Patrons
    selected" box have been updated.
  - Incorrect padding values have also been removed from the adjacent
    patron list and merge buttons.
- Locate a multi-paged DataTable, e.g. Administration -> Authorized
  values. The style of the "Next" and "Previous" buttons have been
  updated.
- View a patron record and choose More -> Set permissions from the
  toolbar. In the table of permissions, when you hover your mouse over
  one of the headings ("Check out and check in items," "Edit
  authorities," etc.) the color should be correct.
- I don't think this is ever visible in the staff interface, but the
  template has markup in it to display a "Log in" link in the header
  menu if the user isn't logged in. I've removed some redundant CSS
  corresponding to this link and corrected some markup just in case
  there is a situation in which is appears.

Signed-off-by: Amit Gupta <amitddng135@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/css/src/_tables.scss   |  7 ++--
 .../intranet-tmpl/prog/css/src/calendar.scss  |  5 ++-
 .../prog/css/src/staff-global.scss            | 32 ++++++-------------
 .../intranet-tmpl/prog/en/includes/header.inc |  5 +--
 4 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
index b286d871ba5..5b476a4f814 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
@@ -440,16 +440,17 @@ tbody {
 
         .paginate_button {
             border-radius: 4px;
-            color: #004D99 !important;
+            color: $green-text-color !important;
             padding-bottom: 0;
             padding-top: 0;
 
             &:hover,
             &:active {
-                background: #FFC none;
+                background: transparent none;
                 border: 1px solid transparent;
                 box-shadow: none;
-                color: #222BAC !important;
+                color: darken( $green-text-color, 5 ) !important;
+                text-decoration: underline !important;
             }
 
             &.current {
diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss
index fdf972ea513..910130b3385 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss
@@ -94,8 +94,7 @@ $selected: #B9DB88;
 }
 
 .panel {
-    border: 1px solid #B9D8D9;
-    border-radius: 4px;
+    border: 1px solid #8AC363;
     box-shadow: none;
     padding: 0;
     display: none;
@@ -140,7 +139,7 @@ fieldset.brief li.radio {
 
 .flatpickr-calendar {
     border-radius: 0;
-    border: 1px solid #B9D8D9;
+    border: 1px solid #8AC363;
     box-shadow: none;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index f739d190712..1b12027ed6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2000,9 +2000,9 @@ li {
 }
 
 #patron_search_selected {
-    background-color: #F9FEFF;
-    border: 1px solid #B9D8D9;
-    border-color: #A2CBCC #CEE0E3 #CEE0E3 #A2CBCC;
+    background-color: lighten( $background-color-primary, 60 );
+    border: 1px solid $background-color-primary;
+    border-color: lighten( $background-color-primary, 30 ) lighten( $background-color-primary, 50 ) lighten( $background-color-primary, 50 ) lighten( $background-color-primary, 30 );
     border-radius: 3px;
     color: #333;
     display: inline-block;
@@ -2358,15 +2358,15 @@ td.bundle {
 
     a,
     span {
-        background-color: #E4ECF5;
-        border: 1px solid #A4BEDD;
+        background-color: lighten( $background-color-secondary, 50 );
+        border: 1px solid lighten( $background-color-secondary, 15 );
         border-radius: 4px;
         font-weight: bold;
         padding: .1em .4em;
         text-decoration: none;
 
         &:hover {
-            background-color: #EBEFF7;
+            background-color: lighten( $background-color-secondary, 40 )
         }
     }
 }
@@ -2811,7 +2811,7 @@ fieldset > .toptabs {
     margin-bottom: 1em;
 
     a {
-        color: #069;
+        color: $green-text-color;
         font-weight: normal;
         text-decoration: underline;
 
@@ -2819,7 +2819,7 @@ fieldset > .toptabs {
             &.jstree-hovered {
                 background: transparent none;
                 box-shadow: none;
-                color: #005580;
+                color: darken( $green-text-color, 5 );
             }
 
             &.jstree-clicked {
@@ -2999,14 +2999,6 @@ button,
     }
 }
 
-#merge-patrons {
-    padding: 0 25px;
-}
-
-#patronlist-menu {
-    padding: 0 25px;
-}
-
 .btn-xs,
 .btn-group-xs > .btn {
     font-size: 10.5px;
@@ -3122,12 +3114,6 @@ button,
     }
 }
 
-.loggedout {
-    color: #004D99;
-    font-weight: bold;
-    padding: .4em .2em;
-}
-
 .navbar-fixed-bottom {
     .navbar-inner {
         min-height: 0;
@@ -4146,7 +4132,7 @@ input.renew {
         cursor: pointer;
 
         &:hover {
-            color: #004d99;
+            color: $green-text-color;
         }
     }
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 3b03287160c..9925b7aba49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -209,10 +209,7 @@
 
             [% ELSE %]
             <li class="loggedout">
-                <span>
-                    <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
-                    <span class="separator">|</span>
-                </span>
+                <a href="/cgi-bin/koha/mainpage.pl" id="login">Log in</a>
             </li>
             [% END %]
         </ul>
-- 
2.34.1