Bring back the Trøndisk branding.

diff --git a/carousel.js b/carousel.js
index 35b02883c7d91809e89e5ec891e10733c9595c83..e73a38701b455c46330a7edef42cad8306cf9770 100644 (file)
--- a/carousel.js
+++ b/carousel.js
@@ -391,7 +391,7 @@ function display_group_parsed(teams, games, group_name)
        let carousel = document.getElementById('carousel');
        clear_carousel(carousel);
 
-       addheading(carousel, 5, "Current standings<br />" + group_name);
+       addheading(carousel, 5, "Current standings, Trøndisk 2018<br />" + group_name);
        let tr = document.createElement("tr");
        tr.className = "subfooter";
        addth(tr, "rank", "");
@@ -427,7 +427,7 @@ function display_group_parsed(teams, games, group_name)
        let footer_tr = document.createElement("tr");
        footer_tr.className = "footer";
        let td = document.createElement("td");
-       td.appendChild(document.createTextNode("Norwegian Ultimate Championships 2018 | #ultimatenm"));
+       td.appendChild(document.createTextNode("www.trondheimfrisbeeklubb.no | #trøndisk"));
        td.setAttribute("colspan", "5");
        footer_tr.appendChild(td);
        carousel.appendChild(footer_tr);
@@ -541,7 +541,7 @@ function display_stream_schedule_parsed(teams, games, page) {
        
        let carousel = document.getElementById('carousel');
        clear_carousel(carousel);
-       addheading(carousel, 3, "Match schedule<br />" + covered_days.join('/') + " (all times CET)");
+       addheading(carousel, 3, "Stream schedule, Trøndisk 2018<br />" + covered_days.join('/') + " (all times CET)");
 
        let teams_to_idx = make_teams_to_idx(teams);
        row_num = 0;

diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index 09c0ad9522d933d5ceda0a1f423425b5977972dd..c3804a277de9722eb67e771eb436b27b3e964cd5 100644 (file)
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -549,7 +549,7 @@
         <item>
          <widget class="QLineEdit" name="lowerthird_subheading_edit">
           <property name="text">
-           <string>Norwegian Ultimate Championships 2018</string>
+           <string>Trøndisk 2018</string>
           </property>
          </widget>
         </item>

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 63087374033ea701ea42cdc0d7ebcf8514237aa2..277c333056096aafb258ae8aa9afabfeba39262c 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -1,4 +1,4 @@
--- Nageru theme for ultimate productions, based on the default theme.
+-- Nageru theme for TFK mini-tournament 2017, based on the default theme.
 
 local state = {
        transition_start = -2.0,
@@ -39,7 +39,7 @@ local SBS_SIGNAL_NUM = NUM_CAMERAS
 local STATIC_SIGNAL_NUM = NUM_CAMERAS + 1
 local VIDEO_SIGNAL_NUM = NUM_CAMERAS + 2
 
-state.neutral_colors[VIDEO_SIGNAL_NUM - INPUT0_SIGNAL_NUM + 1] = {0.5, 0.5, 0.5};
+state.neutral_colors[VIDEO_SIGNAL_NUM - INPUT0_SIGNAL_NUM + 1] = {0.5, 0.5, 0.5}
 
 -- Preview-only signal showing the current signal with the overlay.
 -- Not valid for live_signal_num!
@@ -274,7 +274,7 @@ end)
 function make_simple_chain(input_deint, input_video, input_scale, has_overlay, hq)
        local chain = EffectChain.new(16, 9)
 
-       local input;
+       local input
        if input_video then
                input = chain:add_video_input(iptv_video, false)
        else
@@ -820,7 +820,7 @@ function get_chain(num, t, width, height, signals)
                        -- Transition in or out of SBS.
                        local chain = get_sbs_chain(state_copy, signals)
                        local prepare = function()
-                               prepare_sbs_chain(state_copy, chain, calc_zoom_progress(t), state_copy.transition_type, state_copy.transition_src_signal, state.transition_dst_signal, width, height, input_resolution)
+                               prepare_sbs_chain(state_copy, chain, calc_zoom_progress(t), state_copy.transition_type, state_copy.transition_src_signal, state_copy.transition_dst_signal, width, height, input_resolution)
                                prepare_overlay_live(state_copy, chain, t, 1.0)
                        end
                        return chain.chain, prepare
@@ -837,7 +837,7 @@ function get_chain(num, t, width, height, signals)
                elseif is_plain_signal(state.live_signal_num) then
                        local input_type = get_input_type(signals, state.live_signal_num)
                        local input_scale = needs_scale(signals, state.live_signal_num, width, height)
-                       local overlay_really_enabled = state_copy.overlay_enabled and simple_signal_has_overlay(state.live_signal_num)
+                       local overlay_really_enabled = state.overlay_enabled and simple_signal_has_overlay(state.live_signal_num)
                        local chain = simple_chains[input_type][input_scale][overlay_really_enabled][true]
                        local prepare = function()
                                if input_type ~= "video" then

diff --git a/quickl3.js b/quickl3.js
index 4487c298c80708ca71460cf7a2233307104d56f8..b8a49bf763b79b266fbc7a84a6d80bb029b4164b 100644 (file)
--- a/quickl3.js
+++ b/quickl3.js
@@ -28,7 +28,7 @@ function load_l3(sheet, prefix, cb)
                        text = text.replace(/\n/, '<br />');
                        let subtext = response.values[i][3];
                        if (subtext === undefined || subtext === '') {
-                               subtext = 'Norwegian Ultimate Championships 2018';
+                               subtext = 'Trøndisk 2018';
                        }
 
                        l3s[prefix + number] = {

diff --git a/score.css b/score.css
index 69d6f32627d8704410df1deedcd6dbe87e50ab4a..c596902abb5a3e12014e9e61e4c33a9493908aa7 100644 (file)
--- a/score.css
+++ b/score.css
@@ -15,7 +15,7 @@ body {
 }
 body {
   font-family: 'Exo', sans-serif;
-  color: #222;
+  color: white;
 }
 
 /* Score */
@@ -26,11 +26,11 @@ body {
   top: 10px;
   border-collapse: collapse;
   white-space: nowrap;
-  border: 1px solid #ccc;
+  border: 1px solid black;
   z-index: 1;
 }
 .scorebug td {
-  border: 1px solid #ccc;
+  border: 1px solid #000;
 }
 .team1color, .team2color {
   width: 12px;
@@ -38,23 +38,23 @@ body {
 }
 .team1color {
   background-color: red;
-  background-image: linear-gradient(to right, rgba(255,255,255,0.2), rgba(255,255,255,0.05) 3px, rgba(255,255,255,0));
+  background-image: linear-gradient(to right, rgba(0,0,0,0.2), rgba(0,0,0,0.05) 3px, rgba(0,0,0,0));
 }
 .team2color {
   background-color: green;
-  background-image: linear-gradient(to left, rgba(255,255,255,0.2), rgba(255,255,255,0.05) 3px, rgba(255,255,255,0));
+  background-image: linear-gradient(to left, rgba(0,0,0,0.2), rgba(0,0,0,0.05) 3px, rgba(0,0,0,0));
 }
 .team1, .team2 {
   font-weight: bold;
   width: 100px;
   text-align: center;
   height: 35px;
-  background: linear-gradient(to bottom, #fff, #eee);
+  background: linear-gradient(to bottom, #00a, #008);
   padding-top: 2px;  /* needs to be adjusted per-font! */
 }
 .score {
   text-align: center;
-  background: linear-gradient(to bottom, #fff, #eee);
+  background: linear-gradient(to bottom, #00c, #00a);
   width: 110px;
   height: 35px;
   padding-top: 2px;  /* needs to be adjusted per-font! */
@@ -68,11 +68,11 @@ body {
   top: 10px;
   border-collapse: collapse;
   white-space: nowrap;
-  border: 1px solid #ccc;
+  border: 1px solid black;
 }
 .clock {
-  border: 1px solid #ccc;
-  background: linear-gradient(to bottom, #fff, #eee);
+  border: 1px solid #000;
+  background: linear-gradient(to bottom, #00a, #008);
   text-align: center;
   height: 36px;
   padding-top: 2px;
@@ -97,11 +97,11 @@ body {
   top: 52px;
   border-collapse: collapse;
   white-space: nowrap;
-  border: 1px solid #ccc;
+  border: 1px solid black;
 }
 .comment {
-  border: 1px solid #ccc;
-  background: linear-gradient(to bottom, #fff, #eee);
+  border: 1px solid #000;
+  background: linear-gradient(to bottom, #00a, #008);
   text-align: center;
   height: 30px;
   width: 334px;
@@ -126,7 +126,7 @@ body {
   top: 520px;
   border-collapse: collapse;
   white-space: nowrap;
-  border: 1px solid #ccc;
+  border: 2px solid #ccc;
   height: 118px;
   font-weight: bold;
   width: 1050px;
@@ -174,7 +174,7 @@ body {
   width: 600px;
   border-collapse: collapse;
   white-space: nowrap;
-  border: 1px solid #6ad;
+  border: 1px solid black;
   /*display: flex;
   align-items: center; */
   /*background: linear-gradient(to right, #44c, #33a 15px); */
@@ -300,7 +300,7 @@ body {
 }
 #carousel tr {
   /* background: rgba(0, 0, 170, 0.8); */
-  background: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.8));
+  background: linear-gradient(to bottom, rgba(0, 0, 170, 0.9), rgba(0, 0, 130, 0.9));
   /* -webkit-animation: fade-in calc(counter(rowNumber) * 1.0)s ease; */
   -webkit-animation: fade-in calc(counter-value(rowNumber) * 1.0s) ease;
 }
@@ -412,11 +412,11 @@ body {
 @-webkit-keyframes scale-in {
   0% {
     width: 1050px;
-    border: 1px solid #ccc;
+    border: 2px solid #ccc;
   }
   100% {
     width: 0px;
-    border: 1px solid #ccc;
+    border: 2px solid #ccc;
   }
 }
 @-webkit-keyframes scale-in-no-border {
@@ -437,7 +437,7 @@ body {
   }
   20% {
     width: 0px;
-    border: 1px solid #6ad;
+    border: 1px solid black;
   }
   100% {
     width: 600px;
@@ -446,11 +446,11 @@ body {
 @-webkit-keyframes scale-in-small {
   0% {
     width: 600px;
-    border: 1px solid #6ad;
+    border: 1px solid black;
   }
   80% {
     width: 0px;
-    border: 1px solid #6ad;
+    border: 1px solid black;
   }
   80.01% {
     border: 0px;

diff --git a/score.html b/score.html
index 19bd4b45d7d8dd9b51e184cd950e2ad5b4e86730..b5a73a731328db55728344c1d610dd905e6b4f03 100644 (file)
--- a/score.html
+++ b/score.html
@@ -33,7 +33,7 @@
       Call on the field: Foul
     </div></div>
     <div class="lowerthird-subheading lowerthird-subheading-hidden" id="lowerthird-subheading"><div class="lowerthird-subheading-content lowerthird-subheading-content-hidden" id="lowerthird-subheading-content">
-      Commentators, Trøndisk 2016
+      Commentators, Trøndisk 2018
     </div></div>
     <div class="lowerthird-picture lowerthird-picture-hidden" id="lowerthird-picture"><div class="lowerthird-picture-content lowerthird-picture-content-hidden" id="lowerthird-picture-content">
       <img src="foul.png" id="lowerthird-img" style="display: none">