Skip to content

Commit b4d420d

Browse files
silverwindlunny
andauthored
Replace unstyled meter with progress (#19968)
Replace the only `<meter>` element in use with a `<progress>` which is styled properly. Also slightly adjust colors on it for better contrast. Co-authored-by: Lunny Xiao <[email protected]>
1 parent f6e2dba commit b4d420d

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

templates/repo/diff/box.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</div>
2020
<div class="diff-detail-actions df ac">
2121
{{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}}
22-
<meter id="viewed-files-summary" value="{{.Diff.NumViewedFiles}}" max="{{.Diff.NumFiles}}"></meter>
23-
<label for="viewed-files-summary" id="viewed-files-summary-label" data-text-changed-template="{{.i18n.Tr "repo.pulls.viewed_files_label"}}">
22+
<progress id="viewed-files-summary" class="mr-2" value="{{.Diff.NumViewedFiles}}" max="{{.Diff.NumFiles}}"></progress>
23+
<label for="viewed-files-summary" id="viewed-files-summary-label" class="mr-2" data-text-changed-template="{{.i18n.Tr "repo.pulls.viewed_files_label"}}">
2424
{{.i18n.Tr "repo.pulls.viewed_files_label" .Diff.NumViewedFiles .Diff.NumFiles}}
2525
</label>
2626
{{end}}

web_src/js/features/pull-view-file.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const viewedCheckboxSelector = '.viewed-file-form'; // Selector under which all
99
// Refreshes the summary of viewed files if present
1010
// The data used will be window.config.pageData.prReview.numberOf{Viewed}Files
1111
function refreshViewedFilesSummary() {
12-
const viewedFilesMeter = document.getElementById('viewed-files-summary');
13-
viewedFilesMeter?.setAttribute('value', prReview.numberOfViewedFiles);
12+
const viewedFilesProgress = document.getElementById('viewed-files-summary');
13+
viewedFilesProgress?.setAttribute('value', prReview.numberOfViewedFiles);
1414
const summaryLabel = document.getElementById('viewed-files-summary-label');
1515
if (summaryLabel) summaryLabel.innerHTML = summaryLabel.getAttribute('data-text-changed-template')
1616
.replace('%[1]d', prReview.numberOfViewedFiles)

web_src/less/_base.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,19 +211,19 @@ details summary > * {
211211
}
212212

213213
progress {
214-
background: var(--color-secondary);
214+
background: var(--color-secondary-dark-1);
215215
border-radius: 6px;
216216
border: none;
217217
overflow: hidden;
218218
}
219219
progress::-webkit-progress-bar {
220-
background: var(--color-secondary);
220+
background: var(--color-secondary-dark-1);
221221
}
222222
progress::-webkit-progress-value {
223-
background-color: var(--color-secondary-dark-3);
223+
background-color: var(--color-secondary-dark-4);
224224
}
225225
progress::-moz-progress-bar {
226-
background: var(--color-secondary-dark-3);
226+
background: var(--color-secondary-dark-4);
227227
}
228228

229229
* {

web_src/less/_review.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,3 +280,8 @@ a.blob-excerpt:hover {
280280
.viewed-file-checked-form {
281281
background-color: var(--color-primary-light-4);
282282
}
283+
284+
#viewed-files-summary {
285+
width: 72px;
286+
height: 10px;
287+
}

0 commit comments

Comments
 (0)