ui-overhaul #24

Merged
valberg merged 15 commits from ui-overhaul into main 2024-01-13 20:07:37 +00:00
4 changed files with 44 additions and 11 deletions
Showing only changes of commit c0ca622b6b - Show all commits

View file

@ -55,12 +55,12 @@ html, body {
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-weight : 600; font-weight : 600;
color : var(--twilight); color : var(--twilight);
} }
a { a {
font-weight : 500; font-weight : 500;
} }
body { body {
@ -246,14 +246,14 @@ button {
text-decoration : none; text-decoration : none;
} }
div.services > div > a:hover, div.services > div > a:hover,
a.button:hover, a.button:hover,
button:hover { button:hover {
opacity : 1.0; opacity : 1.0;
} }
form > div { form > div {
margin : 0 0 var(--double-space); margin : 0 0 var(--double-space);
} }
form > div >label { form > div >label {
@ -274,7 +274,7 @@ form > div > input[type="password"] {
height : 100%; height : 100%;
display : flex; display : flex;
align-items : center; align-items : center;
justify-content : center; justify-content : center;
} }
#loginbox { #loginbox {
@ -347,3 +347,15 @@ footer {
span.time_remaining { span.time_remaining {
color : var(--fade); color : var(--fade);
} }
.pagination {
display : flex;
justify-content : center;
list-style : none;
padding : 0;
margin : 0;
}
.pagination > li {
margin : 0 6px;
}

View file

@ -35,10 +35,31 @@
</aside> </aside>
<nav> <nav>
<ol> <ol>
<li><a href="/">Dashboard</a></li> <li>
<li><a href="/services" class="current">Services</a></li> <a href="/" class="{% active_path "index" "current" %}">
<li><a href="#">Payment</a></li> Dashboard
<li><a href="/membership">Settings</a></li> </a>
</li>
<li>
<a href="/services" class="{% active_path "services" "current" %}">
Services
</a>
</li>
<li>
<a href="{% url "account_email" %}" class="{% active_path "account_email" "current" %}">
Email
</a>
</li>
{% if perms.membership.administrate_memberships %}
<li>
<a href="{% url "admin-members" %}" class="{% active_path "admin-members" "current" %}">
Admin
</a>
</li>
{% endif %}
</ol> </ol>
</nav> </nav>
<article> <article>

View file

@ -13,7 +13,7 @@ from membership.views import membership_overview
urlpatterns = [ urlpatterns = [
path("", login_required(index), name="index"), path("", login_required(index), name="index"),
path("services/", login_required(services_overview), name="services-overview"), path("services/", login_required(services_overview), name="services"),
path("membership/", membership_overview, name="membership-overview"), path("membership/", membership_overview, name="membership-overview"),
path("admin/members/", members_admin, name="admin-members"), path("admin/members/", members_admin, name="admin-members"),
path( path(

View file

@ -48,7 +48,7 @@
</table> </table>
{% if is_paginated %} {% if is_paginated %}
<nav aria-label="Page navigation example"> <nav>
<ul class="pagination justify-content-center"> <ul class="pagination justify-content-center">
{% if not page.has_previous %} {% if not page.has_previous %}