Merge branch 'couleur_totalist_spies' into 'main'

Couleur totalist spies

See merge request bde/nk20!208

.gitignore

@@ -42,6 +42,7 @@ map.json
 backups/
 /static/
 /media/
+/tmp/
 
 # Virtualenv
 env/

apps/member/migrations/0009_auto_20220904_2325.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.26 on 2022-09-04 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0008_auto_20211005_1544'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='promotion',
+            field=models.PositiveSmallIntegerField(default=2022, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
+        ),
+    ]

apps/treasury/migrations/0005_auto_20230129_2348.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-29 22:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('treasury', '0004_auto_20211005_1544'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='invoice',
+            name='bde',
+            field=models.CharField(choices=[('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='TotalistSpies', max_length=32, verbose_name='BDE'),
+        ),
+    ]

apps/wei/migrations/0004_auto_20220904_2325.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.26 on 2022-09-04 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0003_bus_size'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='year',
+            field=models.PositiveIntegerField(default=2022, unique=True, verbose_name='year'),
+        ),
+    ]

apps/wei/migrations/0005_auto_20230128_1850.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2023-01-28 17:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0004_auto_20220904_2325'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='year',
+            field=models.PositiveIntegerField(default=2023, unique=True, verbose_name='year'),
+        ),
+    ]

note_kfet/static/css/custom.css

@@ -65,7 +65,10 @@ mark {
 
 /* Last BDE colors */
 .bg-primary {
-    background-color: rgb(102, 83, 105) !important;
+/*    background-color: rgb(18, 67, 4) !important; */
+/* MODE VIEUXCON=ON */
+/*    background-color: rgb(166, 0, 2) !important; */
+    background-color: rgb(0, 0, 0) !important;
 }
 
 html {
@@ -80,15 +83,15 @@ body {
 .btn-outline-primary:hover,
 .btn-outline-primary:not(:disabled):not(.disabled).active,
 .btn-outline-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
+   color:  rgb(241, 229, 52);
-    background-color: rgb(102, 83, 105);
+    background-color: rgb(228, 35, 132);
-    border-color: rgb(102, 83, 105);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-outline-primary {
-    color: rgb(102, 83, 105);
+    color: #fff;
-    background-color: rgba(248, 249, 250, 0.9);
+    background-color: #000;
-    border-color: rgb(102, 83, 105);
+    border-color: #464647;
 }
 
 .turbolinks-progress-bar {
@@ -98,36 +101,63 @@ body {
 .btn-primary:hover,
 .btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active {
-    color: #fff;
+    color:  rgb(241, 229, 52);
-    background-color: rgb(102, 83, 105);
+    background-color: rgb(228, 35, 132);
-    border-color: rgb(102, 83, 105);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-primary {
-    color: rgba(248, 249, 250, 0.9); 
+    color:  #fff; 
-    background-color: rgb(102, 83, 105);
+    background-color: #000;
-    border-color: rgb(102, 83, 105);
+    border-color: #adb5bd;
 }
 
 .border-primary {
-    border-color: rgb(115, 15, 115) !important; 
+    border-color: rgb(228, 35, 132) !important; 
 }
 
+.btn-secondary {
+    color:  #fff;
+    background-color: #000;
+    border-color: #adb5bd;
+}
+
+.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);
+}
+
+
+.btn-outline-dark {
+    color: #343a40;
+    border-color: #343a40;
+}
+
+.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);
+}
+
+
 a {
-    color: rgb(102, 83, 105);
+    color: rgb(228, 35, 132);
 }
 
 a:hover {
-    color: rgb(200, 30, 200);
+    color: rgb(228, 35, 132);
 }
 
 .form-control:focus {
-    box-shadow: 0 0 0 0.25rem rgba(200, 30, 200, 0.25);
+    box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 50%);
-    border-color: rgb(200, 30, 200);
+    border-color: rgb(228, 35, 132);
 }
 
 .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.25rem rgba(200, 30, 200, 0.5);
+  box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 10%);
 }
-
-