Merge pull request #945 from bcgov/develop

merge into master
bcgov · Sep 20, 2024 · 7abc338 · 7abc338
2 parents b12c8e6 + 2690341
commit 7abc338
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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');
@@ -439,19 +439,18 @@
             },
             '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');
             },
         });
         
         $('#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');
-                //$("#menu").attr("aria-hidden", "false");
-                $('body').css('overflow-y', 'hidden');
-                $("#ministry-dropdown").addClass("active");
+                    $('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');
@@ -479,13 +478,13 @@
                     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");    
-            },
-            "hidden.bs.collapse": function (e) {
-                    e.stopPropagation();
-                $('#sm-nav-container').css('overflow-y', 'hidden');
+                $("#navbarSupportedContent").find('#sm-news-dropdown').css("background-color", "#FFF");
                 $('body').css('overflow-y', 'hidden');
                 $(".ministry-dropdown").removeClass('active');
+            },
+            "hidden.bs.collapse": function (e) {
+                e.stopPropagation();
+                $('#sm-nav-container').css('overflow-y', 'hidden');  
             }
         });
 

diff --git a/Gov.News.WebApp/wwwroot/Content/custom.css b/Gov.News.WebApp/wwwroot/Content/custom.css
@@ -584,6 +584,11 @@ body {
         white-space: normal;
     }
 }
+@media only screen and (max-width: 479px){
+    #footer * {
+        font-size: 14px;
+    }
+}
 
 @media only screen and (max-width: 350px){
     .header .navbar-brand {

diff --git 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 {