From b1d47e4cba316554b953565eec030546d6c94875 Mon Sep 17 00:00:00 2001
From: Owen Leonard
Date: Fri, 23 Apr 2021 13:52:29 +0000
Subject: [PATCH] Bug 28179: (follow-up) Updates to styling of lightbox
controls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This patch fixes a bug and adds some style changes which I think are
nice. The bugfix is to change the z-index of the lightbox footer so that
it isn't hidden when there is a language menu in the footer.
The cosmetic changes replace the Chocolat image icons with new SVG
assets based on Bootstrap Icons (https://icons.getbootstrap.com/). The
color changes I think help the controls to be more visible.
License information about Bootstrap Icons has been added to the About
page.
Signed-off-by: Jonathan Druart
Signed-off-by: Owen Leonard
Signed-off-by: Rasmus Leißner
Signed-off-by: Katrin Fischer
---
.../intranet-tmpl/lib/Chocolat/css/chocolat.css | 37 ++++++++++++++++++++++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 5 +++
2 files changed, 42 insertions(+)
diff --git a/koha-tmpl/intranet-tmpl/lib/Chocolat/css/chocolat.css b/koha-tmpl/intranet-tmpl/lib/Chocolat/css/chocolat.css
index e5ad53cd1a..16d2c95f24 100644
--- a/koha-tmpl/intranet-tmpl/lib/Chocolat/css/chocolat.css
+++ b/koha-tmpl/intranet-tmpl/lib/Chocolat/css/chocolat.css
@@ -228,3 +228,40 @@ body.chocolat-open > .chocolat-image-wrapper {
opacity: 0;
}
*/
+
+/* Local chnages for Koha */
+.chocolat-wrapper {
+ z-index: 1035;
+}
+
+.chocolat-wrapper .chocolat-left {
+ background: transparent url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='currentColor' class='bi bi-arrow-left-circle-fill' viewBox='0 0 16 16'%3E%3Cpath d='M8 0a8 8 0 1 0 0 16A8 8 0 0 0 8 0zm3.5 7.5a.5.5 0 0 1 0 1H5.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L5.707 7.5H11.5z' style='fill:%237ab8ba;fill-opacity:1' /%3E%3C/svg%3E") 50% 50% no-repeat;
+ background-size: 35px;
+}
+.chocolat-wrapper .chocolat-right {
+ background: transparent url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='currentColor' class='bi bi-arrow-right-circle-fill' viewBox='0 0 16 16'%3E%3Cpath d='M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0zM4.5 7.5a.5.5 0 0 0 0 1h5.793l-2.147 2.146a.5.5 0 0 0 .708.708l3-3a.5.5 0 0 0 0-.708l-3-3a.5.5 0 1 0-.708.708L10.293 7.5H4.5z' style='fill:%237ab8ba;fill-opacity:1' /%3E%3C/svg%3E") 50% 50% no-repeat;
+ background-size: 35px;
+}
+
+.chocolat-wrapper .chocolat-close {
+ background: transparent url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='currentColor' class='bi bi-x-circle-fill' viewBox='0 0 16 16'%3E%3Cpath d='M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z' style='fill:%237ab8ba;fill-opacity:1' /%3E%3C/svg%3E") 50% 50% no-repeat;
+ background-size: 35px;
+}
+
+.chocolat-wrapper .chocolat-bottom {
+ background: rgba(0, 0, 0, 0.8);
+}
+
+.chocolat-wrapper .chocolat-bottom a {
+ color: #FFF;
+ text-decoration: underline;
+}
+
+.chocolat-wrapper .chocolat-fullscreen {
+ width: 40px;
+ background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' fill='currentColor' class='bi bi-arrow-down-left-square' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill-rule='evenodd' d='M14.357 3.656a.692.692 0 00-.691-.692H2.263a.692.692 0 00-.691.692v8.303c0 .382.31.692.691.692h11.403c.382 0 .691-.31.691-.692zm-13.477 0c0-.764.62-1.383 1.383-1.383h11.403c.764 0 1.383.62 1.383 1.383v8.303c0 .764-.62 1.383-1.383 1.383H2.263C1.5 13.342.88 12.723.88 11.96z' fill='%23fff'/%3E%3Cpath fill-rule='evenodd' d='M14.357 8.151a.692.692 0 00-.691-.692h-5.88a.692.692 0 00-.69.692v3.808c0 .382.309.692.69.692h5.88c.382 0 .691-.31.691-.692zm-7.954 0c0-.764.62-1.384 1.384-1.384h5.879c.764 0 1.383.62 1.383 1.384v3.808c0 .764-.62 1.383-1.383 1.383h-5.88c-.763 0-1.383-.619-1.383-1.383z' fill='%23fff'/%3E%3C/svg%3E");
+ background-position: 50% 50%;
+ background-repeat: no-repeat;
+ background-size: 25px;
+}
+/* End local changes for Koha */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index c17306ae91..e9d71c0355 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -684,8 +684,13 @@
jQuery and jQueryUI
jQuery and jQueryUI are licensed under the MIT license
+
Bootstrap
Bootstrap code and Glyphicons Free licensed under the MIT license.
+
+ Bootstrap Icons
+ Bootstrap Icons licensed under the MIT license.
+
YUI
BSD License
--
2.11.0