From 2cb313b43c3a660cbd3566b765520f10b092e020 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 13 Oct 2022 10:50:15 +0100
Subject: [PATCH] Bug 31747: Use page-section class, reduce CSS

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 koha-tmpl/intranet-tmpl/prog/css/mainpage.css            | 5 -----
 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss   | 6 ------
 koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 8 ++++----
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
index 73b2762697..f0c41f4d07 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
@@ -14,11 +14,6 @@
 
 /* ==== NEWS - Start ==== */
 
-#area-news {
-    border: 1px solid #EEEEEE;
-    margin: 0.2em;
-}
-
 #area-news h3 {
     /* Title section for the news block : transparency to let the koha logo appear */
     background-color: #EEEEEE;
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 fa4292178c..ae9bff6f79 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -723,13 +723,7 @@ label,
 }
 
 #area-news, #area-userblock {
-    background-color: #FFF;
-    border: 0;
     color: #696969;
-    margin: 0 0 1em 0;
-    box-shadow: 0 0 4px 1px #00000030;
-    display: block;
-    padding: 1em;
 
     h3{
         background-color: #FFFFFF;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index cd35b4365a..9bca35204b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -30,7 +30,7 @@
             <h1 class="sr-only">Koha home</h1>
             <div class="col-sm-3">
                 [% IF ( koha_news.count ) %]
-                    <div id="area-news">
+                    <div id="area-news" class="page-section">
                         <h3><span class="news_title">News</span></h3>
                         [% SET show_author = Koha.Preference('NewsAuthorDisplay') == 'staff' || Koha.Preference('NewsAuthorDisplay') == 'both' %]
                         [% FOREACH koha_new IN koha_news %]
@@ -48,7 +48,7 @@
                     </div><!-- /additional-contents -->
                 [% END %]
                 [% IF ( daily_quote ) %]
-                    <div id="area-news">
+                    <div id="area-quote" class="page-section">
                         <h3>Quote of the day</h3>
                         <div class="newsitem">
                             <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
@@ -171,7 +171,7 @@
                     <div class="col-sm-12">
                         [%# Following statement must be in one line for translatability %]
                         [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions )) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) || ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs || new_curbside_pickups.count %]
-                            <div id="area-pending">
+                            <div id="area-pending" class="page-section">
                                 [% IF pending_article_requests %]
                                 <div class="pending-info" id="article_requests_pending">
 
@@ -262,7 +262,7 @@
                 [% IF ( IntranetmainUserblock ) %]
                     <div class="row">
                         <div class="col-sm-12">
-                            <div id="area-userblock">
+                            <div id="area-userblock" class="page-section">
                                 <div class="user-info">
                                     [% IntranetmainUserblock | $raw %]
                                 </div>
-- 
2.39.5