admin/38156-vm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix branding, fonts, icons, and button consistency

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Konrad du Plessis 2026-02-20 01:20:38 +02:00
parent d2ea48b9b5
commit 65862c9a73
9 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/templates/base.html
View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Fox Fitt - Work & Payroll{% endblock %}</title> <title>{% block title %}Fox Fitt | Work & Payroll{% endblock %}</title>
{% if project_description %} {% if project_description %}
<meta name="description" content="{{ project_description }}"> <meta name="description" content="{{ project_description }}">
{% endif %} {% endif %}
@ -11,14 +11,13 @@
<!-- Bootstrap 5 CDN --> <!-- Bootstrap 5 CDN -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Google Fonts --> <!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Poppins:wght@600;700&display=swap" rel="stylesheet">
<!-- Font Awesome --> <!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css">
<!-- Bootstrap Icons -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
<!-- Custom CSS --> <!-- Custom CSS -->
<link rel="stylesheet" href="{% static 'css/custom.css' %}?v={{ deployment_timestamp }}"> <link rel="stylesheet" href="{% static 'css/custom.css' %}?v={{ deployment_timestamp }}">
<style>
body { font-family: 'Inter', sans-serif; }
</style>
{% block head %}{% endblock %} {% block head %}{% endblock %}
</head> </head>
<body> <body>

4
core/templates/core/loan_list.html
View File

@ -1,12 +1,12 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% block title %}Loan Management - Fox Fitt{% endblock %} {% block title %}Loan Management | Fox Fitt{% endblock %}
{% block content %} {% block content %}
<div class="container py-4"> <div class="container py-4">
<div class="d-flex justify-content-between align-items-center mb-4"> <div class="d-flex justify-content-between align-items-center mb-4">
<h2 class="fw-bold mb-0">Loan Management</h2> <h2 class="fw-bold mb-0">Loan Management</h2>
<button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addLoanModal"> <button class="btn btn-accent" data-bs-toggle="modal" data-bs-target="#addLoanModal">
+ New Loan + New Loan
</button> </button>
</div> </div>

2
core/templates/core/log_attendance.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% block title %}Log Daily Attendance | LabourFlow{% endblock %} {% block title %}Log Daily Attendance | Fox Fitt{% endblock %}
{% block content %} {% block content %}
<div class="dashboard-header"> <div class="dashboard-header">

2
core/templates/core/manage_resources.html
View File

@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Manage Resources - LabourFlow{% endblock %} {% block title %}Manage Resources | Fox Fitt{% endblock %}
{% block content %} {% block content %}
<div class="container py-5"> <div class="container py-5">

6
core/templates/core/payroll_dashboard.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load humanize %} {% load humanize %}
{% block title %}Payroll Dashboard - Fox Fitt{% endblock %} {% block title %}Payroll Dashboard | Fox Fitt{% endblock %}
{% block head %} {% block head %}
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.7/dist/chart.umd.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.7/dist/chart.umd.min.js"></script>
@ -18,7 +18,7 @@
<div class="d-flex flex-wrap justify-content-between align-items-center gap-2 mb-4"> <div class="d-flex flex-wrap justify-content-between align-items-center gap-2 mb-4">
<h1 class="h2 fw-bold text-dark mb-0">Payroll Dashboard</h1> <h1 class="h2 fw-bold text-dark mb-0">Payroll Dashboard</h1>
<div> <div>
<button class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#addAdjustmentModal"> <button class="btn btn-accent" data-bs-toggle="modal" data-bs-target="#addAdjustmentModal">
+ Add Adjustment + Add Adjustment
</button> </button>
</div> </div>
@ -304,7 +304,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<button class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#addLoanModal"> <button class="btn btn-accent btn-sm" data-bs-toggle="modal" data-bs-target="#addLoanModal">
+ New Loan + New Loan
</button> </button>
</div> </div>

4
core/templates/core/payslip.html
View File

@ -1,13 +1,13 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load humanize %} {% load humanize %}
{% block title %}Payslip #{{ record.id }} - Fox Fitt{% endblock %} {% block title %}Payslip #{{ record.id }} | Fox Fitt{% endblock %}
{% block content %} {% block content %}
<div class="container py-5"> <div class="container py-5">
<div class="d-print-none mb-4 d-grid gap-2 d-md-flex"> <div class="d-print-none mb-4 d-grid gap-2 d-md-flex">
<a href="{% url 'payroll_dashboard' %}?status=paid" class="btn btn-outline-secondary">← Back to Payment History</a> <a href="{% url 'payroll_dashboard' %}?status=paid" class="btn btn-outline-secondary">← Back to Payment History</a>
<button onclick="window.print()" class="btn btn-primary">Print Payslip</button> <button onclick="window.print()" class="btn btn-accent">Print Payslip</button>
</div> </div>
<div class="card border-0 shadow-lg" id="payslip-card"> <div class="card border-0 shadow-lg" id="payslip-card">

2
core/templates/core/work_log_list.html
View File

@ -1,7 +1,7 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load static %} {% load static %}
{% block title %}Work Log History | LabourFlow{% endblock %} {% block title %}Work Log History | Fox Fitt{% endblock %}
{% block head %} {% block head %}
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.7/dist/chart.umd.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.7/dist/chart.umd.min.js"></script>

4
core/templates/registration/login.html
View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Login - Fox Fitt{% endblock %} {% block title %}Login | Fox Fitt{% endblock %}
{% block content %} {% block content %}
<div class="container py-5"> <div class="container py-5">
@ -43,7 +43,7 @@
</div> </div>
<div class="d-grid gap-2"> <div class="d-grid gap-2">
<button type="submit" class="btn btn-primary py-2 fw-bold" style="background-color: #0f172a; border: none;">Login</button> <button type="submit" class="btn btn-accent py-2 fw-bold">Login</button>
</div> </div>
<input type="hidden" name="next" value="{{ next }}"> <input type="hidden" name="next" value="{{ next }}">

2
static/css/custom.css
View File

@ -1,5 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=Poppins:wght@600;700&display=swap');
:root { :root {
--primary-color: #1e293b; --primary-color: #1e293b;
--accent-color: #10b981; --accent-color: #10b981;