Merge pull request #215 from tv2/develop

Merge develop into staging

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+yarn lint-staged

docker-entrypoint.sh

@@ -18,6 +18,7 @@ yarn build-now --env.server=$SERVER
 
 if [[ -d "/opt/blueprints/nginx" ]]; then
     echo "Volume mount exists copying files"
-    cp -r shelf-layouts/ nginx/
     cp -r external-frames/ nginx/
-fi
+fi
+
+./scripts/upload-layouts.sh layouts/

external-frames/multiview/off-tubes-shelf.json

@@ -1 +1 @@
-../../shelf-layouts/Kommentator.json
+../../layouts/tv2_offtube_showstyle/Kommentator.json

shelf-layouts/Mini_Shelf_Layout.json → layouts/tv2_afvd_showstyle/Mini_Shelf_Layout.json

@@ -1,4 +1,5 @@
 {
+	"_id": "fgDCkL4Y5GQrdyuRW",
 	"name": "Flow Producer Mini Shelf",
 	"type": "dashboard_layout",
 	"icon": "",

shelf-layouts/Rundown_Header_Layout.json → layouts/tv2_afvd_showstyle/Rundown_Header_Layout.json

@@ -25,11 +25,15 @@
 			"y": 0.3,
 			"width": 1,
 			"height": 1,
-			"scale": 0.7,
+			"scale": 1,
 			"customClasses": [
 				""
 			],
-			"hideDiff": true
+			"hideDiff": true,
+			"xUnit": "rem",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "4QhdsoZfbDXeNXZLY",
@@ -45,14 +49,17 @@
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
 			"plannedEndText": "",
-			"scale": 0.7,
+			"scale": 1,
 			"width": 4,
 			"height": 1,
 			"x": 8.8,
 			"y": 0.3,
 			"hidePlannedEnd": true,
 			"hideCountdown": true,
-			"xUnit": "%"
+			"xUnit": "%",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "NAT56wYzfbKRX9Dw2",
@@ -70,12 +77,15 @@
 			"plannedEndText": "Planned end",
 			"hideCountdown": true,
 			"hideDiff": true,
-			"scale": 0.7,
+			"scale": 1,
 			"y": 0.3,
 			"x": 18.2,
 			"width": 1,
 			"height": 1,
-			"xUnit": "%"
+			"xUnit": "%",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "qYm6yy529p69wkxC4",
@@ -90,12 +100,15 @@
 			"default": false,
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
-			"scale": 0.7,
+			"scale": 1,
 			"y": 0.9,
 			"x": 22,
 			"width": 10,
 			"height": 1,
-			"xUnit": "%"
+			"xUnit": "%",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "tsCeq5TJR6PNk8mbx",
@@ -110,13 +123,16 @@
 			"default": false,
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
-			"scale": 0.7,
+			"scale": 1,
 			"width": 10,
 			"height": 1,
 			"text": "INEWS RUNDOWN",
 			"x": 22,
 			"y": 0.3,
-			"xUnit": "%"
+			"xUnit": "%",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "uWHhxH2Mchdeds4q6",
@@ -131,11 +147,15 @@
 			"default": false,
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
-			"scale": 0.7,
+			"scale": 1,
 			"y": 0.3,
 			"x": -4.1,
 			"width": 2.6,
-			"height": 1
+			"height": 1,
+			"xUnit": "rem",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "awa4skeRvYqC2ZFhd",
@@ -150,12 +170,15 @@
 			"default": false,
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
-			"scale": 0.7,
+			"scale": 1,
 			"y": 0.3,
 			"x": 74.4,
 			"width": 15,
 			"height": 1,
-			"xUnit": "%"
+			"xUnit": "%",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "NaaYLEHtqmtWkAD48",
@@ -170,12 +193,15 @@
 			"default": false,
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
-			"scale": 0.7,
+			"scale": 1,
 			"x": 67.3,
 			"y": 0.3,
 			"width": 5,
 			"height": 1,
-			"xUnit": "%"
+			"xUnit": "%",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "NFhMKGcs94BGTAvs2",
@@ -193,10 +219,12 @@
 			"iconColor": "#000000",
 			"x": 37,
 			"width": 27,
-			"height": 2,
+			"height": 1.4,
 			"y": 0,
 			"xUnit": "%",
-			"widthUnit": "%"
+			"widthUnit": "%",
+			"yUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "ckTBdCMfJp7mJhBTp",
@@ -211,20 +239,24 @@
 			"default": false,
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
-			"scale": 1.3,
+			"scale": 1.6,
 			"customClasses": [
 				""
 			],
 			"timingType": "count_down",
-			"y": -1.35,
-			"x": 37.5,
+			"y": -1.6,
+			"x": 38,
 			"hideLabel": true,
 			"requiredLayerIds": [
 				"studio0_clip",
 				"studio0_voiceover"
 			],
 			"xUnit": "%",
-			"width": 5
+			"width": 5,
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem",
+			"height": -0.8
 		},
 		{
 			"_id": "uW28ZfmJ6b2hMZo5Y",
@@ -240,11 +272,14 @@
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
 			"text": "PART COUNTDOWN",
-			"scale": 0.7,
-			"y": 0.05,
+			"scale": 0.9,
+			"y": 0.1,
 			"x": 38,
 			"xUnit": "%",
-			"width": 6
+			"width": 6,
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "zvkPAEWTZWjLbyHPg",
@@ -260,12 +295,15 @@
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
 			"timingType": "count_up",
-			"scale": 0.6,
+			"scale": 0.9,
 			"x": -36.7,
-			"y": 0.3,
+			"y": 0.1,
 			"xUnit": "%",
-			"widthUnit": "em",
-			"width": 3.8
+			"widthUnit": "rem",
+			"width": 3.8,
+			"hideLabel": false,
+			"yUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "ou4qa2eEmDihBykfQ",
@@ -281,11 +319,14 @@
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
 			"timingType": "count_down",
-			"scale": 0.6,
-			"y": 0.3,
+			"scale": 0.9,
+			"y": 0.1,
 			"x": 47,
 			"xUnit": "%",
-			"width": 6
+			"width": 6,
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "5dPjQgaZEd3cgjoCo",
@@ -300,9 +341,9 @@
 			"default": false,
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
-			"scale": 0.6,
-			"y": 1.4,
-			"x": 50.6,
+			"scale": 0.8,
+			"y": 1.2,
+			"x": 50.7,
 			"requiredLayerIds": [
 				"studio0_script"
 			],
@@ -315,7 +356,9 @@
 			],
 			"requireAllAdditionalSourcelayers": false,
 			"xUnit": "%",
-			"widthUnit": "%"
+			"widthUnit": "%",
+			"yUnit": "rem",
+			"heightUnit": "rem"
 		},
 		{
 			"_id": "mK85XTh7ERR6Ddhm6",
@@ -331,10 +374,13 @@
 			"nextInCurrentPart": false,
 			"oneNextPerSourceLayer": false,
 			"text": "END WORDS",
-			"scale": 0.7,
+			"scale": 1,
 			"x": 47,
-			"y": 1.7,
-			"xUnit": "%"
+			"y": 1.8,
+			"xUnit": "%",
+			"yUnit": "rem",
+			"widthUnit": "rem",
+			"heightUnit": "rem"
 		}
 	],
 	"showStyleBaseId": "show0"