From 2ba7ded391c9d0dff88e6619d6f3f032c7301fe0 Mon Sep 17 00:00:00 2001
From: Thaddee Tyl <thaddee.tyl@gmail.com>
Date: Sun, 8 Jan 2017 17:21:35 +0100
Subject: [PATCH] Prioritize colorA/B over colorscheme colors

The wrong priority order was made in 29a4803e4b3d5fe4ecd7af947843a0444c198639.
When a user enters ?colorB=007ec6, they want that color to override the default.
---
 badge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/badge.js b/badge.js
index fbf039c2f3..e47fadc0c9 100644
--- a/badge.js
+++ b/badge.js
@@ -53,8 +53,8 @@ function makeImage(data, cb) {
     if (!pickedColorscheme) {
       pickedColorscheme = colorscheme.red;
     }
-    data.colorA = pickedColorscheme.colorA || data.colorA;
-    data.colorB = pickedColorscheme.colorB || data.colorB;
+    data.colorA = data.colorA || pickedColorscheme.colorA;
+    data.colorB = data.colorB || pickedColorscheme.colorB;
   }
   // Colors.
   if (!cssColor.test(data.colorA)) { data.colorA = undefined; }