From 6b7fd4eff3e92add17ff80d400a9ccf591565a9d Mon Sep 17 00:00:00 2001
From: ajuvercr <arthur.vercruysse@ugent.be>
Date: Fri, 10 Apr 2020 13:51:19 +0200
Subject: [PATCH] Colours (#21)

* try 1

* make colours uniform
---
 backend/src/util.rs                 |  4 ++--
 backend/static/style/mapbuilder.css | 36 ++++++++++++++---------------
 frontend/src/utils.rs               | 20 ++++++++--------
 frontend/www/static/res/style.css   |  2 +-
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/backend/src/util.rs b/backend/src/util.rs
index 1b9bb65..52e0dc0 100644
--- a/backend/src/util.rs
+++ b/backend/src/util.rs
@@ -15,8 +15,8 @@ static NAV: [(&'static str, &'static str); 6] = [
     ("/info", "Info"),
 ];
 
-pub static COLOURS: [&'static str; 9] = [
-    "gray", "blue", "cyan", "green", "yellow", "orange", "red", "pink", "purple",
+pub static COLOURS: [&'static str; 10] = [
+    "#808080", "#FF8000", "#0080ff", "#FF6693", "#3fcb55", "#cbc33f", "#cf40e9", "#FF3F0D", "#1beef0", "#0DC5FF"
 ];
 
 /// The state of a player, in a running game.
diff --git a/backend/static/style/mapbuilder.css b/backend/static/style/mapbuilder.css
index 461f0da..7c8cc24 100644
--- a/backend/static/style/mapbuilder.css
+++ b/backend/static/style/mapbuilder.css
@@ -104,75 +104,75 @@
 }
 
 .colourButton_gray {
-    background-color: lightgray;
+    background-color: #808080;
 }
 
 .colourButton_blue {
-    background-color: blue;
+    background-color: #FF8000;
 }
 
 .colourButton_cyan {
-    background-color: cyan;
+    background-color: #0080ff;
 }
 
 .colourButton_green {
-    background-color: green;
+    background-color: #FF6693;
 }
 
 .colourButton_yellow {
-    background-color: yellow;
+    background-color: #3fcb55;
 }
 
 .colourButton_orange {
-    background-color: orange;
+    background-color: #cbc33f;
 }
 
 .colourButton_red {
-    background-color: red;
+    background-color: #cf40e9;
 }
 
 .colourButton_pink {
-    background-color: pink;
+    background-color: #FF3F0D;
 }
 
 .colourButton_purple {
-    background-color: purple;
+    background-color: #1beef0;
 }
 
 .planet_gray {
-    background-color: lightgray;
+    background-color: #808080;
 }
 
 .planet_blue {
-    background-color: blue;
+    background-color: #FF8000;
 }
 
 .planet_cyan {
-    background-color: cyan;
+    background-color: #0080ff;
 }
 
 .planet_green {
-    background-color: green;
+    background-color: #FF6693;
 }
 
 .planet_yellow {
-    background-color: yellow;
+    background-color: #3fcb55;
 }
 
 .planet_orange {
-    background-color: orange;
+    background-color: #cbc33f;
 }
 
 .planet_red {
-    background-color: red;
+    background-color: #cf40e9;
 }
 
 .planet_pink {
-    background-color: pink;
+    background-color: #FF3F0D;
 }
 
 .planet_purple {
-    background-color: purple;
+    background-color: #1beef0;
 }
 
 
diff --git a/frontend/src/utils.rs b/frontend/src/utils.rs
index 571992b..51ecb42 100644
--- a/frontend/src/utils.rs
+++ b/frontend/src/utils.rs
@@ -15,16 +15,16 @@ use octoon_math::{Vec3};
 static VIEWBOX_SCALE: f32 = 0.1;
 
 pub static COLORS: [[f32; 3]; 10] = [
-    [0.5, 0.5, 0.5],
-    [1.0, 0.5, 0.0],
-    [0.0, 0.5, 1.0],
-    [1.0, 0.0, 1.0],
-    [1.0, 0.0, 0.0],
-    [1.0, 0.0, 0.0],
-    [1.0, 0.0, 0.0],
-    [1.0, 0.0, 0.0],
-    [1.0, 0.0, 0.0],
-    [1.0, 0.0, 0.0],
+    [0.5 , 0.5 , 0.5  ],
+    [1.0 , 0.50, 0.0  ],    // #FF8000
+    [0.0 , 0.50, 1.0  ],    // #0080ff
+    [1.0 , 0.4 , 0.58 ],    // #FF6693
+    [0.24, 0.79, 0.33 ],    // #3fcb55
+    [0.79, 0.76, 0.24 ],    // #cbc33f
+    [0.81, 0.25, 0.91 ],    // #cf40e9
+    [0.94, 0.32, 0.32 ],    // #FF3F0D
+    [0.11, 0.93, 0.94 ],    // #1beef0
+    [0.05, 0.77, 1.0  ],    // #0DC5FF
 ];
 
 use super::types;
diff --git a/frontend/www/static/res/style.css b/frontend/www/static/res/style.css
index 636ac30..42a6574 100644
--- a/frontend/www/static/res/style.css
+++ b/frontend/www/static/res/style.css
@@ -55,7 +55,7 @@ p {
     color: white;
     margin: 0 0 20px 0;
     padding: 10px;
-    background-color: grey;
+    background-color: #333;
 }
 
 .option:last-child {