diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index ccef8e4b38..4ad3ed85c9 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -28,7 +28,7 @@ -
+
{{if .IsFileTooLarge}} {{template "shared/filetoolarge" dict "RawFileLink" .RawFileLink}} diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs_file.tmpl index cb65236f23..a015cc8bd1 100644 --- a/templates/repo/settings/lfs_file.tmpl +++ b/templates/repo/settings/lfs_file.tmpl @@ -11,7 +11,7 @@ {{ctx.Locale.Tr "repo.settings.lfs_findcommits"}}
-
+
{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
{{if .IsFileTooLarge}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index c0411cfc56..0cd2201c4b 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -9,8 +9,8 @@ {{.CsrfTokenHtml}}
- - + +
@@ -898,8 +898,8 @@
- - + +
@@ -929,8 +929,8 @@
- - + +
@@ -961,8 +961,8 @@
- - + +
@@ -1031,8 +1031,8 @@
- - + +
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index da82332066..0a34b6c325 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -11,7 +11,7 @@ {{end}} {{if not .ReadmeInList}} -
+
{{template "repo/latest_commit" .}}
@@ -84,7 +84,7 @@ {{end}}
-
+
{{if not (or .IsMarkup .IsRenderedHTML)}} {{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}} {{end}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 882d86c4f6..b7da9ce6e0 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -430,7 +430,6 @@ td .commit-summary { padding: 0 !important; } -.non-diff-file-content .attached.segment, .non-diff-file-content .pdfobject { border-radius: 0 0 var(--border-radius) var(--border-radius); } @@ -2282,6 +2281,7 @@ tbody.commit-list { .author-wrapper { max-width: 180px; align-self: center; + white-space: nowrap; } /* in the commit list, messages can wrap so we can use inline */ diff --git a/web_src/js/features/codeeditor.js b/web_src/js/features/codeeditor.js index 4fb8bb9e63..f5e4e74dc6 100644 --- a/web_src/js/features/codeeditor.js +++ b/web_src/js/features/codeeditor.js @@ -112,6 +112,10 @@ export async function createMonaco(textarea, filename, editorOpts) { ...other, }); + monaco.editor.addKeybindingRules([ + {keybinding: monaco.KeyCode.Enter, command: null}, // disable enter from accepting code completion + ]); + const model = editor.getModel(); model.onDidChangeContent(() => { textarea.value = editor.getValue({preserveBOM: true}); diff --git a/web_src/js/modules/fomantic.js b/web_src/js/modules/fomantic.js index d205c2b2ee..c04bc6e863 100644 --- a/web_src/js/modules/fomantic.js +++ b/web_src/js/modules/fomantic.js @@ -1,6 +1,7 @@ import $ from 'jquery'; import {initFomanticApiPatch} from './fomantic/api.js'; import {initAriaCheckboxPatch} from './fomantic/checkbox.js'; +import {initAriaFormFieldPatch} from './fomantic/form.js'; import {initAriaDropdownPatch} from './fomantic/dropdown.js'; import {initAriaModalPatch} from './fomantic/modal.js'; import {initFomanticTransition} from './fomantic/transition.js'; @@ -27,6 +28,7 @@ export function initGiteaFomantic() { // Use the patches to improve accessibility, these patches are designed to be as independent as possible, make it easy to modify or remove in the future. initAriaCheckboxPatch(); + initAriaFormFieldPatch(); initAriaDropdownPatch(); initAriaModalPatch(); } diff --git a/web_src/js/modules/fomantic/base.js b/web_src/js/modules/fomantic/base.js index c4a01038ba..7574fdd25c 100644 --- a/web_src/js/modules/fomantic/base.js +++ b/web_src/js/modules/fomantic/base.js @@ -3,3 +3,16 @@ let ariaIdCounter = 0; export function generateAriaId() { return `_aria_auto_id_${ariaIdCounter++}`; } + +export function linkLabelAndInput(label, input) { + const labelFor = label.getAttribute('for'); + const inputId = input.getAttribute('id'); + + if (inputId && !labelFor) { // missing "for" + label.setAttribute('for', inputId); + } else if (!inputId && !labelFor) { // missing both "id" and "for" + const id = generateAriaId(); + input.setAttribute('id', id); + label.setAttribute('for', id); + } +} diff --git a/web_src/js/modules/fomantic/checkbox.js b/web_src/js/modules/fomantic/checkbox.js index 7f2b340296..ed77406cc3 100644 --- a/web_src/js/modules/fomantic/checkbox.js +++ b/web_src/js/modules/fomantic/checkbox.js @@ -1,4 +1,4 @@ -import {generateAriaId} from './base.js'; +import {linkLabelAndInput} from './base.js'; export function initAriaCheckboxPatch() { // link the label and the input element so it's clickable and accessible @@ -7,18 +7,7 @@ export function initAriaCheckboxPatch() { const label = el.querySelector('label'); const input = el.querySelector('input'); if (!label || !input) continue; - const inputId = input.getAttribute('id'); - const labelFor = label.getAttribute('for'); - - if (inputId && !labelFor) { // missing "for" - label.setAttribute('for', inputId); - } else if (!inputId && !labelFor) { // missing both "id" and "for" - const id = generateAriaId(); - input.setAttribute('id', id); - label.setAttribute('for', id); - } else { - continue; - } + linkLabelAndInput(label, input); el.setAttribute('data-checkbox-patched', 'true'); } } diff --git a/web_src/js/modules/fomantic/form.js b/web_src/js/modules/fomantic/form.js new file mode 100644 index 0000000000..3bb0058902 --- /dev/null +++ b/web_src/js/modules/fomantic/form.js @@ -0,0 +1,13 @@ +import {linkLabelAndInput} from './base.js'; + +export function initAriaFormFieldPatch() { + // link the label and the input element so it's clickable and accessible + for (const el of document.querySelectorAll('.ui.form .field')) { + if (el.hasAttribute('data-field-patched')) continue; + const label = el.querySelector(':scope > label'); + const input = el.querySelector(':scope > input'); + if (!label || !input) continue; + linkLabelAndInput(label, input); + el.setAttribute('data-field-patched', 'true'); + } +}