From 51230e029d4862a41b4b451aa6aaf1fd0958e3b7 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Fri, 21 Aug 2020 14:21:26 +0200
Subject: [PATCH] Better navbar buttons and less shadow
---
apps/note/templates/note/conso_form.html | 10 +++++-----
.../note/templates/note/transaction_form.html | 19 +++++++++++--------
note_kfet/static/css/custom.css | 2 +-
note_kfet/templates/base.html | 18 +++++++++---------
4 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/apps/note/templates/note/conso_form.html b/apps/note/templates/note/conso_form.html
index 18cac578..b59bcd98 100644
--- a/apps/note/templates/note/conso_form.html
+++ b/apps/note/templates/note/conso_form.html
@@ -14,7 +14,7 @@
<div class="row">
{# User details column #}
<div class="col">
- <div class="card border-success shadow mb-4 text-center">
+ <div class="card bg-light border-success mb-4 text-center">
<a id="profile_pic_link" href="#">
<img src="/media/pic/default.png"
id="profile_pic" alt="" class="card-img-top">
@@ -27,7 +27,7 @@
{# User selection column #}
<div class="col-xl-7" id="user_select_div">
- <div class="card border-success shadow mb-4">
+ <div class="card bg-light border-success mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
{% trans "Consum" %}
@@ -47,7 +47,7 @@
</div>
{# Summary of consumption and consume button #}
<div class="col-xl-5 d-none" id="consos_list_div">
- <div class="card border-info shadow mb-4">
+ <div class="card bg-light border-info mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
{% trans "Select consumptions" %}
@@ -70,7 +70,7 @@
{# Buttons column #}
<div class="col">
{# Show last used buttons #}
- <div class="card shadow mb-4">
+ <div class="card bg-light mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
{% trans "Highlighted buttons" %}
@@ -92,7 +92,7 @@
{# Regroup buttons under categories #}
- <div class="card border-primary text-center shadow mb-4">
+ <div class="card bg-light border-primary text-center mb-4">
{# Tabs for button categories #}
<div class="card-header">
<ul class="nav nav-tabs nav-fill card-header-tabs">
diff --git a/apps/note/templates/note/transaction_form.html b/apps/note/templates/note/transaction_form.html
index aec1f2e2..a910b4a1 100644
--- a/apps/note/templates/note/transaction_form.html
+++ b/apps/note/templates/note/transaction_form.html
@@ -35,9 +35,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div>
</div>
<div class="row">
- {# Preview note profile (picture, username and balance) #}
+ {# Preview note profile (picture, username and balance) #}
<div class="col-md-3" id="note_infos_div">
- <div class="card border-success shadow mb-4">
+ <div class="card bg-light border-success shadow mb-4">
<a id="profile_pic_link" href="#"><img src="/media/pic/default.png"
id="profile_pic" alt="" class="img-fluid rounded mx-auto d-block"></a>
<div class="card-body text-center">
@@ -45,9 +45,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div>
</div>
</div>
- {# list of emitters #}
+
+ {# list of emitters #}
<div class="col-md-3" id="emitters_div">
- <div class="card border-success shadow mb-4">
+ <div class="card bg-light border-success shadow mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
{% trans "Select emitters" %}
@@ -66,9 +67,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div>
</div>
</div>
-{# list of receiver #}
+
+ {# list of receiver #}
<div class="col-md-3" id="dests_div">
- <div class="card border-info shadow mb-4">
+ <div class="card bg-light border-info shadow mb-4">
<div class="card-header">
<p class="card-text font-weight-bold" id="dest_title">
{% trans "Select receivers" %}
@@ -83,9 +85,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
</div>
</div>
</div>
-{# Information on transaction (amount, reason, name,...) #}
+
+ {# Information on transaction (amount, reason, name,...) #}
<div class="col-md-3" id="external_div">
- <div class="card border-warning shadow mb-4">
+ <div class="card bg-light border-warning shadow mb-4">
<div class="card-header">
<p class="card-text font-weight-bold">
{% trans "Action" %}
diff --git a/note_kfet/static/css/custom.css b/note_kfet/static/css/custom.css
index 5ff37bcf..b160bfba 100644
--- a/note_kfet/static/css/custom.css
+++ b/note_kfet/static/css/custom.css
@@ -39,6 +39,7 @@ select.language {
border: none;
height: calc(1.5em + .5rem);
color: #6c757d;
+ -moz-appearance: none;
}
/* Last BDE colors */
@@ -47,7 +48,6 @@ select.language {
}
html {
scrollbar-color: rgba(121, 121, 123, 1) rgba(35, 35, 39, 1);
-
}
body {
background-color: rgba(64, 64, 64, 1);
diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html
index aaef3794..fb4001b4 100644
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@@ -65,47 +65,47 @@ SPDX-License-Identifier: GPL-3.0-or-later
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
{% if "note.transactiontemplate"|not_empty_model_list %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'note:consos' %}"><i class="fas fa-coffee"></i> {% trans 'Consumptions' %}</a>
</li>
{% endif %}
{% if "note.transaction"|not_empty_model_list %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'note:transfer' %}"><i class="fas fa-exchange-alt"></i> {% trans 'Transfer' %} </a>
</li>
{% endif %}
{% if "auth.user"|model_list_length >= 2 %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'member:user_list' %}"><i class="fas fa-user"></i> {% trans 'Users' %}</a>
</li>
{% endif %}
{% if "member.club"|not_empty_model_list %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'member:club_list' %}"><i class="fas fa-users"></i> {% trans 'Clubs' %}</a>
</li>
{% endif %}
{% if "activity.activity"|not_empty_model_list %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'activity:activity_list' %}"><i class="fas fa-calendar"></i> {% trans 'Activities' %}</a>
</li>
{% endif %}
{% if "treasury.invoice"|not_empty_model_list %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'treasury:invoice_list' %}"><i class="fas fa-credit-card"></i> {% trans 'Treasury' %}</a>
</li>
{% endif %}
{% if "wei.weiclub"|not_empty_model_list %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'wei:current_wei_detail' %}"><i class="fas fa-bus"></i> {% trans 'WEI' %}</a>
</li>
{% endif %}
{% if request.user.is_authenticated %}
- <li class="nav-item active">
+ <li class="nav-item">
<a class="nav-link" href="{% url 'permission:rights' %}"><i class="fas fa-balance-scale"></i> {% trans 'Rights' %}</a>
</li>
{% endif %}
{% if request.user.is_staff and ""|has_perm:user %}
- <li class="nav-item active">
+ <li class="nav-item">
<a data-turbolinks="false" class="nav-link" href="{% url 'admin:index' %}"><i class="fas fa-user-cog"></i> {% trans 'Admin' %}</a>
</li>
{% endif %}
--
GitLab