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

fix: #763 fix table styling #766

Merged
merged 2 commits into from
Feb 27, 2025
Merged

fix: #763 fix table styling #766

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
61fff4f
Use word-wrap class to break FOM name and expend the search table wit…
ianliuwk1019 Feb 26, 2025
c156397
Adjust search table column width
ianliuwk1019 Feb 26, 2025
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
30 changes: 15 additions & 15 deletions admin/src/app/search/search.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<form #searchForm="ngForm" (ngSubmit)="onSubmit()">
<div class="top-container" style="overflow-y: hidden;">
<div class="container">
<div class="container-fluid">
<div class="title-container">
<div class="title-container__title">
<h1 class="text-muted">Search FOMs</h1>
Expand All @@ -23,7 +23,7 @@ <h1 class="text-muted">Search FOMs</h1>
</div>

<div class="bottom-container scroll">
<div class="container" style="background: #f7f8fa; padding-bottom: 0;">
<div class="container-fluid" style="background: #f7f8fa; padding-bottom: 0;">
<div class="row">
<div class="form-group col-md-2">
<label for="fomNumberInput" style="white-space: nowrap;">
Expand Down Expand Up @@ -99,7 +99,7 @@ <h1 class="text-muted">Search FOMs</h1>
</div>
</div>

<div class="container">
<div class="container-fluid">
<div>
<h2 *ngIf="searched && !searching && count == 0">
<strong>No results found.</strong>
Expand All @@ -109,23 +109,23 @@ <h2 *ngIf="!searching && count > 0">
</h2>
<table class="table" *ngIf="count > 0" aria-label="Search Results">
<thead>
<tr>
<th id="fomId" class="disp">FOM Number</th>
<th id="fomName" class="client">FOM Name</th>
<th id="projectPlanNumber" class="plan">Plan Number</th>
<th id="fomHolder" class="client">FOM Holder Name</th>
<th id="district">District</th>
<th id="fomStatus" class="status">FOM Status</th>
<th id="commentClosed">Commenting Closed Date</th>
<th id="actions" class="actions"></th>
</tr>
<tr>
<th id="fomId" class="disp">FOM Number</th>
<th id="fomName" class="fom-name">FOM Name</th>
<th id="projectPlanNumber" class="plan">Plan Number</th>
<th id="fomHolder" class="client">FOM Holder Name</th>
<th id="district">District</th>
<th id="fomStatus" class="status">FOM Status</th>
<th id="commentClosed" class="cc-date">Commenting Closed Date</th>
<th id="actions" class="actions"></th>
</tr>
</thead>
<ng-template ngFor let-project [ngForOf]="projects">
<tr class="app-details">
<td class="disp">
<strong>{{project.id }}</strong>
</td>
<td
<td class="word-wrap"
[innerHTML]="project.name ? project.name : '<em>No FOM name on this File</em>'">
</td>
<td>
Expand All @@ -140,7 +140,7 @@ <h2 *ngIf="!searching && count > 0">
<td>
{{project.workflowState? project.workflowState.description : 'Unknown'}}
</td>
<td>
<td class="cc-date">
{{project.commentingClosedDate | date:'mediumDate'}}
</td>

Expand Down
27 changes: 16 additions & 11 deletions admin/src/app/search/search.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ h2 {
grid-auto-rows: minmax(0, auto);
}

// Search Container
.search-container {
padding-top: 2rem;
padding-bottom: 1.5rem;
background: #f7f8fa;
}

.filter-grid {
display: grid;
grid-template-columns: 1fr 1fr;
Expand Down Expand Up @@ -169,16 +162,28 @@ $sr-table-row-bg: #f7f8fa;
}

.disp {
min-width: 5rem;
width: 7%;
text-align: center;
}

.status, .plan {
width: 7rem;
.fom-name {
width: 18%;
}

.cc-date {
width: 8%;
text-align: right;
}

.status {
width: 11%
}
.plan {
width: 10%;
}

.actions {
width: 7rem;
width: 6rem;
text-align: right;
padding-top: 0;
padding-bottom: 0;
Expand Down
4 changes: 2 additions & 2 deletions admin/src/assets/styles/components/table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
}
}

tbody {
tbody, tr {
td {
padding: 0.25rem 0.5rem;
padding: 0.25rem 0.3rem;
vertical-align: top;
}
}
Expand Down
14 changes: 14 additions & 0 deletions admin/src/assets/styles/layout/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ hr {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}

.container-fluid {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}
}

.bottom-container {
Expand All @@ -222,6 +227,11 @@ hr {
.container {
padding-bottom: 1.5rem;
}

.container-fluid {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
}
}

.bold {
Expand All @@ -246,4 +256,8 @@ input, textarea {

.spacer-height-1 {
height: 1rem;
}

.word-wrap {
word-wrap: break-word;
}
Loading