diff --git a/static/css/audience_display.css b/static/css/audience_display.css index 949680e..bcd6d96 100644 --- a/static/css/audience_display.css +++ b/static/css/audience_display.css @@ -115,12 +115,12 @@ html { } #logo { position: relative; - top: 35px; - height: 65px; + top: 50px; + height: 35px; } #matchTime { position: relative; - top: 18px; + top: 35px; height: 60px; color: #222; font-family: "FuturaLTBold"; @@ -191,8 +191,8 @@ html { } #blindsLogo { position: relative; - top: 75px; - height: 130px; + top: 110px; + height: 75px; } #finalScore { position: fixed; @@ -342,7 +342,7 @@ html { font-size: 3.5em; } #allianceSelectionTable img { - width: 3em; + width: 7em; margin: 0.75em; } #allianceSelectionTable tr:nth-child(even) { diff --git a/static/img/alliance-station-logo.png b/static/img/alliance-station-logo.png deleted file mode 100644 index 381a6bc..0000000 Binary files a/static/img/alliance-station-logo.png and /dev/null differ diff --git a/static/img/alliance-station-logo.svg b/static/img/alliance-station-logo.svg new file mode 100644 index 0000000..938c84b --- /dev/null +++ b/static/img/alliance-station-logo.svg @@ -0,0 +1,3074 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/img/game-logo.png b/static/img/game-logo.png deleted file mode 100644 index 381a6bc..0000000 Binary files a/static/img/game-logo.png and /dev/null differ diff --git a/static/img/game-logo.svg b/static/img/game-logo.svg new file mode 100644 index 0000000..938c84b --- /dev/null +++ b/static/img/game-logo.svg @@ -0,0 +1,3074 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/js/audience_display.js b/static/js/audience_display.js index 6ead8e1..15ff097 100644 --- a/static/js/audience_display.js +++ b/static/js/audience_display.js @@ -126,7 +126,7 @@ var transitionBlankToIntro = function(callback) { }; var transitionIntroToInMatch = function(callback) { - $("#logo").transition({queue: false, top: "20px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "35px"}, 500, "ease"); $(".score").transition({queue: false, width: "230px"}, 500, "ease", function() { $(".score-number").transition({queue: false, opacity: 1}, 750, "ease"); $("#matchTime").transition({queue: false, opacity: 1}, 750, "ease", callback); @@ -146,7 +146,7 @@ var transitionIntroToBlank = function(callback) { var transitionBlankToInMatch = function(callback) { $("#centering").transition({queue: false, bottom: "0px"}, 500, "ease", function() { $(".teams").transition({queue: false, width: "75px"}, 100, "linear", function() { - $("#logo").transition({queue: false, top: "20px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "35px"}, 500, "ease"); $(".score").transition({queue: false, width: "230px"}, 500, "ease", function() { $("#eventMatchInfo").show(); $(".score-number").transition({queue: false, opacity: 1}, 750, "ease"); @@ -161,7 +161,7 @@ var transitionBlankToInMatch = function(callback) { var transitionInMatchToIntro = function(callback) { $(".score-number").transition({queue: false, opacity: 0}, 300, "linear"); $("#matchTime").transition({queue: false, opacity: 0}, 300, "linear", function() { - $("#logo").transition({queue: false, top: "35px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "50px"}, 500, "ease"); $(".score").transition({queue: false, width: "120px"}, 500, "ease"); $(".teams").transition({queue: false, width: "75px"}, 500, "ease", callback); }); @@ -172,7 +172,7 @@ var transitionInMatchToBlank = function(callback) { $("#matchTime").transition({queue: false, opacity: 0}, 300, "linear"); $(".score-number").transition({queue: false, opacity: 0}, 300, "linear", function() { $("#eventMatchInfo").hide(); - $("#logo").transition({queue: false, top: "35px"}, 500, "ease"); + $("#logo").transition({queue: false, top: "50px"}, 500, "ease"); $(".score").transition({queue: false, width: "0px"}, 500, "ease"); $(".teams").transition({queue: false, width: "40px"}, 500, "ease", function() { $("#centering").transition({queue: false, bottom: "-340px"}, 1000, "ease", callback); diff --git a/templates/alliance_station_display.html b/templates/alliance_station_display.html index 404a381..54af296 100644 --- a/templates/alliance_station_display.html +++ b/templates/alliance_station_display.html @@ -30,7 +30,7 @@
FIELD
RESET