Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(admin): complete the dark palette for badge colours (#3706)

Hampusb150cc85cfa1
diff --git a/fluxer_admin/src/styles/app.css b/fluxer_admin/src/styles/app.css
index 6e51bd2ed..4b35f3867 100644
--- a/fluxer_admin/src/styles/app.css
+++ b/fluxer_admin/src/styles/app.css
@@ -258,30 +258,44 @@ input:disabled + .checkbox-custom {
--color-red-50: oklch(0.258 0.092 26.042);
--color-red-100: oklch(0.396 0.141 25.723);
--color-red-200: oklch(0.444 0.177 26.899);
+ --color-red-300: oklch(0.505 0.213 27.518);
--color-red-700: oklch(0.808 0.114 19.571);
--color-red-800: oklch(0.885 0.062 18.334);
--color-red-900: oklch(0.936 0.032 17.717);
--color-green-50: oklch(0.266 0.065 152.934);
--color-green-100: oklch(0.393 0.095 152.535);
--color-green-200: oklch(0.448 0.119 151.328);
+ --color-green-300: oklch(0.527 0.154 150.069);
--color-green-700: oklch(0.871 0.15 154.449);
--color-green-800: oklch(0.925 0.084 155.995);
--color-green-900: oklch(0.962 0.044 156.743);
--color-blue-50: oklch(0.282 0.091 267.935);
--color-blue-100: oklch(0.379 0.146 265.522);
--color-blue-200: oklch(0.424 0.199 265.638);
+ --color-blue-300: oklch(0.488 0.243 264.376);
+ --color-blue-400: oklch(0.546 0.245 262.881);
--color-blue-600: oklch(0.707 0.165 254.624);
--color-blue-700: oklch(0.809 0.105 251.813);
--color-blue-800: oklch(0.882 0.059 254.128);
--color-amber-50: oklch(0.279 0.077 45.635);
--color-amber-100: oklch(0.414 0.112 45.904);
--color-amber-200: oklch(0.473 0.137 46.201);
+ --color-amber-300: oklch(0.555 0.163 48.998);
--color-amber-700: oklch(0.879 0.169 91.605);
--color-amber-800: oklch(0.924 0.12 95.746);
+ --color-yellow-50: oklch(0.286 0.066 53.813);
--color-yellow-100: oklch(0.421 0.095 57.708);
+ --color-yellow-200: oklch(0.476 0.114 61.907);
--color-yellow-700: oklch(0.905 0.182 98.111);
--color-orange-50: oklch(0.266 0.079 36.259);
+ --color-orange-200: oklch(0.47 0.157 37.304);
+ --color-orange-600: oklch(0.75 0.183 55.934);
+ --color-orange-700: oklch(0.837 0.128 66.29);
+ --color-orange-900: oklch(0.954 0.038 75.164);
+ --color-indigo-600: oklch(0.673 0.182 276.935);
+ --color-purple-50: oklch(0.291 0.149 302.717);
--color-purple-100: oklch(0.381 0.176 304.987);
+ --color-purple-700: oklch(0.827 0.119 306.383);
}
:root[data-theme="dark"] #admin-sidebar {
diff --git a/fluxer_admin/tests/dark_palette.rs b/fluxer_admin/tests/dark_palette.rs
new file mode 100644
index 000000000..94245914f
--- /dev/null
+++ b/fluxer_admin/tests/dark_palette.rs
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::collections::BTreeSet;
+use std::fs;
+use std::path::{Path, PathBuf};
+
+const HUES: &[&str] = &[
+ "red", "green", "blue", "amber", "yellow", "orange", "purple", "indigo",
+];
+
+const UTILITIES: &[&str] = &[
+ "bg", "text", "border", "ring", "divide", "outline", "from", "via", "to", "fill", "stroke",
+];
+
+const KEPT_LIGHT_VALUES: &[&str] = &["red-600", "green-600"];
+
+fn manifest_dir() -> PathBuf {
+ PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+}
+
+fn rust_sources(dir: &Path, out: &mut Vec<PathBuf>) {
+ for entry in fs::read_dir(dir).expect("read source dir") {
+ let path = entry.expect("dir entry").path();
+ if path.is_dir() {
+ rust_sources(&path, out);
+ } else if path.extension().is_some_and(|ext| ext == "rs") {
+ out.push(path);
+ }
+ }
+}
+
+fn is_class_char(c: char) -> bool {
+ c.is_ascii_alphanumeric() || c == '-'
+}
+
+fn used_shades() -> BTreeSet<String> {
+ let mut files = Vec::new();
+ rust_sources(&manifest_dir().join("src"), &mut files);
+ let mut shades = BTreeSet::new();
+ for file in files {
+ let source = fs::read_to_string(&file).expect("read source");
+ for token in source.split(|c: char| !is_class_char(c)) {
+ let Some((utility, rest)) = token.split_once('-') else {
+ continue;
+ };
+ if !UTILITIES.contains(&utility) {
+ continue;
+ }
+ let Some((hue, step)) = rest.split_once('-') else {
+ continue;
+ };
+ if HUES.contains(&hue) && !step.is_empty() && step.chars().all(|c| c.is_ascii_digit()) {
+ shades.insert(format!("{hue}-{step}"));
+ }
+ }
+ }
+ shades
+}
+
+fn dark_block() -> String {
+ let css = fs::read_to_string(manifest_dir().join("src/styles/app.css")).expect("read app.css");
+ let start = css
+ .find(":root[data-theme=\"dark\"] {")
+ .expect("dark theme block");
+ let body = &css[start..];
+ let end = body.find('}').expect("dark theme block end");
+ body[..end].to_string()
+}
+
+fn dark_value(block: &str, shade: &str) -> Option<(f64, f64, f64)> {
+ let key = format!("--color-{shade}:");
+ let after = &block[block.find(&key)? + key.len()..];
+ let inner = after.split_once("oklch(")?.1.split_once(')')?.0;
+ let parts: Vec<f64> = inner
+ .split_whitespace()
+ .map(|p| p.parse().expect("oklch component"))
+ .collect();
+ Some((parts[0], parts[1], parts[2]))
+}
+
+fn relative_luminance((l, c, h): (f64, f64, f64)) -> f64 {
+ let a = c * h.to_radians().cos();
+ let b = c * h.to_radians().sin();
+ let l_ = (l + 0.396_337_777_4 * a + 0.215_803_757_3 * b).powi(3);
+ let m_ = (l - 0.105_561_345_8 * a - 0.063_854_172_8 * b).powi(3);
+ let s_ = (l - 0.089_484_177_5 * a - 1.291_485_548 * b).powi(3);
+ let r = 4.076_741_662_1 * l_ - 3.307_711_591_3 * m_ + 0.230_969_929_2 * s_;
+ let g = -1.268_438_004_6 * l_ + 2.609_757_401_1 * m_ - 0.341_319_396_5 * s_;
+ let bl = -0.004_196_086_3 * l_ - 0.703_418_614_7 * m_ + 1.707_614_701 * s_;
+ 0.2126 * r.clamp(0.0, 1.0) + 0.7152 * g.clamp(0.0, 1.0) + 0.0722 * bl.clamp(0.0, 1.0)
+}
+
+fn contrast(fg: (f64, f64, f64), bg: (f64, f64, f64)) -> f64 {
+ let (x, y) = (relative_luminance(fg), relative_luminance(bg));
+ (x.max(y) + 0.05) / (x.min(y) + 0.05)
+}
+
+#[test]
+fn every_used_chromatic_shade_has_a_dark_value() {
+ let block = dark_block();
+ let missing: Vec<String> = used_shades()
+ .into_iter()
+ .filter(|shade| !shade.ends_with("-500") && !KEPT_LIGHT_VALUES.contains(&shade.as_str()))
+ .filter(|shade| dark_value(&block, shade).is_none())
+ .collect();
+ assert!(
+ missing.is_empty(),
+ "dark theme has no value for {missing:?}"
+ );
+}
+
+#[test]
+fn purple_badge_text_is_readable_in_dark_theme() {
+ let block = dark_block();
+ let text = dark_value(&block, "purple-700").expect("dark purple-700");
+ let background = dark_value(&block, "purple-100").expect("dark purple-100");
+ let ratio = contrast(text, background);
+ assert!(ratio >= 4.5, "purple badge contrast is {ratio:.2}");
+}