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

Compare commits

base: Mermutef:51a7d56e541392cd67a8afe0b4fea526eb5fb610
Branches Tags
Mermutef:master Mermutef:feature/groups-courses Mermutef:old-lms
...
compare: Mermutef:5b35a3c49dd6ba111cf7a70e25ad06d3da011db1
Branches Tags
Mermutef:feature/groups-courses Mermutef:master Mermutef:old-lms

2 Commits
51a7d56e54 ... 5b35a3c49d

Author SHA1 Message Date
Vladislav Kopnin
5b35a3c49d Article sidebar: sticky works (no align-items-start, stronger selector, top under navbar); asset v28 2026-10-08 01:48:37 +03:00
Vladislav Kopnin
7ff97984c0 Article sidebar: add base offcanvas class (fix dismiss error), header close aligned right; asset v26 2026-10-08 01:41:46 +03:00
9 changed files with 24 additions and 23 deletions
Expand all files Collapse all files

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

@@ -601,6 +601,7 @@ dialog.dlg.dlg-lg .dlg-body { max-height: 88vh; min-height: 62vh; }
/* Строки с кнопками-иконками: формы не растягиваются на всю ширину (иначе столбик на мобиле) */
.action-row .inline-form { display: inline-flex; width: auto; flex-wrap: nowrap; }
#articleSide { --bs-offcanvas-width: 17rem; --bs-offcanvas-bg: var(--c-surface); --bs-offcanvas-color: var(--c-text); --bs-offcanvas-border-color: var(--c-border); }
#articleSide .offcanvas-header { justify-content: space-between; align-items: center; border-bottom: 1px solid var(--c-border); }
.actions-col .btn { display: block; width: 100%; text-align: center; }
/* Иконки — SVG-файлы из /icons через CSS-маски: цвет наследуется от текста */
.cell-ico { font-size: 0.95rem; line-height: 1; }
@@ -647,7 +648,7 @@ th.th-filterable { padding-bottom: 0.35rem; }
/* Чтение материалов: контент + боковое содержание */
@media (min-width: 992px) {
.learn-side { position: sticky; top: 4.5rem; max-height: calc(100vh - 5.5rem); overflow: auto; }
.learn-side.offcanvas { position: sticky; top: 4.5rem; max-height: calc(100vh - 5.5rem); overflow: auto; }
}
.learn-side { font-size: 0.875rem; }
.side-chapter { font-weight: 600; margin: 0.6rem 0 0.2rem; }

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='25')}" defer></script>
<script th:src="@{/js/admin-group.js(v='28')}" 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='25')}" defer></script>
<script th:src="@{/js/admin-lab.js(v='28')}" 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='25')}">
<link rel="icon" type="image/svg+xml" th:href="@{/favicon.svg(v='28')}">
<!-- 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='25')}">
<link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='25')}">
<link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='25')}" disabled>
<script th:src="@{/js/highlight.min.js(v='25')}" defer></script>
<script th:src="@{/js/table-scroll.js(v='25')}" defer></script>
<script th:src="@{/js/tablekit.js(v='25')}" defer></script>
<link rel="stylesheet" th:href="@{/css/app.css(v='28')}">
<link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='28')}">
<link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='28')}" disabled>
<script th:src="@{/js/highlight.min.js(v='28')}" defer></script>
<script th:src="@{/js/table-scroll.js(v='28')}" defer></script>
<script th:src="@{/js/tablekit.js(v='28')}" defer></script>
<script th:src="@{/js/bootstrap.bundle.min.js}" defer></script>
<script th:src="@{/js/theme-init.js(v='25')}"></script>
<script th:src="@{/js/app.js(v='25')}" defer></script>
<script th:src="@{/js/ui-state.js(v='25')}" defer></script>
<script th:src="@{/js/md-content.js(v='25')}" defer></script>
<script th:src="@{/js/submit-guard.js(v='25')}" defer></script>
<script th:src="@{/js/theme-init.js(v='28')}"></script>
<script th:src="@{/js/app.js(v='28')}" defer></script>
<script th:src="@{/js/ui-state.js(v='28')}" defer></script>
<script th:src="@{/js/md-content.js(v='28')}" defer></script>
<script th:src="@{/js/submit-guard.js(v='28')}" defer></script>
</head>
<body>
<div class="page d-flex flex-column min-vh-100">

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

@@ -3,9 +3,9 @@
<head><title th:text="${article.title} + ' — LMS'">Статья</title></head>
<body>
<div id="content">
<div class="row g-4 align-items-start">
<div class="row g-4">
<div class="col-12 col-lg-3 order-lg-1 order-2">
<aside class="learn-side offcanvas-lg offcanvas-end" tabindex="-1" id="articleSide" aria-label="Содержание">
<aside class="learn-side offcanvas offcanvas-lg offcanvas-end" tabindex="-1" id="articleSide" aria-label="Содержание">
<div class="offcanvas-header d-lg-none">
<span class="offcanvas-title">Содержание</span>
<button type="button" class="navbar-close" data-bs-dismiss="offcanvas" aria-label="Закрыть">✕</button>
@@ -138,7 +138,7 @@
</div>
<script th:src="@{/js/mdeditor.js(v='25')}" defer></script>
<script th:src="@{/js/mdeditor.js(v='28')}" 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='25')}" defer></script>
<script th:src="@{/js/content-sort.js(v='28')}" 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='25')}" defer></script>
<script th:src="@{/js/content-sort.js(v='25')}" defer></script>
<script th:src="@{/js/mdeditor.js(v='28')}" defer></script>
<script th:src="@{/js/content-sort.js(v='28')}" 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='25')}" defer></script>
<script th:src="@{/js/content-sort.js(v='28')}" 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='25')}" defer></script>
<script th:src="@{/js/defense-timer.js(v='28')}" defer></script>
</div>
</body>
</html>