Kelder/planet-wars
32
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Colours (#21)

Browse source 
* try 1

* make colours uniform
This commit is contained in:
ajuvercr 2020-04-10 13:51:19 +02:00 committed by GitHub
parent fd3178060a
commit 6b7fd4eff3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/src/util.rs
View file

@ -15,8 +15,8 @@ static NAV: [(&'static str, &'static str); 6] = [
("/info", "Info"), ("/info", "Info"),
]; ];
pub static COLOURS: [&'static str; 9] = [ pub static COLOURS: [&'static str; 10] = [
"gray", "blue", "cyan", "green", "yellow", "orange", "red", "pink", "purple", "#808080", "#FF8000", "#0080ff", "#FF6693", "#3fcb55", "#cbc33f", "#cf40e9", "#FF3F0D", "#1beef0", "#0DC5FF"
]; ];
/// The state of a player, in a running game. /// The state of a player, in a running game.

36
backend/static/style/mapbuilder.css
View file

@ -104,75 +104,75 @@
} }
.colourButton_gray { .colourButton_gray {
background-color: lightgray; background-color: #808080;
} }
.colourButton_blue { .colourButton_blue {
background-color: blue; background-color: #FF8000;
} }
.colourButton_cyan { .colourButton_cyan {
background-color: cyan; background-color: #0080ff;
} }
.colourButton_green { .colourButton_green {
background-color: green; background-color: #FF6693;
} }
.colourButton_yellow { .colourButton_yellow {
background-color: yellow; background-color: #3fcb55;
} }
.colourButton_orange { .colourButton_orange {
background-color: orange; background-color: #cbc33f;
} }
.colourButton_red { .colourButton_red {
background-color: red; background-color: #cf40e9;
} }
.colourButton_pink { .colourButton_pink {
background-color: pink; background-color: #FF3F0D;
} }
.colourButton_purple { .colourButton_purple {
background-color: purple; background-color: #1beef0;
} }
.planet_gray { .planet_gray {
background-color: lightgray; background-color: #808080;
} }
.planet_blue { .planet_blue {
background-color: blue; background-color: #FF8000;
} }
.planet_cyan { .planet_cyan {
background-color: cyan; background-color: #0080ff;
} }
.planet_green { .planet_green {
background-color: green; background-color: #FF6693;
} }
.planet_yellow { .planet_yellow {
background-color: yellow; background-color: #3fcb55;
} }
.planet_orange { .planet_orange {
background-color: orange; background-color: #cbc33f;
} }
.planet_red { .planet_red {
background-color: red; background-color: #cf40e9;
} }
.planet_pink { .planet_pink {
background-color: pink; background-color: #FF3F0D;
} }
.planet_purple { .planet_purple {
background-color: purple; background-color: #1beef0;
} }

20
frontend/src/utils.rs
View file

@ -15,16 +15,16 @@ use octoon_math::{Vec3};
static VIEWBOX_SCALE: f32 = 0.1; static VIEWBOX_SCALE: f32 = 0.1;
pub static COLORS: [[f32; 3]; 10] = [ pub static COLORS: [[f32; 3]; 10] = [
[0.5, 0.5, 0.5], [0.5 , 0.5 , 0.5 ],
[1.0, 0.5, 0.0], [1.0 , 0.50, 0.0 ], // #FF8000
[0.0, 0.5, 1.0], [0.0 , 0.50, 1.0 ], // #0080ff
[1.0, 0.0, 1.0], [1.0 , 0.4 , 0.58 ], // #FF6693
[1.0, 0.0, 0.0], [0.24, 0.79, 0.33 ], // #3fcb55
[1.0, 0.0, 0.0], [0.79, 0.76, 0.24 ], // #cbc33f
[1.0, 0.0, 0.0], [0.81, 0.25, 0.91 ], // #cf40e9
[1.0, 0.0, 0.0], [0.94, 0.32, 0.32 ], // #FF3F0D
[1.0, 0.0, 0.0], [0.11, 0.93, 0.94 ], // #1beef0
[1.0, 0.0, 0.0], [0.05, 0.77, 1.0 ], // #0DC5FF
]; ];
use super::types; use super::types;

2
frontend/www/static/res/style.css
View file

@ -55,7 +55,7 @@ p {
color: white; color: white;
margin: 0 0 20px 0; margin: 0 0 20px 0;
padding: 10px; padding: 10px;
background-color: grey; background-color: #333;
} }
.option:last-child { .option:last-child {