From 8537f043f7563f724ca167174780697e5385e410 Mon Sep 17 00:00:00 2001 From: parpaing Date: Sat, 25 Mar 2023 00:57:19 +0100 Subject: [PATCH 1/4] changement des couleurs de la note vers les couleurs totalist spies --- note_kfet/static/css/custom.css | 70 ++++++++++++++++++++++++--------- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/note_kfet/static/css/custom.css b/note_kfet/static/css/custom.css index 521e5a82..663b156e 100644 --- a/note_kfet/static/css/custom.css +++ b/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; - background-color: rgb(102, 83, 105); - border-color: rgb(102, 83, 105); + color: rgb(241, 229, 52); + background-color: rgb(228, 35, 132); + border-color: rgb(228, 35, 132); } .btn-outline-primary { - color: rgb(102, 83, 105); - background-color: rgba(248, 249, 250, 0.9); - border-color: rgb(102, 83, 105); + color: #fff; + background-color: #000; + border-color: #464647; } .turbolinks-progress-bar { @@ -98,36 +101,65 @@ body { .btn-primary:hover, .btn-primary:not(:disabled):not(.disabled).active, .btn-primary:not(:disabled):not(.disabled):active { - color: #fff; - background-color: rgb(102, 83, 105); - border-color: rgb(102, 83, 105); + color: rgb(241, 229, 52); + background-color: rgb(228, 35, 132); + border-color: rgb(228, 35, 132); } .btn-primary { - color: rgba(248, 249, 250, 0.9); - background-color: rgb(102, 83, 105); - border-color: rgb(102, 83, 105); + color: #fff; + background-color: #000; + 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); - border-color: rgb(200, 30, 200); + box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 50%); + 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%); } From 9944ebcaad8d888d33be69bf60943bc8d498a029 Mon Sep 17 00:00:00 2001 From: parpaing Date: Sat, 25 Mar 2023 02:13:16 +0100 Subject: [PATCH 2/4] changement des couleurs de la note vers les couleurs totalist spies --- note_kfet/static/css/custom.css | 2 -- 1 file changed, 2 deletions(-) mode change 100644 => 100755 note_kfet/static/css/custom.css diff --git a/note_kfet/static/css/custom.css b/note_kfet/static/css/custom.css old mode 100644 new mode 100755 index 663b156e..3b7a977a --- a/note_kfet/static/css/custom.css +++ b/note_kfet/static/css/custom.css @@ -161,5 +161,3 @@ a:hover { .btn-outline-primary.focus { box-shadow: 0 0 0 0.25rem rgb(228 35 132 / 10%); } - - From 9d7dd566c9862305189489a697adc325a2b6b318 Mon Sep 17 00:00:00 2001 From: misterkrafts Date: Thu, 30 Mar 2023 17:26:06 +0200 Subject: [PATCH 3/4] Ignore /tmp/ --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 91e55e22..40e0824d 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ map.json backups/ /static/ /media/ +/tmp/ # Virtualenv env/ From cb74311e7b93ea7b1c6e40e463a75b520419f2f3 Mon Sep 17 00:00:00 2001 From: misterkrafts Date: Thu, 30 Mar 2023 19:14:52 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Commit=20migration,=20j'=C3=A9tais=20trigge?= =?UTF-8?q?red?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0009_auto_20220904_2325.py | 18 ++++++++++++++++++ .../migrations/0005_auto_20230129_2348.py | 18 ++++++++++++++++++ apps/wei/migrations/0004_auto_20220904_2325.py | 18 ++++++++++++++++++ apps/wei/migrations/0005_auto_20230128_1850.py | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+) create mode 100644 apps/member/migrations/0009_auto_20220904_2325.py create mode 100644 apps/treasury/migrations/0005_auto_20230129_2348.py create mode 100644 apps/wei/migrations/0004_auto_20220904_2325.py create mode 100644 apps/wei/migrations/0005_auto_20230128_1850.py diff --git a/apps/member/migrations/0009_auto_20220904_2325.py b/apps/member/migrations/0009_auto_20220904_2325.py new file mode 100644 index 00000000..e259dacf --- /dev/null +++ b/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'), + ), + ] diff --git a/apps/treasury/migrations/0005_auto_20230129_2348.py b/apps/treasury/migrations/0005_auto_20230129_2348.py new file mode 100644 index 00000000..bd8a607a --- /dev/null +++ b/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'), + ), + ] diff --git a/apps/wei/migrations/0004_auto_20220904_2325.py b/apps/wei/migrations/0004_auto_20220904_2325.py new file mode 100644 index 00000000..fb41c2bd --- /dev/null +++ b/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'), + ), + ] diff --git a/apps/wei/migrations/0005_auto_20230128_1850.py b/apps/wei/migrations/0005_auto_20230128_1850.py new file mode 100644 index 00000000..a8c432aa --- /dev/null +++ b/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'), + ), + ]