From ca492c58002ac84dd621fda8cdc7a6c8a795ac7c Mon Sep 17 00:00:00 2001
From: AlessiaYChen <alessia.yanchen@gov.bc.ca>
Date: Fri, 20 Sep 2024 10:54:13 -0700
Subject: [PATCH 1/7] costimec changes

---
 Gov.News.WebApp/Views/Shared/Ministry.cshtml | 2 +-
 Gov.News.WebApp/Views/Shared/PostView.cshtml | 2 +-
 Gov.News.WebApp/Views/Shared/_Layout.cshtml  | 6 +++---
 Gov.News.WebApp/wwwroot/Content/custom.css   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gov.News.WebApp/Views/Shared/Ministry.cshtml b/Gov.News.WebApp/Views/Shared/Ministry.cshtml
index a39efbc2..c83638a4 100644
--- a/Gov.News.WebApp/Views/Shared/Ministry.cshtml
+++ b/Gov.News.WebApp/Views/Shared/Ministry.cshtml
@@ -2,7 +2,7 @@
 
 @model MinistryViewModel
 
-<div class="ministry-listing@((ViewBag.Type != null && ViewBag.Type == "factsheets") ? " fact-sheets" : "")">
+<div class="pt-2 ministry-listing@((ViewBag.Type != null && ViewBag.Type == "factsheets") ? " fact-sheets" : "")">
     <div class="access">
         <ul>
             <li aria-label="Skip to main content">
diff --git a/Gov.News.WebApp/Views/Shared/PostView.cshtml b/Gov.News.WebApp/Views/Shared/PostView.cshtml
index 23808113..b2fb7e32 100644
--- a/Gov.News.WebApp/Views/Shared/PostView.cshtml
+++ b/Gov.News.WebApp/Views/Shared/PostView.cshtml
@@ -127,7 +127,7 @@
     </div>
 }
 
-<div class="story-page">
+<div class="story-page pt-4">
     <div class="access">
         <ul>
             <li aria-label="Skip to main content">
diff --git a/Gov.News.WebApp/Views/Shared/_Layout.cshtml b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
index 5805e7be..b7f0830c 100644
--- a/Gov.News.WebApp/Views/Shared/_Layout.cshtml
+++ b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
@@ -439,10 +439,10 @@
             },
             'hidden.bs.collapse': function() {
                 $("#nav-menu-sm").find('i.fa').removeClass('fa-times').addClass('fa-bars');
-                $('body').css('overflow-y', 'auto');
                 $('#sm-menu').collapse('hide');
                 $('#sm-nav-container').css('z-index', '10');
                 $("#nav-menu-sm").removeClass("active");
+                $('body').css('overflow-y', 'scroll');
             },
         });
         
@@ -479,12 +479,12 @@
                     e.stopPropagation();
                 $("#sm-icon-dropdown").find('i.fa').removeClass('fa-angle-up').addClass('fa-angle-down');
                 //$("#sm-menu").attr("aria-hidden","true");
-                $("#navbarSupportedContent").find('#sm-news-dropdown').css("background-color", "#FFF");    
+                $("#navbarSupportedContent").find('#sm-news-dropdown').css("background-color", "#FFF");
+                    $('body').css('overflow-y', 'hidden');
             },
             "hidden.bs.collapse": function (e) {
                     e.stopPropagation();
                 $('#sm-nav-container').css('overflow-y', 'hidden');
-                $('body').css('overflow-y', 'hidden');
                 $(".ministry-dropdown").removeClass('active');
             }
         });
diff --git a/Gov.News.WebApp/wwwroot/Content/custom.css b/Gov.News.WebApp/wwwroot/Content/custom.css
index f98959b7..7b5b0294 100644
--- a/Gov.News.WebApp/wwwroot/Content/custom.css
+++ b/Gov.News.WebApp/wwwroot/Content/custom.css
@@ -211,7 +211,7 @@ body {
 }
 
 #footer h4 {
-  font-size: 16px;
+  font-size: 14px;
   padding-right: 20px;
   margin-top: 22px;
   margin-bottom: 10px;

From c95b6a517a72f727ce4de7c25f691141f708d176 Mon Sep 17 00:00:00 2001
From: AlessiaYChen <alessia.yanchen@gov.bc.ca>
Date: Fri, 20 Sep 2024 11:04:54 -0700
Subject: [PATCH 2/7] update footer font size

---
 Gov.News.WebApp/wwwroot/Content/custom.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Gov.News.WebApp/wwwroot/Content/custom.css b/Gov.News.WebApp/wwwroot/Content/custom.css
index 7b5b0294..67627123 100644
--- a/Gov.News.WebApp/wwwroot/Content/custom.css
+++ b/Gov.News.WebApp/wwwroot/Content/custom.css
@@ -211,7 +211,7 @@ body {
 }
 
 #footer h4 {
-  font-size: 14px;
+  font-size: 16px;
   padding-right: 20px;
   margin-top: 22px;
   margin-bottom: 10px;
@@ -584,6 +584,11 @@ body {
         white-space: normal;
     }
 }
+@media only screen and (max-width: 479px){
+    #footer h4 {
+        font-size: 14px;
+    }
+}
 
 @media only screen and (max-width: 350px){
     .header .navbar-brand {

From e578f6d964ee09588272d0bee4d9d3bd00d4bd38 Mon Sep 17 00:00:00 2001
From: AlessiaYChen <alessia.yanchen@gov.bc.ca>
Date: Fri, 20 Sep 2024 11:16:02 -0700
Subject: [PATCH 3/7] update footer font size

---
 Gov.News.WebApp/wwwroot/Content/custom.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gov.News.WebApp/wwwroot/Content/custom.css b/Gov.News.WebApp/wwwroot/Content/custom.css
index 67627123..7b5b554e 100644
--- a/Gov.News.WebApp/wwwroot/Content/custom.css
+++ b/Gov.News.WebApp/wwwroot/Content/custom.css
@@ -585,7 +585,7 @@ body {
     }
 }
 @media only screen and (max-width: 479px){
-    #footer h4 {
+    #footer * {
         font-size: 14px;
     }
 }

From d08b0e4d5c98ffb807ad65bacbf4565f53e6a0f2 Mon Sep 17 00:00:00 2001
From: AlessiaYChen <alessia.yanchen@gov.bc.ca>
Date: Fri, 20 Sep 2024 11:34:47 -0700
Subject: [PATCH 4/7] synchronize the button state

---
 Gov.News.WebApp/Views/Shared/_Layout.cshtml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/Gov.News.WebApp/Views/Shared/_Layout.cshtml b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
index b7f0830c..327774e4 100644
--- a/Gov.News.WebApp/Views/Shared/_Layout.cshtml
+++ b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
@@ -416,7 +416,7 @@
                 });
             }
 
-        $("#smd-search-container").on('shown.bs.collapse', function() {
+        $("#smd-search-container").on('show.bs.collapse', function() {
             $(".d-md-block #search-md-button").find('i.fa').removeClass('fa-search').addClass('fa-times');
             $(".d-md-none #search-md-button").find('i.fa').removeClass('fa-search').addClass('fa-times');
             $(".d-md-block #search-md-button").addClass('active');
@@ -447,11 +447,15 @@
         });
         
         $('#menu').on({
-            "shown.bs.collapse": function (e) {
+            "show.bs.collapse": function (e) {
                 $("#icon-dropdown").find('i.fa').removeClass('fa-angle-down').addClass('fa-angle-up');
+                    $('body').css('overflow-y', 'hidden');
+                    $("#ministry-dropdown").addClass("active");
+            },
+            "shown.bs.collapse": function (e) {
+                
                 //$("#menu").attr("aria-hidden", "false");
-                $('body').css('overflow-y', 'hidden');
-                $("#ministry-dropdown").addClass("active");
+                
             },
             "hide.bs.collapse": function (e) {
                 $("#icon-dropdown").find('i.fa').removeClass('fa-angle-up').addClass('fa-angle-down');
@@ -480,12 +484,12 @@
                 $("#sm-icon-dropdown").find('i.fa').removeClass('fa-angle-up').addClass('fa-angle-down');
                 //$("#sm-menu").attr("aria-hidden","true");
                 $("#navbarSupportedContent").find('#sm-news-dropdown').css("background-color", "#FFF");
-                    $('body').css('overflow-y', 'hidden');
+                $('body').css('overflow-y', 'hidden');
+                $(".ministry-dropdown").removeClass('active');
             },
             "hidden.bs.collapse": function (e) {
-                    e.stopPropagation();
-                $('#sm-nav-container').css('overflow-y', 'hidden');
-                $(".ministry-dropdown").removeClass('active');
+                e.stopPropagation();
+                $('#sm-nav-container').css('overflow-y', 'hidden');  
             }
         });
 

From 39b6fc6b790d73f7a8c0610721981b690fb9778c Mon Sep 17 00:00:00 2001
From: AlessiaYChen <alessia.yanchen@gov.bc.ca>
Date: Fri, 20 Sep 2024 11:46:19 -0700
Subject: [PATCH 5/7] update font-size

---
 Gov.News.WebApp/Views/Shared/_Layout.cshtml | 2 +-
 Gov.News.WebApp/wwwroot/Content/site.css    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gov.News.WebApp/Views/Shared/_Layout.cshtml b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
index 327774e4..da444b0d 100644
--- a/Gov.News.WebApp/Views/Shared/_Layout.cshtml
+++ b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
@@ -128,7 +128,7 @@
 <body>
     <!--googleoff: all-->
     <!--banner-->
-    <!--<partial name="_Banner.cshtml" />-->
+    <partial name="_Banner.cshtml" />
     <!--end of banner-->
     <header class="container-fluid sm-g-0 header nav-border" id="main-nav">
         <div class="container-xl sm-g-0" id="main-nav-contaier">
diff --git a/Gov.News.WebApp/wwwroot/Content/site.css b/Gov.News.WebApp/wwwroot/Content/site.css
index 961374a4..bafe1e22 100644
--- a/Gov.News.WebApp/wwwroot/Content/site.css
+++ b/Gov.News.WebApp/wwwroot/Content/site.css
@@ -2626,6 +2626,7 @@ ul.external-links:last-child {
   margin-top: 25px;
   margin-bottom: 0;
   background-position: left center;
+  font-size: 1.05rem;
 }
 
 .media-container .connect-with-bc h5 a {

From 6a2d73cede9d86bdfd19e64aef8e51c95aed56f3 Mon Sep 17 00:00:00 2001
From: AlessiaYChen <alessia.yanchen@gov.bc.ca>
Date: Fri, 20 Sep 2024 11:52:16 -0700
Subject: [PATCH 6/7] further tunning dropdown

---
 Gov.News.WebApp/Views/Shared/_Layout.cshtml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Gov.News.WebApp/Views/Shared/_Layout.cshtml b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
index da444b0d..fa785088 100644
--- a/Gov.News.WebApp/Views/Shared/_Layout.cshtml
+++ b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
@@ -452,12 +452,7 @@
                     $('body').css('overflow-y', 'hidden');
                     $("#ministry-dropdown").addClass("active");
             },
-            "shown.bs.collapse": function (e) {
-                
-                //$("#menu").attr("aria-hidden", "false");
-                
-            },
-            "hide.bs.collapse": function (e) {
+            "hiden.bs.collapse": function (e) {
                 $("#icon-dropdown").find('i.fa').removeClass('fa-angle-up').addClass('fa-angle-down');
                 //$("#menu").attr("aria-hidden","true");
                 $('body').css('overflow-y', 'scroll');

From 74c9d9a933dd01eb1aa88e9a96c45310c55f04d9 Mon Sep 17 00:00:00 2001
From: AlessiaYChen <alessia.yanchen@gov.bc.ca>
Date: Fri, 20 Sep 2024 12:05:52 -0700
Subject: [PATCH 7/7] tuning dropdown

---
 Gov.News.WebApp/Views/Shared/_Layout.cshtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gov.News.WebApp/Views/Shared/_Layout.cshtml b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
index fa785088..5adac64e 100644
--- a/Gov.News.WebApp/Views/Shared/_Layout.cshtml
+++ b/Gov.News.WebApp/Views/Shared/_Layout.cshtml
@@ -128,7 +128,7 @@
 <body>
     <!--googleoff: all-->
     <!--banner-->
-    <partial name="_Banner.cshtml" />
+    <!--<partial name="_Banner.cshtml" />-->
     <!--end of banner-->
     <header class="container-fluid sm-g-0 header nav-border" id="main-nav">
         <div class="container-xl sm-g-0" id="main-nav-contaier">
@@ -452,7 +452,7 @@
                     $('body').css('overflow-y', 'hidden');
                     $("#ministry-dropdown").addClass("active");
             },
-            "hiden.bs.collapse": function (e) {
+            "hide.bs.collapse": function (e) {
                 $("#icon-dropdown").find('i.fa').removeClass('fa-angle-up').addClass('fa-angle-down');
                 //$("#menu").attr("aria-hidden","true");
                 $('body').css('overflow-y', 'scroll');