Merge pull request #2174 from CityOfPhiladelphia/merge-main-to-staging

Merge main to staging
CityOfPhiladelphia · Sep 16, 2024 · e92b1f9 · e92b1f9
2 parents a976f93 + 9df7d43
commit e92b1f9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/wp/wp-content/plugins/phila.gov-customization/admin/class-phila-gov-admin-menu.php b/wp/wp-content/plugins/phila.gov-customization/admin/class-phila-gov-admin-menu.php
@@ -34,6 +34,7 @@ public function __construct(){
 
     add_action('admin_menu', array($this, 'add_custom_menu_separator') );
 
+
  }
 
   function admin_menu_order( $menu_ord ) {
@@ -119,7 +120,9 @@ function add_custom_menu_separator()
   {
     global $menu;
     $separator_index = array(4, 59, 99);
+
     foreach($separator_index as $sp) {
+
       if (isset($menu[$sp])) {
           unset($menu[$sp]);
       }
@@ -173,10 +176,6 @@ function change_admin_post_label(){
     add_menu_page('Audiences', 'Audiences', 'manage_categories','edit-tags.php?taxonomy=audience', '', 'dashicons-groups');
     add_menu_page('Categories', 'Categories', 'manage_categories', 'edit-tags.php?taxonomy=service_type&post_type=service_page',);
     add_menu_page('Tags', 'Tags', 'manage_categories', 'edit-tags.php?taxonomy=post_tag', '', 'dashicons-tag');
-    // add_menu_page('phila gov settings', 'phila gov settings', 'edit_theme_options','admin.php?page=phila_gov', );
-
-    add_menu_page('edit.php?post_type=department_page', 'Add Department Page', 'Add department page', 'edit_department_pages', 'post-new.php?post_type=department_page');
-    // add_menu_page('edit.php?post_type=department_page', 'Add Department Page', 'Add department page', 'edit_department_pages', 'post-new.php?post_type=department_page');
 
     add_submenu_page('edit.php', 'Announcements', 'Announcements', 'edit_posts', 'edit.php?post_type=announcement');
     add_submenu_page('edit.php?post_type=service_page', 'Add Service Page', 'Add service page', 'publish_service_pages', 'post-new.php?post_type=service_page');

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
@@ -52,4 +52,16 @@ hr{
 
 html{
   scroll-behavior: smooth;
+}
+
+.row{
+  max-width: 90rem;
+}
+
+.grid-container {
+  max-width: 90rem;
+}
+
+hr{
+  max-width: 90rem;
 }