From 9f724a4817617dd79e5a31b09eda20bdf302127e Mon Sep 17 00:00:00 2001
From: Vladislav Kopnin <vlad.kopnen@mail.ru>
Date: Mon, 12 Oct 2026 19:47:01 +0300
Subject: [PATCH] Dark theme: readable muted text (override Bootstrap
 --bs-secondary-color vars), lighter muted palette; asset v34

---
 web/src/main/resources/static/css/app.css     |  9 ++++++-
 .../main/resources/templates/admin/group.html |  2 +-
 .../main/resources/templates/admin/lab.html   |  2 +-
 .../resources/templates/fragments/base.html   | 24 +++++++++----------
 .../resources/templates/learn/article.html    |  2 +-
 .../resources/templates/learn/chapter.html    |  2 +-
 .../main/resources/templates/learn/index.html |  4 ++--
 .../resources/templates/learn/section.html    |  2 +-
 .../main/resources/templates/student/lab.html |  2 +-
 9 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css
index ce85729..daa9232 100644
--- a/web/src/main/resources/static/css/app.css
+++ b/web/src/main/resources/static/css/app.css
@@ -15,7 +15,11 @@ body {
 /* Палитра Б3: нейтральный каркас + бордовый акцент.
    Цвет несёт смысл: акцент — действия и фокус, зелёный/янтарный — статусы защиты,
    винный — деструктивные действия и негативная тональность. */
+/* muted-текст Bootstrap (.text-muted/placeholder) идёт через --bs-secondary-color с !important,
+   поэтому переопределяем её переменные под нашу палитру в обеих темах */
 :root {
+    --bs-secondary-color-rgb: 116, 116, 124;
+    --bs-secondary-color: rgba(116, 116, 124, 0.9);
     --bs-body-font-family: 'Inter', system-ui, -apple-system, sans-serif;
     --bs-body-bg: #fafafa;
     --bs-body-color: #131316;
@@ -51,10 +55,13 @@ body {
 }
 
 [data-theme="dark"] {
+    --bs-secondary-color-rgb: 232, 233, 236;
+    --bs-secondary-color: rgba(232, 233, 236, 0.72);
+    --bs-emphasis-color: #ffffff;
     --c-bg: #101014;
     --c-surface: #17181d;
     --c-text: #e8e9ec;
-    --c-text-muted: #9a9ba4;
+    --c-text-muted: #a6a8b2;
     --c-text-link: #d98b98;
     --c-text-link-hover: #f0b9c2;
     --c-border: #26272e;
diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html
index e4c4ad6..ae1f8a9 100644
--- a/web/src/main/resources/templates/admin/group.html
+++ b/web/src/main/resources/templates/admin/group.html
@@ -342,7 +342,7 @@
     <div class="dlg-body" id="assign-modal-body"></div>
 </dialog>
 
-<script th:src="@{/js/admin-group.js(v='33')}" defer></script>
+<script th:src="@{/js/admin-group.js(v='34')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/admin/lab.html b/web/src/main/resources/templates/admin/lab.html
index 3274cc4..730abb9 100644
--- a/web/src/main/resources/templates/admin/lab.html
+++ b/web/src/main/resources/templates/admin/lab.html
@@ -196,7 +196,7 @@
             </dialog>
         </th:block>
     </div>
-    <script th:src="@{/js/admin-lab.js(v='33')}" defer></script>
+    <script th:src="@{/js/admin-lab.js(v='34')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/fragments/base.html b/web/src/main/resources/templates/fragments/base.html
index cc8b406..59ce367 100644
--- a/web/src/main/resources/templates/fragments/base.html
+++ b/web/src/main/resources/templates/fragments/base.html
@@ -13,22 +13,22 @@
     <noscript>
         <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
     </noscript>
-    <link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='33')}">
+    <link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='34')}">
     <!-- v=4: сброс кэша стилей после редизайна; при изменении css поднимать версию -->
     <link rel="stylesheet" th:href="@{/css/bootstrap.min.css}">
     <link rel="stylesheet" th:href="@{/css/bootstrap-icons.min.css}">
-        <link rel="stylesheet" th:href="@{/css/app.css(v='33')}">
-    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='33')}">
-    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='33')}" disabled>
-    <script th:src="@{/js/highlight.min.js(v='33')}" defer></script>
-    <script th:src="@{/js/table-scroll.js(v='33')}" defer></script>
-    <script th:src="@{/js/tablekit.js(v='33')}" defer></script>
+        <link rel="stylesheet" th:href="@{/css/app.css(v='34')}">
+    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='34')}">
+    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='34')}" disabled>
+    <script th:src="@{/js/highlight.min.js(v='34')}" defer></script>
+    <script th:src="@{/js/table-scroll.js(v='34')}" defer></script>
+    <script th:src="@{/js/tablekit.js(v='34')}" defer></script>
     <script th:src="@{/js/bootstrap.bundle.min.js}" defer></script>
-    <script th:src="@{/js/theme-init.js(v='33')}"></script>
-    <script th:src="@{/js/app.js(v='33')}" defer></script>
-    <script th:src="@{/js/ui-state.js(v='33')}" defer></script>
-    <script th:src="@{/js/md-content.js(v='33')}" defer></script>
-    <script th:src="@{/js/submit-guard.js(v='33')}" defer></script>
+    <script th:src="@{/js/theme-init.js(v='34')}"></script>
+    <script th:src="@{/js/app.js(v='34')}" defer></script>
+    <script th:src="@{/js/ui-state.js(v='34')}" defer></script>
+    <script th:src="@{/js/md-content.js(v='34')}" defer></script>
+    <script th:src="@{/js/submit-guard.js(v='34')}" defer></script>
 </head>
 <body>
 <div class="page d-flex flex-column min-vh-100">
diff --git a/web/src/main/resources/templates/learn/article.html b/web/src/main/resources/templates/learn/article.html
index 70bfc44..6d7d3d5 100644
--- a/web/src/main/resources/templates/learn/article.html
+++ b/web/src/main/resources/templates/learn/article.html
@@ -138,7 +138,7 @@
         </div>
 
 
-    <script th:src="@{/js/mdeditor.js(v='33')}" defer></script>
+    <script th:src="@{/js/mdeditor.js(v='34')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/chapter.html b/web/src/main/resources/templates/learn/chapter.html
index 903dbf3..8c5875f 100644
--- a/web/src/main/resources/templates/learn/chapter.html
+++ b/web/src/main/resources/templates/learn/chapter.html
@@ -183,7 +183,7 @@
         </div>
     </dialog>
 
-    <script th:src="@{/js/content-sort.js(v='33')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='34')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/index.html b/web/src/main/resources/templates/learn/index.html
index d2776a3..173d1db 100644
--- a/web/src/main/resources/templates/learn/index.html
+++ b/web/src/main/resources/templates/learn/index.html
@@ -236,8 +236,8 @@
         </div>
     </dialog>
 
-<script th:src="@{/js/mdeditor.js(v='33')}" defer></script>
-<script th:src="@{/js/content-sort.js(v='33')}" defer></script>
+<script th:src="@{/js/mdeditor.js(v='34')}" defer></script>
+<script th:src="@{/js/content-sort.js(v='34')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/learn/section.html b/web/src/main/resources/templates/learn/section.html
index 8beae88..132a6c1 100644
--- a/web/src/main/resources/templates/learn/section.html
+++ b/web/src/main/resources/templates/learn/section.html
@@ -143,7 +143,7 @@
         </div>
     </dialog>
 
-    <script th:src="@{/js/content-sort.js(v='33')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='34')}" defer></script>
 </div>
 </body>
 </html>
diff --git a/web/src/main/resources/templates/student/lab.html b/web/src/main/resources/templates/student/lab.html
index d29375d..096e021 100644
--- a/web/src/main/resources/templates/student/lab.html
+++ b/web/src/main/resources/templates/student/lab.html
@@ -107,7 +107,7 @@
             <p class="text-sm text-muted">Ожидайте преподавателя с проверкой.</p>
         </div>
     </div>
-<script th:src="@{/js/defense-timer.js(v='33')}" defer></script>
+<script th:src="@{/js/defense-timer.js(v='34')}" defer></script>
 </div>
 </body>
 </html>