From 07b92d5692f58c6afc33bf68358e6161516f9403 Mon Sep 17 00:00:00 2001
From: Ritika Desai <ritikahdesai186@gmail.com>
Date: Mon, 2 Dec 2024 20:45:44 +0530
Subject: [PATCH 1/6] changed styling for the trash alert

---
 .../css/scss/_standards-overrides.scss        | 24 +++++++++++++++++++
 .../partials/content-service-updates.php      |  2 +-
 .../partials/posts/trashday-alerts.php        | 10 ++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss b/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss
index 4a42aa8649..38239397fb 100644
--- a/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss
+++ b/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss
@@ -56,4 +56,28 @@ hr{
 
 html{
   scroll-behavior: smooth;
+}
+
+.service-update{
+  .icon-only {
+    padding: 1rem 0 1rem 1rem;
+  }
+  td {
+    background: #f0f0f0 !important;
+    border-right: 0px;
+    border-left: 0px;
+  }
+  th{
+    background: #f0f0f0 !important;
+    border-right: 0px;
+    border-left: 0px;
+  }
+  .service-update--warning, .service-update--critical {
+    i {
+      color: red;
+    }
+  }
+  i {
+    color: green;
+  }
 }
\ No newline at end of file
diff --git a/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php b/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php
index fe8f930bf5..d5dc3c154c 100644
--- a/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php
+++ b/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php
@@ -107,7 +107,7 @@
                       <?php endif; ?>
                     </em></span>
 
-                    <?php endif; ?>
+                    <?php endif; ?>`
                   </td>
                 </tr><!-- row -->
               <?php ++$i; ?>
diff --git a/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php b/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php
index 40026bc5f3..e753c1b1ae 100644
--- a/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php
+++ b/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php
@@ -49,12 +49,18 @@
       }
         ?>">
         <th class="phl-mu <?php if ( !phila_is_department_homepage( $post ) && !is_home() && $a['icon_padding'] == 0 ) echo 'icon-only';?>">
-          <i class="fa-2x fa-fw fas fa-trash-alt service-icon <?php if( $a['icon_padding'] && $a['icon_padding'] == 1) echo 'plm-mu' ?>" aria-hidden="true"></i>
+          <i class="fa-solid fa-xl service-icon service-icon <?php if( $a['icon_padding'] && $a['icon_padding'] == 1) echo 'plm-mu' ?> 
+          <?php 
+            if ( $status == 1 || $status == 2 || $is_holiday == true)
+            { echo "fa-circle-exclamation"; } 
+          else if ( $status == 0) 
+            { echo "fa-circle-check"; } 
+           ?>" aria-hidden="true"></i>
           <?php if ( $a['icon_text'] && $a['icon_text'] == 1 ) { ?>
             <span class="icon-label">Trash & recycling</span>
           <?php } ?>
         </th>
-        <td class="pam">
+        <td class="prm pbm ptm">
           <span class="bold">
             <?php if 
               ( $status == 3 ) { echo $flexible_collection['phila_flexible_collection_status']; } else if

From caefa20eb635b06cec75bfb323468a903345d894 Mon Sep 17 00:00:00 2001
From: Ritika Desai <ritikahdesai186@gmail.com>
Date: Mon, 2 Dec 2024 21:14:41 +0530
Subject: [PATCH 2/6] added status check

---
 .../themes/phila.gov-theme/partials/posts/trashday-alerts.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php b/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php
index e753c1b1ae..d4f8c968dd 100644
--- a/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php
+++ b/wp/wp-content/themes/phila.gov-theme/partials/posts/trashday-alerts.php
@@ -51,7 +51,7 @@
         <th class="phl-mu <?php if ( !phila_is_department_homepage( $post ) && !is_home() && $a['icon_padding'] == 0 ) echo 'icon-only';?>">
           <i class="fa-solid fa-xl service-icon service-icon <?php if( $a['icon_padding'] && $a['icon_padding'] == 1) echo 'plm-mu' ?> 
           <?php 
-            if ( $status == 1 || $status == 2 || $is_holiday == true)
+            if ( $status == 1 || $status == 2 || $status == 3 || $is_holiday == true )
             { echo "fa-circle-exclamation"; } 
           else if ( $status == 0) 
             { echo "fa-circle-check"; } 

From 13e5a9a4df2a137c0fd5f7488d6751a538b88bdb Mon Sep 17 00:00:00 2001
From: Ritika Desai <ritikahdesai186@gmail.com>
Date: Mon, 2 Dec 2024 21:24:38 +0530
Subject: [PATCH 3/6] linting

---
 .../themes/phila.gov-theme/partials/content-service-updates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php b/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php
index d5dc3c154c..fe8f930bf5 100644
--- a/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php
+++ b/wp/wp-content/themes/phila.gov-theme/partials/content-service-updates.php
@@ -107,7 +107,7 @@
                       <?php endif; ?>
                     </em></span>
 
-                    <?php endif; ?>`
+                    <?php endif; ?>
                   </td>
                 </tr><!-- row -->
               <?php ++$i; ?>

From 779ad082a3cb897e4e5d62931c975c1ee550a9b3 Mon Sep 17 00:00:00 2001
From: arminmobasseri <armin.mobasseri@phila.gov>
Date: Thu, 5 Dec 2024 12:01:46 -0500
Subject: [PATCH 4/6] updating metabox to latest + AIO

---
 scripts/composer.sh | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/scripts/composer.sh b/scripts/composer.sh
index 1b95d2033c..30f2ae0a13 100644
--- a/scripts/composer.sh
+++ b/scripts/composer.sh
@@ -46,15 +46,6 @@ echo '
     "cityofphiladelphia/restrict-categories": "dev-'$GITHUB_BRANCH'",
     "cityofphiladelphia/mb-revision": "dev-'$GITHUB_BRANCH'",
     "kylephillips/nestedpages": "dev-main",
-    "meta-box/mb-admin-columns":"dev-master",
-    "meta-box/mb-settings-page":"dev-master",
-    "meta-box/mb-term-meta":"dev-master",
-    "meta-box/meta-box-columns":"dev-master",
-    "meta-box/meta-box-conditional-logic":"dev-master",
-    "meta-box/meta-box-group":"dev-master",
-    "meta-box/meta-box-include-exclude":"dev-master",
-    "meta-box/meta-box-tabs":"dev-master",
-    "meta-box/meta-box-tooltip":"dev-master",
     "wpackagist-plugin/better-search-replace":"1.4.3",
     "wpackagist-plugin/disable-gutenberg":"2.8.1",
     "wpackagist-plugin/jwt-auth":"2.1.3",
@@ -62,10 +53,8 @@ echo '
     "wpackagist-plugin/easy-wp-smtp":"^2.2.0",
     "wpackagist-plugin/admin-email-as-from-address":"^1.2",
     "wpackagist-plugin/jwt-authentication-for-wp-rest-api":"1.3.2",
-    "wpackagist-plugin/meta-box":"^5.10.1",
-    "wpackagist-plugin/mb-rest-api":"^2.0.1",
-    "wpackagist-plugin/mb-relationships":"^1.11.2",
-    "wpackagist-plugin/meta-box-text-limiter":"^1.1.3",
+    "wpackagist-plugin/meta-box":"^5.10.3",
+    "meta-box/meta-box-aio":"dev-master",
     "wpackagist-plugin/miniorange-saml-20-single-sign-on":"^5.0.7",
     "wpackagist-plugin/reusable-text-blocks":"^1.5.3",
     "wpackagist-plugin/amazon-s3-and-cloudfront":"^2.6.2",

From 258a91e5103bbd7dc3af43ef8651992597bb3361 Mon Sep 17 00:00:00 2001
From: Moh Atia <mohamed.atia@phila.gov>
Date: Fri, 6 Dec 2024 10:32:30 -0500
Subject: [PATCH 5/6] remove white background on longform

---
 wp/wp-content/themes/phila.gov-theme/css/scss/pages/_post.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/wp/wp-content/themes/phila.gov-theme/css/scss/pages/_post.scss b/wp/wp-content/themes/phila.gov-theme/css/scss/pages/_post.scss
index 62f7290622..91313f8acf 100644
--- a/wp/wp-content/themes/phila.gov-theme/css/scss/pages/_post.scss
+++ b/wp/wp-content/themes/phila.gov-theme/css/scss/pages/_post.scss
@@ -257,7 +257,6 @@
       }
     }
     .phila-sticky {
-      background: white;
       width: 100% !important;
       max-width: 100% !important;
       left: 0 !important;

From bfa6a5a77bf9f41c72a98ca3b43238aca965d386 Mon Sep 17 00:00:00 2001
From: Ritika Desai <ritikahdesai186@gmail.com>
Date: Tue, 17 Dec 2024 01:04:54 +0530
Subject: [PATCH 6/6] added spacing to h5

---
 .../themes/phila.gov-theme/css/scss/_standards-overrides.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss b/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss
index 38239397fb..f9e0ea39e8 100644
--- a/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss
+++ b/wp/wp-content/themes/phila.gov-theme/css/scss/_standards-overrides.scss
@@ -80,4 +80,8 @@ html{
   i {
     color: green;
   }
+}
+
+h5 {
+  margin-top: 2rem !important;
 }
\ No newline at end of file