From c41acb32b6c3931e96c0a5c89ac32539c056d5d9 Mon Sep 17 00:00:00 2001
From: Vladislav Kopnin <vlad.kopnen@mail.ru>
Date: Sun, 4 Oct 2026 13:50:01 +0300
Subject: [PATCH] Uniform button size (nowrap), md-body h1-h6 sizes (fix h3 as
 h1), themed scrollbars

---
 web/src/main/resources/static/css/app.css     | 16 +++++++++++++-
 .../main/resources/templates/admin/group.html |  2 +-
 .../main/resources/templates/admin/lab.html   |  2 +-
 .../resources/templates/fragments/base.html   | 22 +++++++++----------
 .../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, 34 insertions(+), 20 deletions(-)

diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css
index 0bb338f..6d33ed5 100644
--- a/web/src/main/resources/static/css/app.css
+++ b/web/src/main/resources/static/css/app.css
@@ -101,6 +101,7 @@ p { margin-top: 0; }
    вторичная и опасная — контурные. Компактный кегль 13px. */
 .btn {
     display: inline-flex; align-items: center; justify-content: center; gap: 0.5rem;
+    white-space: nowrap;
     border: 1px solid var(--c-accent); border-radius: var(--radius);
     background: var(--c-accent); color: #ffffff;
     padding: 0.5rem 1rem; font-size: 0.8125rem; font-weight: 500;
@@ -176,6 +177,15 @@ code { --bs-code-color: var(--c-text); color: var(--c-text); }
 .btn-sm { --bs-btn-padding-y: 0.25rem; --bs-btn-padding-x: 0.6rem; --bs-btn-font-size: 0.75rem; }
 a { --bs-link-color: var(--c-accent); --bs-link-hover-color: var(--c-accent-hover); text-decoration: none; }
 
+
+/* ---- Полосы прокрутки в стиле приложения ---- */
+html { scrollbar-width: thin; scrollbar-color: var(--c-border-strong) var(--c-bg); }
+::-webkit-scrollbar { width: 10px; height: 10px; }
+::-webkit-scrollbar-track { background: var(--c-bg); }
+::-webkit-scrollbar-thumb { background: var(--c-border-strong); border: 2px solid var(--c-bg); border-radius: 8px; }
+::-webkit-scrollbar-thumb:hover { background: var(--c-accent); }
+::-webkit-scrollbar-corner { background: var(--c-bg); }
+
 /* Cards */
 .card { border-radius: var(--radius-lg); background: var(--c-surface); border: 1px solid var(--c-border); }
 .card-flush { border-radius: var(--radius-lg); background: var(--c-surface); border: 1px solid var(--c-border); padding: 0; overflow: hidden; }
@@ -325,9 +335,13 @@ html.modal-open body {
 
 /* Markdown body */
 .md-body { font-size: 0.9375rem; }
-.md-body h1, .md-body h2, .md-body h3 { margin: 1rem 0 0.5rem; line-height: 1.3; }
+.md-body h1, .md-body h2, .md-body h3, .md-body h4, .md-body h5, .md-body h6 { margin: 1rem 0 0.5rem; line-height: 1.3; }
 .md-body h1 { font-size: 1.25rem; }
 .md-body h2 { font-size: 1.125rem; }
+.md-body h3 { font-size: 1rem; }
+.md-body h4 { font-size: 0.9375rem; }
+.md-body h5 { font-size: 0.875rem; }
+.md-body h6 { font-size: 0.8125rem; }
 .md-body p, .md-body ul, .md-body ol { margin: 0.5rem 0; }
 .md-body ul, .md-body ol { padding-left: 1.5rem; }
 .md-body pre { background: var(--c-bg); border: 1px solid var(--c-border); border-radius: var(--radius); padding: 0.75rem 1rem; overflow-x: auto; font-size: 0.8125rem; }
diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html
index 1b32688..5474cb7 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='19')}" defer></script>
+<script th:src="@{/js/admin-group.js(v='20')}" 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 dad9a3b..f40c813 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='19')}" defer></script>
+    <script th:src="@{/js/admin-lab.js(v='20')}" 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 e93d7ce..ac92de5 100644
--- a/web/src/main/resources/templates/fragments/base.html
+++ b/web/src/main/resources/templates/fragments/base.html
@@ -17,18 +17,18 @@
     <!-- 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='19')}">
-    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='19')}">
-    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='19')}" disabled>
-    <script th:src="@{/js/highlight.min.js(v='19')}" defer></script>
-    <script th:src="@{/js/table-scroll.js(v='19')}" defer></script>
-    <script th:src="@{/js/tablekit.js(v='19')}" defer></script>
+        <link rel="stylesheet" th:href="@{/css/app.css(v='20')}">
+    <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='20')}">
+    <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='20')}" disabled>
+    <script th:src="@{/js/highlight.min.js(v='20')}" defer></script>
+    <script th:src="@{/js/table-scroll.js(v='20')}" defer></script>
+    <script th:src="@{/js/tablekit.js(v='20')}" defer></script>
     <script th:src="@{/js/bootstrap.bundle.min.js}" defer></script>
-    <script th:src="@{/js/theme-init.js(v='19')}"></script>
-    <script th:src="@{/js/app.js(v='19')}" defer></script>
-    <script th:src="@{/js/ui-state.js(v='19')}" defer></script>
-    <script th:src="@{/js/md-content.js(v='19')}" defer></script>
-    <script th:src="@{/js/submit-guard.js(v='19')}" defer></script>
+    <script th:src="@{/js/theme-init.js(v='20')}"></script>
+    <script th:src="@{/js/app.js(v='20')}" defer></script>
+    <script th:src="@{/js/ui-state.js(v='20')}" defer></script>
+    <script th:src="@{/js/md-content.js(v='20')}" defer></script>
+    <script th:src="@{/js/submit-guard.js(v='20')}" 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 137a8f2..b06427a 100644
--- a/web/src/main/resources/templates/learn/article.html
+++ b/web/src/main/resources/templates/learn/article.html
@@ -124,7 +124,7 @@
         </div>
 
 
-    <script th:src="@{/js/mdeditor.js(v='19')}" defer></script>
+    <script th:src="@{/js/mdeditor.js(v='20')}" 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 2256174..f2a9113 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='19')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='20')}" 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 7fd9092..2cb9a9f 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='19')}" defer></script>
-<script th:src="@{/js/content-sort.js(v='19')}" defer></script>
+<script th:src="@{/js/mdeditor.js(v='20')}" defer></script>
+<script th:src="@{/js/content-sort.js(v='20')}" 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 cf47c83..d8e0633 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='19')}" defer></script>
+    <script th:src="@{/js/content-sort.js(v='20')}" 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 0abe95e..6baff56 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='19')}" defer></script>
+<script th:src="@{/js/defense-timer.js(v='20')}" defer></script>
 </div>
 </body>
 </html>