From dd56710a4480ae2154f29edbc822c615c77639ec Mon Sep 17 00:00:00 2001 From: chris48s Date: Sun, 21 Jan 2024 18:12:23 +0000 Subject: [PATCH 1/3] change standard paette colours --- badge-maker/lib/color.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/badge-maker/lib/color.js b/badge-maker/lib/color.js index 391e28e4984a4..a82b17e76ab41 100644 --- a/badge-maker/lib/color.js +++ b/badge-maker/lib/color.js @@ -4,15 +4,15 @@ const { fromString } = require('css-color-converter') // When updating these, be sure also to update the list in `badge-maker/README.md`. const namedColors = { - brightgreen: '#4c1', - green: '#97ca00', - yellow: '#dfb317', - yellowgreen: '#a4a61d', - orange: '#fe7d37', - red: '#e05d44', + brightgreen: '#10b73d', + green: '#67ac09', + yellow: '#c89615', + yellowgreen: '#95991a', + orange: '#ea7233', + red: '#dd4343', blue: '#007ec6', grey: '#555', - lightgrey: '#9f9f9f', + lightgrey: '#939393', } const aliases = { From 4394b2e3e8ea14167aeb2fa046a4972d21d27a3b Mon Sep 17 00:00:00 2001 From: chris48s Date: Sun, 21 Jan 2024 18:13:05 +0000 Subject: [PATCH 2/3] make drop-shadow more pronounced --- badge-maker/lib/badge-renderers.js | 32 ++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/badge-maker/lib/badge-renderers.js b/badge-maker/lib/badge-renderers.js index af726101e0819..c4f526e74cc25 100644 --- a/badge-maker/lib/badge-renderers.js +++ b/badge-maker/lib/badge-renderers.js @@ -224,7 +224,24 @@ class Badge { textLength: FONT_SCALE_UP_FACTOR * textWidth, }, }) - const shadow = this.constructor.shadow ? shadowText : '' + const shadowBlur = new XmlElement({ + name: 'text', + content: [content], + attrs: { + 'aria-hidden': 'true', + x, + y: 150 + this.constructor.verticalMargin, + fill: shadowColor, + 'fill-opacity': '.80', + filter: 'url(#blur)', + transform: FONT_SCALE_DOWN_VALUE, + textLength: FONT_SCALE_UP_FACTOR * textWidth, + }, + }) + + const shadow = this.constructor.shadow + ? new ElementList({ content: [shadowBlur, shadowText] }) + : '' if (!link) { return new ElementList({ content: [shadow, text] }) @@ -416,6 +433,17 @@ class Flat extends Badge { } render() { + const blur = new XmlElement({ + name: 'filter', + content: [ + new XmlElement({ + name: 'feGaussianBlur', + attrs: { in: 'SourceGraphic', stdDeviation: '16' }, + }), + ], + attrs: { id: 'blur' }, + }) + const gradient = new XmlElement({ name: 'linearGradient', content: [ @@ -446,7 +474,7 @@ class Flat extends Badge { accessibleText: this.accessibleText, height: this.constructor.height, }, - [gradient, clipPath, backgroundGroup, this.foregroundGroupElement], + [blur, gradient, clipPath, backgroundGroup, this.foregroundGroupElement], ) } } From e7b26ccce93b1970a0522b6237b5b714b3601818 Mon Sep 17 00:00:00 2001 From: chris48s Date: Sun, 21 Jan 2024 18:14:49 +0000 Subject: [PATCH 3/3] update tests --- __snapshots__/make-badge.spec.js | 390 +++++++++++++++++++++++++++++++ badge-maker/lib/color.spec.js | 4 +- core/server/server.spec.js | 2 +- lib/logos.spec.js | 4 +- 4 files changed, 395 insertions(+), 5 deletions(-) diff --git a/__snapshots__/make-badge.spec.js b/__snapshots__/make-badge.spec.js index df826a8ca14a3..e1fe6ad696888 100644 --- a/__snapshots__/make-badge.spec.js +++ b/__snapshots__/make-badge.spec.js @@ -8,6 +8,9 @@ exports['The badge generator SVG should match snapshot 1'] = ` aria-label="cactus: grown" > cactus: grown + + + @@ -25,6 +28,18 @@ exports['The badge generator SVG should match snapshot 1'] = ` text-rendering="geometricPrecision" font-size="110" > + +