fixed bla bla

acmoune · Jun 21, 2024 · 84000e6 · 84000e6
1 parent 7ae3d5f
commit 84000e6
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/src/OsanWebsite.Web/Pages/CardsPage.cshtml b/src/OsanWebsite.Web/Pages/CardsPage.cshtml
@@ -9,15 +9,15 @@
 <div style="display:flex;align-items:center; background-color: #ffeccc; border-radius: 10px; padding: 15px; font-size: 10pt; color:#540b1c; margin-bottom: 15px;">
     <span class="fa fa-file-pdf" style="font-size: 24pt;"></span>
     <div style="flex-grow: 1; margin-left: 10px;">
-        <div style="font-weight: bold;">Cartes des Repas</div>
+        <div style="font-weight: bold;">Carte des Repas</div>
         <a href="~/docs/carte-repas-OSAN-v2.pdf" target="_blank" class="osan-link">Télécharger</a>
     </div>
 </div>
 
 <div style="display:flex;align-items:center; background-color: #ffeccc; border-radius: 10px; padding: 15px; font-size: 10pt; color:#540b1c; margin-bottom: 15px;">
     <span class="fa fa-file-pdf" style="font-size: 24pt;"></span>
     <div style="flex-grow: 1; margin-left: 10px;">
-        <div style="font-weight: bold;">Cartes des Boissons</div>
+        <div style="font-weight: bold;">Carte des Boissons</div>
         <a href="~/docs/carte-boissons-OSAN-v2.pdf" target="_blank" class="osan-link">Télécharger</a>
     </div>
 </div>
diff --git a/src/OsanWebsite.Web/Pages/Event.cshtml b/src/OsanWebsite.Web/Pages/Event.cshtml
@@ -31,7 +31,7 @@
     <meta property="og:image" content="@($"{Model.Event.GetImageUrl()}")" />
 }
 
-<div class="news-container" style="margin-top:0px;">
+@section coolheader {
     @if (Model.Event.IsVideo)
     {
         <partial name="_YoutubePlayer" model="OsanWebsite.Core.Helpers.MediaHelpers.YoutubeVideoLink(Model.Event.YoutubeVideoId!)" />
@@ -40,7 +40,9 @@
     {
         <img src="@Model.Event.GetImageUrl()" />
     }
+}
 
+<div class="news-container" style="margin-top:0px;">
     <div class="news-details">
         <div class="news-content">
             <div class="news-title"><span class="link-danger" style="text-decoration:none;">@Model.Event.Title</span></div>

diff --git a/src/OsanWebsite.Web/Pages/Index.cshtml b/src/OsanWebsite.Web/Pages/Index.cshtml
@@ -4,12 +4,14 @@
     ViewData["Title"] = "";
 }
 
-<div class="slide-show">
-    @foreach (var slide in Model.SlideShow.Pictures)
-    {
-        <partial name="_SlideItem" model=@slide />
-    }
-</div>
+@section coolheader {
+    <div class="slide-show" style="min-height: 282px;">
+        @foreach (var slide in Model.SlideShow.Pictures)
+        {
+            <partial name="_SlideItem" model=@slide />
+        }
+    </div>
+}
 
 <div style="font-size: 10pt;">
     <div style="text-align:center;display:flex;align-items:center;justify-content:center;">

diff --git a/src/OsanWebsite.Web/Pages/Shared/_Layout.cshtml b/src/OsanWebsite.Web/Pages/Shared/_Layout.cshtml
@@ -66,7 +66,13 @@
             </div>
 
             <div id="content-body">
-                @RenderBody()
+                <div id="cool-header">
+                    @RenderSection("coolheader", required: false)
+                </div>
+
+                <div style="padding: 10px;">
+                    @RenderBody()
+                </div>
             </div>
         </div>
 

diff --git a/src/OsanWebsite.Web/Pages/Spot.cshtml b/src/OsanWebsite.Web/Pages/Spot.cshtml
@@ -31,7 +31,7 @@
     <meta property="og:image" content="@($"{Model.Spot.GetImageUrl()}")" />
 }
 
-<div class="news-container" style="margin-top:0px;">
+@section coolheader {
     @if (Model.Spot.IsVideo)
     {
         <partial name="_YoutubePlayer" model="OsanWebsite.Core.Helpers.MediaHelpers.YoutubeVideoLink(Model.Spot.YoutubeVideoId!)" />
@@ -40,7 +40,9 @@
     {
         <img src="@Model.Spot.GetImageUrl()" />
     }
-
+}
+
+<div class="news-container" style="margin-top:0px;">    
     <div class="news-details">
         <div class="news-content">
             <div class="news-title"><span class="link-danger" style="text-decoration:none;">@Model.Spot.Title</span></div>

diff --git a/src/OsanWebsite.Web/wwwroot/css/news.css b/src/OsanWebsite.Web/wwwroot/css/news.css
@@ -37,7 +37,7 @@
 
 .news-description {
     font-size: 11pt;
-    padding: 5px 0px;
+    padding: 15px 0px;
     border-top: 1px solid #e1bbc5;
 }
 

diff --git a/src/OsanWebsite.Web/wwwroot/css/site.css b/src/OsanWebsite.Web/wwwroot/css/site.css
@@ -2,6 +2,10 @@ body {
     font-family: "Quattrocento Sans", sans-serif !important;
 }
 
+#cool-header img {
+    width: 100%;
+}
+
 .osan-btn {
     width: 100%;
     font-size: 9pt;
@@ -145,7 +149,6 @@ span.feed-menu {
         width: 500px;
         border-left: 1px solid #ba425e;
         border-right: 1px solid #e1bbc5;
-        padding: 10px;
         min-height: calc(100vh + 100px);
     }
 
@@ -207,7 +210,6 @@ span.feed-menu {
 
     #content-body {
         margin-top: 50px;
-        padding: 15px;
     }
 }