Merge pull request #40 from wmcadigital/nr/feature/colour-palette-upd…

…ates update: wmca colour palette
wmcadigital · Dec 3, 2020 · 130afda · 130afda
2 parents 6a6d8ef + 3f5764b
commit 130afda
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 198 deletions.
diff --git a/src/wmcads/assets/sass/_vars.scss b/src/wmcads/assets/sass/_vars.scss
@@ -4,21 +4,27 @@
 $palettes: (
   primary: #c05701,
   secondary: #231f20,
+  text: #231f20,
+  cta: #007da8,
+  background: #f3f2f1,
+  brandCoolGrey: #54565b,
+  brandFurnaceOrange: #fe811b,
+  brandWmGreen: #00807b,
+  brandWmRed: #d60037,
+  brandWmPurple: #94368d,
+  brandWmBlue: #007ea8,
+  warning: #cc6900,
+  error: #d4351c,
+  success: #00703c,
+  disable: #676869, // remove below
   bus: #ea0029,
   metro: #0075c9,
   railway: #e07709,
   susTravel: #679500,
   roads: #df1683,
   taxi: #773dbe,
-  text: #231f20,
-  cta: #007da8,
-  error: #d4351c,
-  warning: #b75e00,
-  success: #00703c,
   information: #84329b,
-  disable: #676869,
   plannedDisruption: #ffdd00,
-  background: #f3f2f1
 );
 
 $white: #ffffff;

diff --git a/src/www/assets/json/merged.njk.json b/src/www/assets/json/merged.njk.json
@@ -123,42 +123,40 @@
 	],
 	"colors": {
 		"brand": [
-			{
-				"varName": "primary",
-				"name": "Primary Orange"
+			{ 
+				"varName": "brandFurnaceOrange", 
+				"name": "Furnace Orange" 
 			},
-			{
-				"varName": "secondary",
-				"name": "Secondary Grey"
-			}
-		],
-		"modal": [
-			{
-				"varName": "bus",
-				"name": "Bus"
+			{ 
+				"varName": "brandCoolGrey", 
+				"name": "Cool Grey" 
 			},
-			{
-				"varName": "metro",
-				"name": "Metro"
+			{ 
+				"varName": "brandWmGreen", 
+				"name": "WM Green" 
 			},
-			{
-				"varName": "railway",
-				"name": "WM Railway"
+			{ 
+				"varName": "brandWmRed", 
+				"name": "WM Red" 
 			},
-			{
-				"varName": "susTravel",
-				"name": "Sustainable Travel"
+			{ 
+				"varName": "brandWmPurple", 
+				"name": "WM Purple" 
 			},
-			{
-				"varName": "roads",
-				"name": "Roads"
-			},
-			{
-				"varName": "taxi",
-				"name": "Taxi"
+			{ 
+				"varName": "brandWmBlue", 
+				"name": "WM Blue" 
 			}
 		],
 		"web": [
+			{
+				"varName": "primary",
+				"name": "Primary Orange"
+			},
+			{
+				"varName": "secondary",
+				"name": "Secondary Grey"
+			},
 			{
 				"varName": "text",
 				"name": "Text"
@@ -178,21 +176,9 @@
 			{
 				"varName": "success",
 				"name": "Success"
-			},
-			{
-				"varName": "information",
-				"name": "Information"
 			}
 		],
 		"backgroundOnly": [
-			{
-				"varName": "plannedDisruption",
-				"name": "Planned Disruption"
-			},
-			{
-				"varName": "disable",
-				"name": "Disabled Elements"
-			},
 			{
 				"varName": "background",
 				"name": "Background"

diff --git a/src/www/data.njk.json b/src/www/data.njk.json