1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-02-24 17:11:18 +00:00

Compare commits

..

7 Commits

Author SHA1 Message Date
bleizi
85da107e41 Merge branch 'migration-django-4-2' into 'main'
[Draft] nk20 v2.0.0 with django 4.2

See merge request bde/nk20!230
2024-03-14 20:28:56 +01:00
quark
29509b5b26 Merge branch 'quark-main-patch-96792' into 'main'
Changement couleur de la note

See merge request bde/nk20!240
2024-03-14 17:38:29 +01:00
quark
0d64ad31e0 Update custom.css 2024-03-14 17:22:41 +01:00
quark
5781cbd6a5 Merge branch 'quark-main-patch-83351' into 'main'
Changement couleur de la note

See merge request bde/nk20!239
2024-03-14 16:16:37 +01:00
quark
5295e61a00 Changement couleur de la note 2024-03-14 15:59:53 +01:00
quark
e79ed6226a Merge branch 'quark-main-patch-51348' into 'main'
Upload New Migration (change bde)

See merge request bde/nk20!238
2024-03-11 16:28:41 +01:00
quark
68152e6354 Upload New Migration (change bde) 2024-03-11 16:11:54 +01:00
2 changed files with 49 additions and 31 deletions

View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.28 on 2024-03-11 14:49
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('treasury', '0006_auto_20230414_1651'),
]
operations = [
migrations.AlterField(
model_name='invoice',
name='bde',
field=models.CharField(choices=[('RavePartlist', 'RavePart[list]'), ('SecretStorlist', 'SecretStor[list]'), ('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='RavePartlist', max_length=32, verbose_name='BDE'),
),
]

View File

@ -68,7 +68,7 @@ mark {
/* background-color: rgb(18, 67, 4) !important; */
/* MODE VIEUXCON=ON */
/* background-color: rgb(166, 0, 2) !important; */
background-color: rgb(0, 0, 0) !important;
background-color: rgb(100, 30, 100) !important;
}
html {
@ -83,81 +83,81 @@ body {
.btn-outline-primary:hover,
.btn-outline-primary:not(:disabled):not(.disabled).active,
.btn-outline-primary:not(:disabled):not(.disabled):active {
color: rgb(241, 229, 52);
background-color: rgb(228, 35, 132);
border-color: rgb(228, 35, 132);
color: rgb(240, 200, 240);
background-color: rgb(30, 120, 150);
border-color: rgb(190, 150, 190);
}
.btn-outline-primary {
color: #fff;
background-color: #000;
border-color: #464647;
color: #a2a;
background-color: #6bc;
border-color: #719;
}
.turbolinks-progress-bar {
background-color: #12432E;
background-color: #12342E;
}
.btn-primary:hover,
.btn-primary:not(:disabled):not(.disabled).active,
.btn-primary:not(:disabled):not(.disabled):active {
color: rgb(241, 229, 52);
background-color: rgb(228, 35, 132);
border-color: rgb(228, 35, 132);
color: rgb(150, 200, 240);
background-color: rgb(50, 100, 140);
border-color: rgb(0, 0, 0);
}
.btn-primary {
color: #fff;
background-color: #000;
border-color: #adb5bd;
color: #eae;
background-color: #616;
border-color: #000000;
}
.border-primary {
border-color: rgb(228, 35, 132) !important;
border-color: rgb(222, 180, 222) !important;
}
.btn-secondary {
color: #fff;
background-color: #000;
border-color: #adb5bd;
color: #eae;
background-color: #616;
border-color: #000000;
}
.btn-secondary:hover,
.btn-secondary:not(:disabled):not(.disabled).active,
.btn-secondary:not(:disabled):not(.disabled):active {
color: rgb(241, 229, 52);
background-color: rgb(228, 35, 132);
border-color: rgb(228, 35, 132);
color: rgb(150, 200, 240);
background-color: rgb(50, 100, 140);
border-color: rgb(0, 0, 0);
}
.btn-outline-dark {
color: #343a40;
border-color: #343a40;
color: #000000;
border-color: #000000;
}
.btn-outline-dark:hover,
.btn-outline-dark:not(:disabled):not(.disabled).active,
.btn-outline-dark:not(:disabled):not(.disabled):active {
color: rgb(241, 229, 52);
background-color: rgb(228, 35, 132);
border-color: rgb(228, 35, 132);
color: rgb(50, 100, 160);
background-color: rgb(240, 150, 240);
border-color: rgb(50, 100, 160);
}
a {
color: rgb(228, 35, 132);
color: rgb(0, 150, 150);
}
a:hover {
color: rgb(228, 35, 132);
color: rgb(200, 0, 200);
}
.form-control:focus {
box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 50%);
border-color: rgb(228, 35, 132);
box-shadow: 0 0 0 0.25rem rgb(0 150 150 / 50%);
border-color: rgb(0, 200, 200);
}
.btn-outline-primary.focus {
box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 10%);
box-shadow: 0 0 0 0.25rem rgb(0 150 150 / 22%);
}