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

[MDS-6281] Fix bootstrap accordions #28

Merged
merged 5 commits into from
Dec 4, 2024
Merged

[MDS-6281] Fix bootstrap accordions #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9164380
Update workflow to deploy packages tagged with test
sggerard Nov 27, 2024
ba5834d
Fix bootstrap accordians, fix footer scss rule
sggerard Dec 3, 2024
ad8149e
Merge remote-tracking branch 'origin/main' into mds-6281-fix-accordians
sggerard Dec 4, 2024
17a2184
Correct cleanup
sggerard Dec 4, 2024
c91581c
Disable conventional commits
sggerard Dec 4, 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
3 changes: 2 additions & 1 deletion .github/workflows/pr-close.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ jobs:
oc_token: ${{ secrets.OC_TOKEN }}
with:
cleanup: helm
packages: cms frontend
packages: cms frontend
remove_pvc: data-${{ github.event.repository.name }}-${{ github.event.number }}-bitnamijpg-0
1 change: 1 addition & 0 deletions .github/workflows/pr-validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
if: (! github.event.pull_request.draft)
uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
with:
conventional_commits: false
markdown_links: |
- [Frontend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca)
- [CMS](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca/api)
Expand Down
4 changes: 2 additions & 2 deletions .../administrative-penalties-tab-content/administrative-penalties-tab-content.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<div class="accordion__collapse-header" id="accordHead" role="tab">
<a
class="accordion__collapse-header--column toggle collapsed"
data-toggle="collapse"
data-bs-toggle="collapse"
href="#accordCollapse{{ item._id }}"
>
<i class="material-icons open-icon">add</i>
<i class="material-icons close-icon">remove</i>
</a>
<span class="accordion__collapse-header--column enforcements-table__name-col">
<a data-toggle="collapse" href="#accordCollapse{{ item._id }}">
<a data-bs-toggle="collapse" href="#accordCollapse{{ item._id }}">
{{ item.issuedTo ? item.issuedTo : 'N/A' }}
</a>
</span>
Expand Down
4 changes: 2 additions & 2 deletions ...-actions/offence-prosecutions-tab-content/offence-prosecutions-tab-content.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
<div class="accordion__collapse-header" id="accordHead" role="tab">
<a
class="accordion__collapse-header--column toggle collapsed"
data-toggle="collapse"
data-bs-toggle="collapse"
href="#accordCollapse{{ item._id }}"
>
<i class="material-icons open-icon">add</i>
<i class="material-icons close-icon">remove</i>
</a>
<span class="accordion__collapse-header--column enforcements-table__name-col">
<a data-toggle="collapse" href="#accordCollapse{{ item._id }}">
<a data-bs-toggle="collapse" href="#accordCollapse{{ item._id }}">
{{ item.issuedTo ? item.issuedTo : 'N/A' }}
</a>
</span>
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/app/footer/footer.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@

// Hide the footer when a component (e.g., the map) is shown full screen
.full-screen {
footer.app-footer {
display: none;
+ app-footer {
.app-footer {
display: none;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion .../src/app/projects/project-detail/authorizations/authorizations-tab-content.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h3>{{agency.act}} <span>{{agency.name}}</span></h3>
<div class="accordion authorizations-list" id="{{agency.htmlId}}" role="tablist" aria-multiselectable="false">
<div class="accordion__collapse-item" *ngFor="let c of collections[agency.id].items">
<div class="accordion__collapse-header" role="tab" id="heading-{{c._id}}">
<a class="accordion__collapse-header--column toggle collapsed" data-ng-if="c.documents" data-toggle="collapse" href="#collapse-{{c._id}}"
<a class="accordion__collapse-header--column toggle collapsed" data-ng-if="c.documents" data-bs-toggle="collapse" href="#collapse-{{c._id}}"
aria-expanded="true" aria-controls="collapseOne">
<i class="material-icons open-icon">add</i>
<i class="material-icons close-icon">remove</i>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects/project-detail/compliance/compliance-tab-content.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h3>Inspections &amp; Orders</h3>
<div class="accordion mt-0">
<div class="accordion__collapse-item" *ngFor="let c of collections.items | orderBy: {property: sortField, direction: sortDirection}">
<div class="accordion__collapse-header" role="tab" id="heading-{{c._id}}">
<a class="accordion__collapse-header--column toggle collapsed" data-toggle="collapse" href="#collapse-{{c._id}}" aria-expanded="true" aria-controls="collapseOne">
<a class="accordion__collapse-header--column toggle collapsed" data-bs-toggle="collapse" href="#collapse-{{c._id}}" aria-expanded="true" aria-controls="collapseOne">
<i class="material-icons open-icon">add</i>
<i class="material-icons close-icon">remove</i>
</a>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects/project-detail/documents/documents-tab-content.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<div class="accordion__collapse-item" *ngFor="let item of collections.items | orderBy: {property: sortField, direction: sortDirection}">
<div class="accordion__collapse-header" role="tab" id="heading-{{item._id}}">
<a class="accordion__collapse-header--column toggle collapsed" data-toggle="collapse" href="#collapse-{{item._id}}" aria-expanded="true" aria-controls="collapseOne">
<a class="accordion__collapse-header--column toggle collapsed" data-bs-toggle="collapse" href="#collapse-{{item._id}}" aria-expanded="true" aria-controls="collapseOne">
<i class="material-icons open-icon">add</i>
<i class="material-icons close-icon">remove</i>
</a>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/projects/project-list/project-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ <h2>Major Mines in British Columbia</h2>
<tr *ngFor="let item of projects | objectFilter: filter | operatorFilter: operatorfilter | projectTypeFilter: typefilter | orderBy: {property: column, direction: direction} | paginate: pagination">
<td class="accordion__collapse-item p-0" colspan="4">
<div class="accordion__collapse-header" id="accordHead" role="tab">
<a class="accordion__collapse-header--column toggle collapsed" data-toggle="collapse" href="#accordCollapse{{item._id}}">
<a class="accordion__collapse-header--column toggle collapsed" data-bs-toggle="collapse" href="#accordCollapse{{item._id}}">
<i class="material-icons open-icon">add</i>
<i class="material-icons close-icon">remove</i>
</a>
Expand Down
192 changes: 0 additions & 192 deletions frontend/src/assets/styles/footer.scss
View file
Open in desktop

This file was deleted.

Loading