Merge pull request #1 from olzzon/develop

CasparCG-state-scanner based
tv2 · Oct 26, 2018 · 41d7dbc · 41d7dbc
2 parents 99fe833 + 35e99a1
commit 41d7dbc
Show file tree

Hide file tree

Showing 8 changed files with 1,562 additions and 753 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,7 +5,7 @@ root = true
 [*]
 charset = utf-8
 end_of_line = crlf
-indent_size = 2
+indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true

diff --git a/main.js b/main.js
@@ -26,6 +26,7 @@ if (process.platform === 'win32') {
 function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({
+    webPreferences: { webSecurity: false },
     width: 1280,
     height: 768,
     show: false

diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "casparcg-connection": "^4.5.3",
+    "graphql-request": "^1.8.2",
     "react": "^16.5.2",
     "react-dom": "^16.5.2",
     "rmc-tabs": "^1.2.27"

diff --git a/src/assets/css/App.css b/src/assets/css/App.css
@@ -52,9 +52,10 @@ body {
 .headerPgmCounter {
   position: absolute;
   top: 40px;
-  left: 200px;
+  left: 180px;
+  text-align: left;
   background-color: #aa0101;
-  width: 115px;
+  width: 145px;
   height: 30px;
   border-width: 0px;
   color: rgb(255, 255, 255);
@@ -74,8 +75,8 @@ body {
   height: 96px;
   margin-top: 6px;
   margin-bottom: 4px;
-  margin-right: 8px;  
-  background-image: repeating-linear-gradient(-45deg, #2f2c43, #2e2b41 3%, #2a1938 4%); 
+  margin-right: 8px;
+  background-image: repeating-linear-gradient(-45deg, #2f2c43, #2e2b41 3%, #2a1938 4%);
 }
 
 .headerPgmThumbnailImage {
@@ -89,8 +90,8 @@ body {
   height: 96px;
   margin-top: 6px;
   margin-bottom: 4px;
-  margin-left: 8px; 
-  background-image: repeating-linear-gradient(-45deg, #2f2c43, #2e2b41 3%, #2a1938 4%); 
+  margin-left: 8px;
+  background-image: repeating-linear-gradient(-45deg, #2f2c43, #2e2b41 3%, #2a1938 4%);
 }
 
 .Reload-setup-background {

diff --git a/src/assets/css/Thumbnail.css b/src/assets/css/Thumbnail.css
@@ -19,7 +19,7 @@
   box-shadow: 6px 6px 6px #555;
   width: 300px;
   margin: 10px;
-  font-size: 0.9em;    
+  font-size: 0.9em;
 }
 
 .thumbnailImage {
@@ -29,14 +29,14 @@
     width: 90%;
     height: auto;
     margin: 8px;
-    background-image: repeating-linear-gradient(-45deg, #94939411, #94939411 3%, #2a1938 4%); 
+    background-image: repeating-linear-gradient(-45deg, #94939411, #94939411 3%, #2a1938 4%);
 
   }
-  
+
   /* Buttons on thumbnail invisible and visible */
 .thumbnailImageClickPvw {
   position: absolute;
-  height: 150px; 
+  height: 150px;
   top: 10px;
   z-index: 2;
   background-color: transparent;
@@ -49,7 +49,7 @@
 
 .thumbnailImageClickPgm {
   position: absolute;
-  height: 150px; 
+  height: 150px;
   top: 10px;
   z-index: 2;
   background-color: transparent;
@@ -100,8 +100,9 @@
   width: 250px;
   left: 25px;
   top: 50px;
-  font-size: 3em;
+  text-align: left;
+  font-size: 2.8em;
   color: red;
   background: #ffffff8c;
   border-radius: 16px;
-}
+}