From a5f669a3101747ffe3b2b969d580060ac8954bad Mon Sep 17 00:00:00 2001 From: Leni BEAULATON Date: Wed, 18 Dec 2024 16:38:09 +0100 Subject: [PATCH 1/4] petites modif --- WF-WebAdmin/WF-WebAdmin/Pages/Index.razor | 3 +-- WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor | 4 ---- WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor index b1a9fbd..d71c742 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Index.razor @@ -1,9 +1,8 @@ @page "/" -Index +WikiFantasy

Hello, world!

Welcome to your new app. - diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index 4972dd2..9e7009d 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -8,10 +8,6 @@
-
- About -
-
@Body
diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor index 226024f..88a076c 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/NavMenu.razor @@ -1,6 +1,6 @@ 
- WF-WebAdmin + Wiki Fantasy From 184ec7af8192cd9b154fa2e1039e8d27afa94cf5 Mon Sep 17 00:00:00 2001 From: Kevin MONDEJAR Date: Wed, 18 Dec 2024 17:07:42 +0100 Subject: [PATCH 2/4] Css (une fois de plus) --- WF-WebAdmin/WF-WebAdmin/Pages/Counter.razor | 2 +- .../WF-WebAdmin/Shared/MainLayout.razor | 4 +-- WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 27 ++++++++++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Pages/Counter.razor b/WF-WebAdmin/WF-WebAdmin/Pages/Counter.razor index b21f052..cf665b3 100644 --- a/WF-WebAdmin/WF-WebAdmin/Pages/Counter.razor +++ b/WF-WebAdmin/WF-WebAdmin/Pages/Counter.razor @@ -6,7 +6,7 @@

Current count: @currentCount

- + @code { private int currentCount = 0; diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index 4972dd2..8113b6e 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -3,12 +3,12 @@ WF-WebAdmin
-
+
-
+
About
diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index dc4c68b..f43d46c 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -2,6 +2,8 @@ html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + background: white; + color: black; } h1:focus { @@ -9,7 +11,8 @@ h1:focus { } a, .btn-link { - color: #0071c1; + color: #ffffff; + text-decoration: none; } .btn-primary { @@ -62,3 +65,25 @@ a, .btn-link { .blazor-error-boundary::after { content: "An error has occurred." } + + +button { + border: none; + border-radius: 25px; + background-color: lightgrey; + padding: 1vh; +} + +.sidebar_app { + background: linear-gradient(45deg, #4a148c, #7b1fa2); + height: 100vh; + width: 15vw; +} + +.top-row-app { + height: 3.5rem; + background-color: rgba(0, 0, 0, 0.4); + display: flex; + justify-content: flex-end; + align-items: center; +} \ No newline at end of file From f6392cc4069b5000e79ca59fd34952308b21b3e7 Mon Sep 17 00:00:00 2001 From: Kevin MONDEJAR Date: Wed, 18 Dec 2024 17:09:46 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'WF-WebAdmin/WF?= =?UTF-8?q?-WebAdmin/Shared/MainLayout.razor'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WF-WebAdmin/Shared/MainLayout.razor | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index 55b9b26..6893089 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -1,22 +1,18 @@ -@inherits LayoutComponentBase - -WF-WebAdmin - -
-
- -
- -
-<<<<<<< HEAD -
- About -
- -======= ->>>>>>> a5f669a3101747ffe3b2b969d580060ac8954bad -
- @Body -
-
-
+@inherits LayoutComponentBase + +WF-WebAdmin + +
+
+ +
+ +
+
+ About +
+
+ @Body +
+
+
From dd7b16b750d3bb8f94c185fc06ca08a1e87b94c0 Mon Sep 17 00:00:00 2001 From: Kevin MONDEJAR Date: Wed, 18 Dec 2024 17:12:02 +0100 Subject: [PATCH 4/4] =?UTF-8?q?J'ai=20enlever=20ce=20que=20j'ai=20fait=20c?= =?UTF-8?q?ar=20c'=C3=A9tait=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor | 4 ++-- WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor index 6893089..2c7f47e 100644 --- a/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor +++ b/WF-WebAdmin/WF-WebAdmin/Shared/MainLayout.razor @@ -3,12 +3,12 @@ WF-WebAdmin
-
+
-
+
About
diff --git a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css index f43d46c..dd9be2b 100644 --- a/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css +++ b/WF-WebAdmin/WF-WebAdmin/wwwroot/css/site.css @@ -72,18 +72,4 @@ button { border-radius: 25px; background-color: lightgrey; padding: 1vh; -} - -.sidebar_app { - background: linear-gradient(45deg, #4a148c, #7b1fa2); - height: 100vh; - width: 15vw; -} - -.top-row-app { - height: 3.5rem; - background-color: rgba(0, 0, 0, 0.4); - display: flex; - justify-content: flex-end; - align-items: center; } \ No newline at end of file