Mermutef/LMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dark theme: readable muted text (override Bootstrap --bs-secondary-color vars), lighter muted palette; asset v34

Browse Source
This commit is contained in:
Vladislav Kopnin
2026-10-12 19:47:01 +03:00
parent 67fd8a6900
commit 2ee4e2eb3c
9 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/main/resources/static/css/app.css
View File

@@ -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;

2
web/src/main/resources/templates/admin/group.html
View File

@@ -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>

2
web/src/main/resources/templates/admin/lab.html
View File

@@ -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>

24
web/src/main/resources/templates/fragments/base.html
View File

@@ -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">

2
web/src/main/resources/templates/learn/article.html
View File

@@ -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>

2
web/src/main/resources/templates/learn/chapter.html
View File

@@ -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>

4
web/src/main/resources/templates/learn/index.html
View File

@@ -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>

2
web/src/main/resources/templates/learn/section.html
View File

@@ -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>

2
web/src/main/resources/templates/student/lab.html
View File

@@ -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>