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

fix: refine attestation column borders and labels

Browse Source 
- remove doubled left borders and add a single border before password/actions
- narrow attestation columns and fit full grade labels
- use full intermediate attestation labels: отлично, аттестован, неудовлетворительно, не аттестован
- keep the average header left-aligned
This commit is contained in:
Vladislav Kopnin
2026-10-26 19:38:13 +03:00
parent 9ddf2c6ce9
commit 7fb3e13548
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/main/kotlin/ru/ysu/lms/web/AttestationPresentation.kt
View File

@@ -13,10 +13,10 @@ object AttestationPresentation {
mapOf( mapOf(
"intermediate" to "intermediate" to
mapOf( mapOf(
"excellent" to "отл", "excellent" to "отлично",
"satisfactory" to "атт", "satisfactory" to "аттестован",
"unsatisfactory" to "неуд", "unsatisfactory" to "неудовлетворительно",
"not_attested" to "не атт", "not_attested" to "не аттестован",
), ),
"pass" to "pass" to
mapOf( mapOf(

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

@@ -567,20 +567,29 @@ dialog.dlg.dlg-lg .dlg-body { max-height: 88vh; min-height: 62vh; }
#group-table th.actions-head { color: var(--c-text); font-weight: 400; } #group-table th.actions-head { color: var(--c-text); font-weight: 400; }
#group-table th.actions-head, #group-table th.actions-head,
#group-table td.actions-cell { border-left: 1px solid var(--c-border); } #group-table td.actions-cell { border-left: 1px solid var(--c-border); }
.matrix th.attestation-col { width: 11rem; min-width: 10rem; max-width: 11rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); } .matrix th.attestation-col,
.matrix td.attestation-cell { width: 11rem; min-width: 10rem; max-width: 11rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); } .matrix td.attestation-cell {
.matrix th.average-col { min-width: 7rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); } width: 10rem; min-width: 9.5rem; max-width: 10rem;
.matrix td.average-cell { min-width: 7rem; border-left: 1px solid var(--c-border); border-right: 1px solid var(--c-border); font-weight: 600; } padding-left: 0.35rem; padding-right: 0.35rem;
border-left: 1px solid var(--c-border);
}
.matrix th.average-col,
.matrix td.average-cell {
min-width: 7rem; border-left: 1px solid var(--c-border); text-align: left;
}
.matrix td.average-cell { font-weight: 600; }
.matrix th.password-col,
.matrix td.password-cell { border-left: 1px solid var(--c-border); }
.attestation-title { display: flex; flex-wrap: wrap; align-items: center; gap: 0.35rem; width: 100%; max-width: 9rem; text-align: left; } .attestation-title { display: flex; flex-wrap: wrap; align-items: center; gap: 0.35rem; width: 100%; max-width: 9rem; text-align: left; }
.attestation-kind { font-weight: 400; color: var(--c-text); white-space: normal; text-align: left; } .attestation-kind { font-weight: 400; color: var(--c-text); white-space: normal; text-align: left; }
.attestation-col .lab-col-head, .attestation-col .lab-col-title { text-align: left; } .attestation-col .lab-col-head, .attestation-col .lab-col-title { text-align: left; }
.js-attestation-form { display: flex; justify-content: flex-start; width: 100%; } .js-attestation-form { display: flex; justify-content: flex-start; width: 100%; }
.attestation-select { .attestation-select {
appearance: none; -webkit-appearance: none; appearance: none; -webkit-appearance: none;
width: 9rem; max-width: 100%; min-width: 0; padding: 0.15rem 1.15rem 0.15rem 0.35rem; width: 100%; max-width: 100%; min-width: 0; padding: 0.15rem 0.95rem 0.15rem 0.15rem;
border: 1px solid transparent; border-radius: var(--radius-sm); border: 1px solid transparent; border-radius: var(--radius-sm);
background-color: transparent; color: var(--c-text); background-color: transparent; color: var(--c-text);
font-size: 0.8125rem; font-weight: 600; font-variant-numeric: tabular-nums; font-size: 0.7rem; font-weight: 600; font-variant-numeric: tabular-nums;
text-align: left; text-align-last: left; cursor: pointer; text-align: left; text-align-last: left; cursor: pointer;
background-image: background-image:
linear-gradient(45deg, transparent 50%, currentColor 50%), linear-gradient(45deg, transparent 50%, currentColor 50%),

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

@@ -17,7 +17,7 @@
<!-- v=37: сброс кэша стилей после изменения геометрии; при изменении css поднимать версию --> <!-- v=37: сброс кэша стилей после изменения геометрии; при изменении css поднимать версию -->
<link rel="stylesheet" th:href="@{/css/bootstrap.min.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/bootstrap-icons.min.css}">
<link rel="stylesheet" th:href="@{/css/app.css(v='45')}"> <link rel="stylesheet" th:href="@{/css/app.css(v='47')}">
<link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='36')}"> <link id="hljs-light" rel="stylesheet" th:href="@{/css/hljs-github.css(v='36')}">
<link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='36')}" disabled> <link id="hljs-dark" rel="stylesheet" th:href="@{/css/hljs-github-dark.css(v='36')}" disabled>
<script th:src="@{/js/highlight.min.js(v='36')}" defer></script> <script th:src="@{/js/highlight.min.js(v='36')}" defer></script>