Merge pull request #500 from hesamat/update-p8-css

Improve Ganjoor styles, fix the dark/light theme button and add logout button to admin portal
2026-08-20 17:39:32 +03:30 · 2026-08-20 17:39:32 +03:30 · e877737aae
commit e877737aae
parent 97f3d7f6f9 86fa524f1c
24 changed files with 1072 additions and 434 deletions
--- a/GanjooRazor/Areas/User/Pages/VerseAdd.cshtml
+++ b/GanjooRazor/Areas/User/Pages/VerseAdd.cshtml
@ -14,7 +14,7 @@
    <meta name="robots" content="noindex, nofollow" />
    <title>پیشنهاد اضافه شدن مصرع‌های جا افتاده</title>
    <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="/css/user-panel.css?version=1" rel="stylesheet" type="text/css" />
 </head>
 <body>
--- a/GanjooRazor/Pages/Auth/Login.cshtml
+++ b/GanjooRazor/Pages/Auth/Login.cshtml
@ -13,7 +13,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="robots" content="noindex, nofollow" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
 </head>
 <body class="bk-background">
    <div id="hdr">
--- a/GanjooRazor/Pages/Auth/ResetPassword.cshtml
+++ b/GanjooRazor/Pages/Auth/ResetPassword.cshtml
@ -11,7 +11,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="robots" content="noindex, nofollow" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
 </head>
 <body class="bk-background">
    <div id="hdr">
--- a/GanjooRazor/Pages/Auth/SignUp.cshtml
+++ b/GanjooRazor/Pages/Auth/SignUp.cshtml
@ -12,7 +12,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="robots" content="noindex, nofollow" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
 </head>
 <body class="bk-background">
    <div id="hdr">
--- a/GanjooRazor/Pages/CommentReports/ReportComment.cshtml
+++ b/GanjooRazor/Pages/CommentReports/ReportComment.cshtml
@ -11,7 +11,7 @@
    <meta name="robots" content="noindex, nofollow" />
    <title>درخواست حذف حاشیه</title>
    <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <style>
        label {
            width: 100px;
--- a/GanjooRazor/Pages/Error.cshtml
+++ b/GanjooRazor/Pages/Error.cshtml
@ -13,7 +13,7 @@
    <title>
        @ViewData["Title"]
    </title>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

--- a/GanjooRazor/Pages/ImageRecommendation/Pin.cshtml
+++ b/GanjooRazor/Pages/ImageRecommendation/Pin.cshtml
@ -12,7 +12,7 @@
    <meta name="robots" content="noindex, nofollow" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="/css/spotify.css" rel="stylesheet" type="text/css" />

    <script src="/lib/jquery/dist/jquery.min.js"></script>
--- a/GanjooRazor/Pages/Map.cshtml
+++ b/GanjooRazor/Pages/Map.cshtml
@ -12,7 +12,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="description" content="سخنوران و نویسندگان گنجور روی نقشهٔ جغرافیایی" />
    <meta charset="utf-8" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link rel="stylesheet" href="/css/leaflet.css?version=2" />
    <style>
        .leaflet-container {
--- a/GanjooRazor/Pages/Misc/Photos.cshtml
+++ b/GanjooRazor/Pages/Misc/Photos.cshtml
@ -11,7 +11,7 @@
    <title>
        @Html.Raw(ViewData["Title"])
    </title>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
    <script src="/lib/jquery/dist/jquery.min.js"></script>
@ -156,15 +156,17 @@
                        <div class="century">
                            فهرست سخنوران
                        </div>
-                        @foreach (var poet in Model.Poets)
-                        {
-                            <div class="poet" data-value="@poet.Nickname">
-                                <a href="/photos?p=@poet.FullUrl.Substring(1)" title="@poet.Name"><img src="@poet.ImageUrl" alt="@poet.Name" /></a>
-                                <div class="caption">
-                                    <a href="/photos?p=@poet.FullUrl.Substring(1)">@poet.Nickname</a>
+                        <div class="spacer">
+                            @foreach (var poet in Model.Poets)
+                            {
+                                <div class="poet" data-value="@poet.Nickname">
+                                    <a href="/photos?p=@poet.FullUrl.Substring(1)" title="@poet.Name"><img src="@poet.ImageUrl" alt="@poet.Name" /></a>
+                                    <div class="caption">
+                                        <a href="/photos?p=@poet.FullUrl.Substring(1)">@poet.Nickname</a>
+                                    </div>
                                </div>
-                            </div>
-                        }
+                            }
+                        </div>
                    }

                    @if (Model.Poet != null)
--- a/GanjooRazor/Pages/Recitations/AudioClip.cshtml
+++ b/GanjooRazor/Pages/Recitations/AudioClip.cshtml
@ -15,7 +15,7 @@
        گنجور » نمایش خوانش
    </title>
    <link href="~/dist/skin/pink.flag/css/jplayer.pink.flag.min.css" rel="stylesheet" type="text/css" />
-    <link href="~/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="~/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
    <script>
--- a/GanjooRazor/Pages/Recitations/RecitationsOrder.cshtml
+++ b/GanjooRazor/Pages/Recitations/RecitationsOrder.cshtml
@ -12,7 +12,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="robots" content="noindex, nofollow" />
    <title>اطلاعات رتبه‌بندی خوانش‌های شعر</title>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />

 </head>
 <body>
--- a/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
+++ b/GanjooRazor/Pages/Recitations/ReportRecitation.cshtml
@ -13,7 +13,7 @@
    <meta name="robots" content="noindex, nofollow" />
    <title>گنجور » گزارش خطا در خوانش</title>
    <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="~/dist/skin/pink.flag/css/jplayer.pink.flag.min.css" rel="stylesheet" type="text/css" />
    <style>
        label {
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@ -10,7 +10,7 @@
    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
    <link rel="stylesheet" href="~/css/site.css" />
    <link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="/css/user-panel.css?version=2" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
@ -462,7 +462,7 @@
    </script>
 </head>

-<body>
+<body class="admin-body">
    <header>
        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
            <div class="container">
@ -497,6 +497,19 @@
                                <a class="dropdown-item" asp-area="Admin" asp-page="PublicDataImport">درون‌ریزی دادهٔ عمومی</a>
                            </div>
                        </li>
+
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" href="javascript:toggleColorScheme();" title="تغییر پوسته">
+                                <span id="icon-sun"><svg height="24px" viewBox="0 -960 960 960" width="24px"><path d="M440-760v-160h80v160h-80Zm266 110-55-55 112-115 56 57-113 113Zm54 210v-80h160v80H760ZM440-40v-160h80v160h-80ZM254-652 140-763l57-56 113 113-56 54Zm508 512L651-255l54-54 114 110-57 59ZM40-440v-80h160v80H40Zm157 300-56-57 112-112 29 27 29 28-114 114Zm283-100q-100 0-170-70t-70-170q0-100 70-170t170-70q100 0 170 70t70 170q0 100-70 170t-170 70Z" /></svg></span>
+                                <span id="icon-moon"><svg height="24px" viewBox="0 -960 960 960" width="24px"><path d="M480-120q-150 0-255-105T120-480q0-150 105-255t255-105q14 0 27.5 1t26.5 3q-41 29-65.5 75.5T444-660q0 90 63 153t153 63q55 0 101-24.5t75-65.5q2 13 3 26.5t1 27.5q0 150-105 255T480-120Z" /></svg></span>
+                            </a>
+                        </li>
+
+                        <li class="nav-item">
+                            <form method="post" action="/login?handler=Logout">
+                                <button type="submit" class="nav-link text-dark" title="خروج از حساب کاربری">خروج</button>
+                            </form>
+                        </li>
                    </ul>
                </div>
            </div>
--- a/GanjooRazor/Pages/Shared/_FooterPartial.cshtml
+++ b/GanjooRazor/Pages/Shared/_FooterPartial.cshtml
@ -151,9 +151,9 @@
    </div>
 </div>

-<a href="javascript:toggleColorScheme();">
-    <span id="icon-sun"><svg height="24px" viewBox="0 -960 960 960" width="24px" fill="burlywood"><path d="M440-760v-160h80v160h-80Zm266 110-55-55 112-115 56 57-113 113Zm54 210v-80h160v80H760ZM440-40v-160h80v160h-80ZM254-652 140-763l57-56 113 113-56 54Zm508 512L651-255l54-54 114 110-57 59ZM40-440v-80h160v80H40Zm157 300-56-57 112-112 29 27 29 28-114 114Zm283-100q-100 0-170-70t-70-170q0-100 70-170t170-70q100 0 170 70t70 170q0 100-70 170t-170 70Z" /></svg></span>
-    <span id="icon-moon"><svg height="24px" viewBox="0 -960 960 960" width="24px" fill="#cc4444"><path d="M480-120q-150 0-255-105T120-480q0-150 105-255t255-105q14 0 27.5 1t26.5 3q-41 29-65.5 75.5T444-660q0 90 63 153t153 63q55 0 101-24.5t75-65.5q2 13 3 26.5t1 27.5q0 150-105 255T480-120Z" /></svg></span>
+<a href="javascript:toggleColorScheme();" id="theme-toggle" title="تغییر پوسته">
+    <span id="icon-sun"><svg height="24px" viewBox="0 -960 960 960" width="24px"><path d="M440-760v-160h80v160h-80Zm266 110-55-55 112-115 56 57-113 113Zm54 210v-80h160v80H760ZM440-40v-160h80v160h-80ZM254-652 140-763l57-56 113 113-56 54Zm508 512L651-255l54-54 114 110-57 59ZM40-440v-80h160v80H40Zm157 300-56-57 112-112 29 27 29 28-114 114Zm283-100q-100 0-170-70t-70-170q0-100 70-170t170-70q100 0 170 70t70 170q0 100-70 170t-170 70Z" /></svg></span>
+    <span id="icon-moon"><svg height="24px" viewBox="0 -960 960 960" width="24px"><path d="M480-120q-150 0-255-105T120-480q0-150 105-255t255-105q14 0 27.5 1t26.5 3q-41 29-65.5 75.5T444-660q0 90 63 153t153 63q55 0 101-24.5t75-65.5q2 13 3 26.5t1 27.5q0 150-105 255T480-120Z" /></svg></span>
 </a>

 <script>
--- a/GanjooRazor/Pages/Shared/_Layout.cshtml
+++ b/GanjooRazor/Pages/Shared/_Layout.cshtml
@ -30,7 +30,7 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <title>@Html.Raw(ViewData["Title"])</title>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
    <script src="/lib/jquery/dist/jquery.min.js"></script>
--- a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
@ -9,7 +9,7 @@
    </title>
    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
    <link rel="stylesheet" href="~/css/site.css" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="/css/user-panel.css?version=2" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
@ -163,6 +163,19 @@
                                </div>
                            </li>
                        }
+
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" href="javascript:toggleColorScheme();" title="تغییر پوسته">
+                                <span id="icon-sun"><svg height="24px" viewBox="0 -960 960 960" width="24px"><path d="M440-760v-160h80v160h-80Zm266 110-55-55 112-115 56 57-113 113Zm54 210v-80h160v80H760ZM440-40v-160h80v160h-80ZM254-652 140-763l57-56 113 113-56 54Zm508 512L651-255l54-54 114 110-57 59ZM40-440v-80h160v80H40Zm157 300-56-57 112-112 29 27 29 28-114 114Zm283-100q-100 0-170-70t-70-170q0-100 70-170t170-70q100 0 170 70t70 170q0 100-70 170t-170 70Z" /></svg></span>
+                                <span id="icon-moon"><svg height="24px" viewBox="0 -960 960 960" width="24px"><path d="M480-120q-150 0-255-105T120-480q0-150 105-255t255-105q14 0 27.5 1t26.5 3q-41 29-65.5 75.5T444-660q0 90 63 153t153 63q55 0 101-24.5t75-65.5q2 13 3 26.5t1 27.5q0 150-105 255T480-120Z" /></svg></span>
+                            </a>
+                        </li>
+
+                        <li class="nav-item">
+                            <form method="post" action="/login?handler=Logout">
+                                <button type="submit" class="nav-link text-dark" title="خروج از حساب کاربری">خروج</button>
+                            </form>
+                        </li>
                    </ul>
                </div>
            </div>
--- a/GanjooRazor/Pages/SongRecommendation/Bp.cshtml
+++ b/GanjooRazor/Pages/SongRecommendation/Bp.cshtml
@ -12,7 +12,7 @@
    <meta name="robots" content="noindex, nofollow" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="/css/spotify.css" rel="stylesheet" type="text/css" />

    <script src="/lib/jquery/dist/jquery.min.js"></script>
--- a/GanjooRazor/Pages/SongRecommendation/Golha.cshtml
+++ b/GanjooRazor/Pages/SongRecommendation/Golha.cshtml
@ -11,7 +11,7 @@
    <meta name="robots" content="noindex, nofollow" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />    
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="/css/spotify.css" rel="stylesheet" type="text/css" />
    <script src="/lib/jquery/dist/jquery.min.js"></script>
    <script src="~/js/golha.js"></script>
--- a/GanjooRazor/Pages/SongRecommendation/Spotify.cshtml
+++ b/GanjooRazor/Pages/SongRecommendation/Spotify.cshtml
@ -12,7 +12,7 @@
    <meta name="robots" content="noindex, nofollow" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link href="/css/spotify.css" rel="stylesheet" type="text/css" />

    <script src="/lib/jquery/dist/jquery.min.js"></script>
--- a/GanjooRazor/Pages/errors/404.cshtml
+++ b/GanjooRazor/Pages/errors/404.cshtml
@ -13,7 +13,7 @@
    <title>
        @ViewData["Title"]
    </title>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

--- a/GanjooRazor/Pages/errors/503.cshtml
+++ b/GanjooRazor/Pages/errors/503.cshtml
@ -14,7 +14,7 @@
    <title>
        @ViewData["Title"]
    </title>
-    <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/p8.css?version=87" rel="stylesheet" type="text/css" />
    <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
    <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

--- a/GanjooRazor/wwwroot/css/p8.css
+++ b/GanjooRazor/wwwroot/css/p8.css
--- a/GanjooRazor/wwwroot/css/user-panel.css
+++ b/GanjooRazor/wwwroot/css/user-panel.css
@ -752,3 +752,22 @@ body.up-modal-open {
    font-size: 0.65rem;
    padding: 1px 8px;
 }
+
+.navbar form {
+    margin-bottom: 0;
+}
+
+.navbar form button.nav-link {
+    background: none;
+    border: none;
+    padding: 0.5rem 1rem;
+    font-size: 1rem;
+    line-height: inherit;
+    cursor: pointer;
+}
+
+.navbar form button.nav-link:hover,
+.navbar form button.nav-link:focus {
+    color: var(--up-link-hover, #0056b3);
+    text-decoration: none;
+}
--- a/GanjooRazor/wwwroot/fonts/IranNastaliq-Web.woff2
+++ b/GanjooRazor/wwwroot/fonts/IranNastaliq-Web.woff2