Merge pull request #207 from silverwind/4hex

Support four-value syntax for CSS hex color
microcosm-cc · Jul 4, 2024 · 5703ea6 · 5703ea6
2 parents af654ef + b599aac
commit 5703ea6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/css/handlers.go b/css/handlers.go
@@ -291,7 +291,7 @@ var (
 	Font              = regexp.MustCompile(`^('[a-z \-]+'|[a-z \-]+)$`)
 	Grayscale         = regexp.MustCompile(`^grayscale\(([0-9]{1,2}|100)%\)$`)
 	GridTemplateAreas = regexp.MustCompile(`^['"]?[a-z ]+['"]?$`)
-	HexRGB            = regexp.MustCompile(`^#([0-9a-f]{3}|[0-9a-f]{6}|[0-9a-f]{8})$`)
+	HexRGB            = regexp.MustCompile(`^#([0-9a-f]{3,4}|[0-9a-f]{6}|[0-9a-f]{8})$`)
 	HSL               = regexp.MustCompile(`^hsl\([ ]*([012]?[0-9]{1,2}|3[0-5][0-9]|360),[ ]*([0-9]{0,2}|100)\%,[ ]*([0-9]{0,2}|100)\%\)$`)
 	HSLA              = regexp.MustCompile(`^hsla\(([ ]*[012]?[0-9]{1,2}|3[0-5][0-9]|360),[ ]*([0-9]{0,2}|100)\%,[ ]*([0-9]{0,2}|100)\%,[ ]*(1|1\.0|0|(0\.[0-9]+))\)$`)
 	HueRotate         = regexp.MustCompile(`^hue-rotate\(([12]?[0-9]{1,2}|3[0-5][0-9]|360)?\)$`)

diff --git a/sanitize_test.go b/sanitize_test.go
@@ -2028,6 +2028,10 @@ func TestDefaultStyleHandlers(t *testing.T) {
 			in:       `<div style="column-rule-color: #ff00ff;"></div>`,
 			expected: `<div style="column-rule-color: #ff00ff"></div>`,
 		},
+		{
+			in:       `<div style="column-rule-color: #f0ff;"></div>`,
+			expected: `<div style="column-rule-color: #f0ff"></div>`,
+		},
 		{
 			in:       `<div style="column-rule: red;"></div>`,
 			expected: `<div style="column-rule: red"></div>`,