mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-05 19:34:59 +02:00
9934931f1f
1. The previous color contrast calculation function was incorrect at
least for the `#84b6eb` where it output low-contrast white instead of
black. I've rewritten these functions now to accept hex colors and to
match GitHub's calculation and to output pure white/black for maximum
contrast. Before and after:
<img width="94" alt="Screenshot 2024-04-02 at 01 53 46"
src="https://github.com/go-gitea/gitea/assets/115237/00b39e15-a377-4458-95cf-ceec74b78228"><img
width="90" alt="Screenshot 2024-04-02 at 01 51 30"
src="https://github.com/go-gitea/gitea/assets/115237/1677067a-8d8f-47eb-82c0-76330deeb775">
2. Fix project-related issues:
- Expose the new `ContrastColor` function as template helper and use it
for project cards, replacing the previous JS solution which eliminates a
flash of wrong color on page load.
- Fix a bug where if editing a project title, the counter would get
lost.
- Move `rgbToHex` function to color utils.
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Giteabot <teabot@gitea.io>
---
Conflict resolution: Trivial.
(cherry picked from commit 36887ed3921d03f1864360c95bd2ecf853bfbe72)
(cherry picked from commit f6c0c39f1a
)
33 lines
1.3 KiB
JavaScript
33 lines
1.3 KiB
JavaScript
import tinycolor from 'tinycolor2';
|
|
|
|
// Returns relative luminance for a SRGB color - https://en.wikipedia.org/wiki/Relative_luminance
|
|
// Keep this in sync with modules/util/color.go
|
|
function getRelativeLuminance(color) {
|
|
const {r, g, b} = tinycolor(color).toRgb();
|
|
return (0.2126729 * r + 0.7151522 * g + 0.072175 * b) / 255;
|
|
}
|
|
|
|
function useLightText(backgroundColor) {
|
|
return getRelativeLuminance(backgroundColor) < 0.453;
|
|
}
|
|
|
|
// Given a background color, returns a black or white foreground color that the highest
|
|
// contrast ratio. In the future, the APCA contrast function, or CSS `contrast-color` will be better.
|
|
// https://github.com/color-js/color.js/blob/eb7b53f7a13bb716ec8b28c7a56f052cd599acd9/src/contrast/APCA.js#L42
|
|
export function contrastColor(backgroundColor) {
|
|
return useLightText(backgroundColor) ? '#fff' : '#000';
|
|
}
|
|
|
|
function resolveColors(obj) {
|
|
const styles = window.getComputedStyle(document.documentElement);
|
|
const getColor = (name) => styles.getPropertyValue(name).trim();
|
|
return Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, getColor(value)]));
|
|
}
|
|
|
|
export const chartJsColors = resolveColors({
|
|
text: '--color-text',
|
|
border: '--color-secondary-alpha-60',
|
|
commits: '--color-primary-alpha-60',
|
|
additions: '--color-green',
|
|
deletions: '--color-red',
|
|
});
|