diff --git a/client/assets/styles/colours.less b/client/assets/styles/colours.less index 4d93f6fc..91c1ba73 100644 --- a/client/assets/styles/colours.less +++ b/client/assets/styles/colours.less @@ -33,6 +33,25 @@ svg { } } +// icons from ethan are fills not strokes +svg.ethan-icon { + fill: @white; + stroke: none; + + .red { + fill: @red; + } + + .green { + fill: @green; + } + + .blue { + fill: @blue; + } +} + + .green { color: @green; stroke: @green; diff --git a/client/assets/styles/styles.less b/client/assets/styles/styles.less index f2576ff4..441e4c11 100644 --- a/client/assets/styles/styles.less +++ b/client/assets/styles/styles.less @@ -271,7 +271,6 @@ figure.gray { .stats svg, .specs svg { height: 2em; - fill: none; } .credits { diff --git a/client/src/components/shapes.jsx b/client/src/components/shapes.jsx index 454e51fe..c85f104c 100644 --- a/client/src/components/shapes.jsx +++ b/client/src/components/shapes.jsx @@ -11,6 +11,10 @@ const triangle = require('./svgs/triangle'); // const vboxColour = require('./svgs/colour'); const vboxColour = require('./svgs/vbox.colour'); +const speed = require('./svgs/speed'); +const power = require('./svgs/power'); +const life = require('./svgs/life'); + module.exports = { circle, diamond, @@ -19,6 +23,7 @@ module.exports = { square, squircle, triangle, + speed, saw, vboxColour, @@ -27,17 +32,17 @@ module.exports = { Blue: () => vboxColour('blue'), // stats - RedLife: () => square(['red']), - GreenLife: () => square(['green']), - BlueLife: () => square(['blue']), - RedPower: () => circle(['red']), - GreenPower: () => circle(['green']), - BluePower: () => circle(['blue']), - SpeedStat: () => triangle(['white']), + RedLife: () => life(['red']), + GreenLife: () => life(['green']), + BlueLife: () => life(['blue']), + RedPower: () => power(['red']), + GreenPower: () => power(['green']), + BluePower: () => power(['blue']), + SpeedStat: () => speed(['white']), - POWER: () => circle(['white']), - LIFE: () => square(['white']), - SPEED: () => triangle(['white']), + POWER: () => power(['white']), + LIFE: () => life(['white']), + SPEED: () => speed(['white']), // specs // Base @@ -50,343 +55,343 @@ module.exports = { Power: () =>
- {circle(['white'])} + {power(['white'])}
Power
, Life: () =>
- {square(['white'])} + {life(['white'])}
Life
, Speed: () =>
- {triangle(['white'])} + {speed(['white'])}
Speed
, // Lifes Upgrades LifeGG: () =>
- {square(['green'])} + {life(['green'])}
Life
, LifeRR: () =>
- {square(['red'])} + {life(['red'])}
Life
, LifeBB:() =>
- {square(['blue'])} + {life(['blue'])}
Life
, LifeRG: () =>
- {square(['red', 'green'])} + {life(['red', 'green'])}
Life
, LifeGB: () =>
- {square(['green', 'blue'])} + {life(['green', 'blue'])}
Life
, LifeRB:() =>
- {square(['red', 'blue'])} + {life(['red', 'blue'])}
Life
, LifeGGPlus: () =>
- {square(['green'])} + {life(['green'])}
Life+
, LifeRRPlus: () =>
- {square(['red'])} + {life(['red'])}
Life+
, LifeBBPlus:() =>
- {square(['blue'])} + {life(['blue'])}
Life+
, LifeRGPlus: () =>
- {square(['red', 'green'])} + {life(['red', 'green'])}
Life+
, LifeGBPlus: () =>
- {square(['green', 'blue'])} + {life(['green', 'blue'])}
Life+
, LifeRBPlus:() =>
- {square(['red', 'blue'])} + {life(['red', 'blue'])}
Life+
, LifeGGPlusPlus: () =>
- {square(['green'])} + {life(['green'])}
Life++
, LifeRRPlusPlus: () =>
- {square(['red'])} + {life(['red'])}
Life++
, LifeBBPlusPlus:() =>
- {square(['blue'])} + {life(['blue'])}
Life++
, LifeRGPlusPlus: () =>
- {square(['red', 'green'])} + {life(['red', 'green'])}
Life++
, LifeGBPlusPlus: () =>
- {square(['green', 'blue'])} + {life(['green', 'blue'])}
Life++
, LifeRBPlusPlus:() =>
- {square(['red', 'blue'])} + {life(['red', 'blue'])}
Life++
, // Powers Upgrades PowerGG: () =>
- {circle(['green'])} + {power(['green'])}
Power
, PowerRR: () =>
- {circle(['red'])} + {power(['red'])}
Power
, PowerBB:() =>
- {circle(['blue'])} + {power(['blue'])}
Power
, PowerRG: () =>
- {circle(['red', 'green'])} + {power(['red', 'green'])}
Power
, PowerGB: () =>
- {circle(['green', 'blue'])} + {power(['green', 'blue'])}
Power
, PowerRB:() =>
- {circle(['red', 'blue'])} + {power(['red', 'blue'])}
Power
, PowerGGPlus: () =>
- {circle(['green'])} + {power(['green'])}
Power+
, PowerRRPlus: () =>
- {circle(['red'])} + {power(['red'])}
Power+
, PowerBBPlus:() =>
- {circle(['blue'])} + {power(['blue'])}
Power+
, PowerRGPlus: () =>
- {circle(['red', 'green'])} + {power(['red', 'green'])}
Power+
, PowerGBPlus: () =>
- {circle(['green', 'blue'])} + {power(['green', 'blue'])}
Power+
, PowerRBPlus:() =>
- {circle(['red', 'blue'])} + {power(['red', 'blue'])}
Power+
, PowerGGPlusPlus: () =>
- {circle(['green'])} + {power(['green'])}
Power++
, PowerRRPlusPlus: () =>
- {circle(['red'])} + {power(['red'])}
Power++
, PowerBBPlusPlus:() =>
- {circle(['blue'])} + {power(['blue'])}
Power++
, PowerRGPlusPlus: () =>
- {circle(['red', 'green'])} + {power(['red', 'green'])}
Power++
, PowerGBPlusPlus: () =>
- {circle(['green', 'blue'])} + {power(['green', 'blue'])}
Power++
, PowerRBPlusPlus:() =>
- {circle(['red', 'blue'])} + {power(['red', 'blue'])}
Power++
, // Speeds Upgrades SpeedGG: () =>
- {triangle(['green'])} + {speed(['green'])}
Speed
, SpeedRR: () =>
- {triangle(['red'])} + {speed(['red'])}
Speed
, SpeedBB:() =>
- {triangle(['blue'])} + {speed(['blue'])}
Speed
, SpeedRG: () =>
- {triangle(['red', 'green'])} + {speed(['red', 'green'])}
Speed
, SpeedGB: () =>
- {triangle(['green', 'blue'])} + {speed(['green', 'blue'])}
Speed
, SpeedRB:() =>
- {triangle(['red', 'blue'])} + {speed(['red', 'blue'])}
Speed
, SpeedGGPlus: () =>
- {triangle(['green'])} + {speed(['green'])}
Speed+
, SpeedRRPlus: () =>
- {triangle(['red'])} + {speed(['red'])}
Speed+
, SpeedBBPlus:() =>
- {triangle(['blue'])} + {speed(['blue'])}
Speed+
, SpeedRGPlus: () =>
- {triangle(['red', 'green'])} + {speed(['red', 'green'])}
Speed+
, SpeedGBPlus: () =>
- {triangle(['green', 'blue'])} + {speed(['green', 'blue'])}
Speed+
, SpeedRBPlus:() =>
- {triangle(['red', 'blue'])} + {speed(['red', 'blue'])}
Speed+
, SpeedGGPlusPlus: () =>
- {triangle(['green'])} + {speed(['green'])}
Speed++
, SpeedRRPlusPlus: () =>
- {triangle(['red'])} + {speed(['red'])}
Speed++
, SpeedBBPlusPlus:() =>
- {triangle(['blue'])} + {speed(['blue'])}
Speed++
, SpeedRGPlusPlus: () =>
- {triangle(['red', 'green'])} + {speed(['red', 'green'])}
Speed++
, SpeedGBPlusPlus: () =>
- {triangle(['green', 'blue'])} + {speed(['green', 'blue'])}
Speed++
, SpeedRBPlusPlus:() =>
- {triangle(['red', 'blue'])} + {speed(['red', 'blue'])}
Speed++
, };