Skip to content

Commit

Permalink
Merge pull request #127 from gm3dmo/ab3
Browse files Browse the repository at this point in the history
gh pr merge
  • Loading branch information
gm3dmo authored Dec 16, 2023
2 parents 5639798 + c56922b commit 5b8d869
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 8 deletions.
43 changes: 42 additions & 1 deletion cmp/static/cmp/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,45 @@
margin-top: 3%;
color: #8B0000 ;
padding: 7px;
}
}

.content-table {
border-collapse: collapse;
margin: 25px 0;
font-size: 0.9em;
min-width: 400px;
border-radius: 5px 5px 0 0;
overflow: hidden;
box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
}

.content-table thead tr {
background-color: #8B0000;
color: #ffffff;
text-align: left;
font-weight: bold;
font-size: 20px;

}

.content-table th,
.content-table td {
padding: 12px 15px;
}

.content-table tbody tr {
border-bottom: 1px solid #dddddd;
}

.content-table tbody tr:nth-of-type(even) {
background-color: #f3f3f3;
}

.content-table tbody tr:last-of-type {
border-bottom: 2px solid #8b0000;
}

.content-table tbody tr.active-row {
font-weight: bold;
color: #8B0000;
}
14 changes: 7 additions & 7 deletions templates/cmp/soldier-results.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
{% block content %}

{% if soldiers %}
<h2>Results</h2>
<h5>Search found:</h5>

<table>
<table class="content-table">
<thead>
<tr>
<th><h4>Surname</h4></th>
<th><h4>Initials</h4></th>
<th><h4>Rank</h4></th>
<th><h4>Army Number</h4></th>
<th>Surname</th>
<th>Initials</th>
<th>Rank</th>
<th>Army Number</th>
</tr>
</thead>
<tbody>
{% for soldier in soldiers %}
<tr>
<td>{{ soldier.surname }}</td>
<td><a href="{% url 'soldier' soldier.id %}">{{ soldier.surname }}</a></td>
<td>{{ soldier.initials }}</td>
<td>{{ soldier.rank }}</td>
<td>{{ soldier.army_number}}</td>
Expand Down

0 comments on commit 5b8d869

Please sign in to comment.