Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge into master #945

Merged
merged 15 commits into from
Sep 20, 2024
Merged

merge into master #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ca492c5
costimec changes
AlessiaYChen Sep 20, 2024
b4dc539
Merge pull request #938 from AlessiaYChen/gov-next-gen-layout
AlessiaYChen Sep 20, 2024
c95b6a5
update footer font size
AlessiaYChen Sep 20, 2024
cf9ca19
Merge pull request #939 from AlessiaYChen/gov-next-gen-layout
AlessiaYChen Sep 20, 2024
e578f6d
update footer font size
AlessiaYChen Sep 20, 2024
6b9f0ec
Merge pull request #940 from AlessiaYChen/gov-next-gen-layout
AlessiaYChen Sep 20, 2024
d08b0e4
synchronize the button state
AlessiaYChen Sep 20, 2024
8c18906
Merge pull request #941 from AlessiaYChen/gov-next-gen-layout
AlessiaYChen Sep 20, 2024
39b6fc6
update font-size
AlessiaYChen Sep 20, 2024
cbfa082
Merge branch 'develop' of https://github.com/bcgov/gcpe-news-webapp i…
AlessiaYChen Sep 20, 2024
60a7ccf
Merge pull request #942 from AlessiaYChen/gov-next-gen-layout
AlessiaYChen Sep 20, 2024
6a2d73c
further tunning dropdown
AlessiaYChen Sep 20, 2024
9c5b6ae
Merge pull request #943 from AlessiaYChen/gov-next-gen-layout
AlessiaYChen Sep 20, 2024
74c9d9a
tuning dropdown
AlessiaYChen Sep 20, 2024
2690341
Merge pull request #944 from AlessiaYChen/gov-next-gen-layout
AlessiaYChen Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gov.News.WebApp/Views/Shared/Ministry.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion Gov.News.WebApp/Views/Shared/PostView.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
21 changes: 10 additions & 11 deletions Gov.News.WebApp/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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');
Expand Down Expand Up @@ -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');
}
});

Expand Down
5 changes: 5 additions & 0 deletions Gov.News.WebApp/wwwroot/Content/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions Gov.News.WebApp/wwwroot/Content/site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down