colin
/
ploughshares
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test'

This commit is contained in:
jChenvan 2025-07-10 10:15:01 -04:00
parent 1c84db947c 04a1fbaeb1
commit 4438f6f37c
3 changed files with 64 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
docker/ploughshares/static/css/custom.css
View File

@ -3,8 +3,6 @@
/* System font stack */
body {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
padding-top: 20px;
padding-bottom: 20px;
color: #333333; /* Improved text contrast */
line-height: 1.5; /* Improved readability */
font-size: 16px; /* Base font size for better readability */
@ -29,8 +27,16 @@ body {
/* Header styles */
.header {
margin-left: -50vw;
margin-right: -50vw;
border-bottom: 1px solid #d0d0d0;
margin-bottom: 30px;
background-color: var(--ploughshares-blue) !important;
}
.header > div {
max-width: 1320px;
margin: auto;
}
.header h3 {
@ -84,15 +90,18 @@ label {
/* Logo styles */
.logo-container {
display: flex;
flex-direction: column;
align-items: center;
}
.logo-container div {
font-size: 14px;
}
.navbar-brand img {
max-height: 40px;
max-height: 60px;
width: auto;
margin-right: 10px;
/* Improved logo contrast with background */
background-color: white;
padding: 3px;
border-radius: 4px;
}
@ -203,7 +212,16 @@ a:focus, button:focus, input:focus, select:focus, textarea:focus, [tabindex]:foc
/* Navbar styles */
.navbar {
background-color: var(--ploughshares-blue) !important;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
padding: 20px 10px 20px 10px;
}
.navbar-brand {
transition: opacity 0.5s ease-in-out ;
}
.navbar-brand:hover {
text-decoration: none;
opacity: 80%;
}
.navbar-light .navbar-brand {
@ -254,9 +272,8 @@ a:focus, button:focus, input:focus, select:focus, textarea:focus, [tabindex]:foc
}
.table th {
background-color: var(--ploughshares-blue);
color: white;
font-weight: 500;
font-size: 18px;
border-bottom: 2px solid var(--ploughshares-dark-blue);
}

BIN
docker/ploughshares/static/img/logo-light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 438 KiB

77
docker/ploughshares/templates/base.html
View File

@ -12,13 +12,13 @@
<link rel="stylesheet" href="{{ url_for('static', filename='css/custom.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/hotkeys.css') }}">
<style>
.navbar-brand img {
max-height: 40px;
margin-right: 10px;
}
.logo-container {
.container {
display: flex;
align-items: center;
flex-direction: column;
min-height: 100vh;
}
.content {
flex: 1;
}
</style>
</head>
@ -28,46 +28,47 @@
<div class="container">
<header class="header clearfix">
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
<a class="navbar-brand" href="{{ url_for('index') }}" aria-label="Project Ploughshares Home">
<div class="logo-container">
<img src="{{ url_for('static', filename='img/logo.png') }}" alt="Project Ploughshares Logo" width="180" height="40">
<span class="d-none d-md-inline">Transaction Management System</span>
</div>
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav ms-auto">
<li class="nav-item">
<a class="nav-link" href="{{ url_for('index') }}" aria-current="{% if request.endpoint == 'index' %}page{% endif %}">
<i class="bi bi-house-door" aria-hidden="true"></i> Home
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('create_transaction') }}" aria-current="{% if request.endpoint == 'create_transaction' %}page{% endif %}">
<i class="bi bi-plus-circle" aria-hidden="true"></i> New Transaction
</a>
</li>
<div>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container-fluid">
<a class="navbar-brand" href="{{ url_for('index') }}" aria-label="Project Ploughshares Home">
<div class="logo-container">
<img src="{{ url_for('static', filename='img/logo-light.png') }}" alt="Project Ploughshares Logo">
<div class="d-none d-md-inline">Transaction Management System</div>
</div>
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav ms-auto">
<li class="nav-item">
<a class="nav-link" href="{{ url_for('index') }}" aria-current="{% if request.endpoint == 'index' %}page{% endif %}">
<i class="bi bi-house-door" aria-hidden="true"></i> Home
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('create_transaction') }}" aria-current="{% if request.endpoint == 'create_transaction' %}page{% endif %}">
<i class="bi bi-plus-circle" aria-hidden="true"></i> New Transaction
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('pending_approval') }}" aria-current="{% if request.endpoint == 'pending_approval' %}page{% endif %}">
<i class="bi bi-clock-history" aria-hidden="true"></i> Pending Approval
<span class="badge bg-warning rounded-pill" id="pending-count"></span>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('api_docs') }}" aria-current="{% if request.endpoint == 'api_docs' %}page{% endif %}">
<i class="bi bi-file-earmark-text" aria-hidden="true"></i> API Documentation
</a>
</li>
</ul>
<li class="nav-item">
<a class="nav-link" href="{{ url_for('api_docs') }}" aria-current="{% if request.endpoint == 'api_docs' %}page{% endif %}">
<i class="bi bi-file-earmark-text" aria-hidden="true"></i> API Documentation
</a>
</li>
</ul>
</div>
</div>
</div>
</nav>
</nav>
</div>
</header>
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<div class="alert-container" role="alert">