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

Jump to bottom

Feature/1948 - Update 'Add report'button and fix css for spacing between toolbar and header when no bottom line #1968

Merged
merged 2 commits into from
May 22, 2024
Merged

Feature/1948 - Update 'Add report'button and fix css for spacing between toolbar and header when no bottom line #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c6977
Update css on Transactions toolbar
sasha-dresden May 20, 2024
619b3e4
Update 'Add report'button and fix css for spacing between toolbar and…
sasha-dresden May 22, 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 front-end/src/app/reports/report-list/report-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="m-0">Manage reports</h1>
<button
pButton
pRipple
label="Create a new report"
label="Create report"
data-cy="create-report"
icon="pi pi-plus"
class="add-button"
Expand Down
16 changes: 6 additions & 10 deletions front-end/src/app/reports/transactions/transaction-list/transaction-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
<div class="card">
<p-toolbar>
<ng-template pTemplate="left">
<div class="grid">
<div class="col-12">
<h1 class="gandhi-bold size-36">Transactions in this report</h1>
</div>
<div class="col-12">
<span class="subtitle"
><strong>{{ report?.formLabel }}: </strong>{{ report?.formSubLabel }}</span
>
</div>
<div class="flex flex-column">
<h1 class="gandhi-bold size-36">Transactions in this report</h1>
<span class="subtitle">
<strong>{{ report?.formLabel }}: </strong>{{ report?.formSubLabel }}
</span>
</div>
</ng-template>

Expand All @@ -21,7 +17,7 @@ <h1 class="gandhi-bold size-36">Transactions in this report</h1>
[rounded]="false"
(tableActionClick)="onTableActionClick($event.action, $event.actionItem)"
buttonIcon="pi pi-plus"
buttonLabel="Add new transaction"
buttonLabel="Add transaction"
buttonStyleClass="add-button"
buttonAriaLabel="Add a Transaction"
></app-table-actions-button>
Expand Down
6 changes: 6 additions & 0 deletions front-end/src/app/reports/transactions/transaction.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
font-family: karla-bold, serif;
font-size: 14px;
color: #212121;
padding-top: 8px;
}

.read-only-tag {
Expand Down Expand Up @@ -58,3 +59,8 @@ hr {
border-top: 2px solid;
opacity: 1;
}

:host::ng-deep.p-toolbar {
border-bottom: 2px solid !important;
padding-bottom: 8px;
}
8 changes: 5 additions & 3 deletions front-end/src/assets/styles/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2987,7 +2987,7 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {
background: #fff;
color: #212121;
border-bottom: 2px solid #000000;
padding: 64px 1rem 8px 0;
padding: 48px 1rem 8px 0;
font-weight: 600;
}
.p-datatable .p-datatable-footer {
Expand Down Expand Up @@ -4664,8 +4664,10 @@ p-treeselect.p-treeselect-clearable .p-treeselect-clear-icon {

.p-toolbar {
background: #ffffff;
padding: 1rem 1.25rem;
border-radius: 4px;
padding: 48px 0 0 0;
border-radius: 0;
display: flex;
align-items: baseline;
}
.p-toolbar .p-toolbar-separator {
margin: 0 0.5rem;
Expand Down