From: Steinar H. Gunderson Date: Sun, 18 Mar 2018 11:17:43 +0000 (+0100) Subject: Change to NM color theme again. X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=19c3289f1aa2a338f16efca9bb608e85a430a417;p=ultimatescore Change to NM color theme again. - Update the hand signals with no-moustache variants. - Switch from Lato to Exo again. - Change color scheme for NM. - NM lower thirds. --- diff --git a/box-bg.png b/box-bg.png new file mode 100644 index 0000000..8f059ee Binary files /dev/null and b/box-bg.png differ diff --git a/foul.png b/foul.png index e9bdef6..07953f9 100644 Binary files a/foul.png and b/foul.png differ diff --git a/foul.svg b/foul.svg index cd4b3a5..aa81c85 100644 --- a/foul.svg +++ b/foul.svg @@ -15,33 +15,21 @@ viewBox="0 0 210 297" version="1.1" id="svg11445" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.92.3pre0 (0ab9bec, 2018-03-03)" sodipodi:docname="foul.svg"> + id="linearGradient4636"> + id="stop4632" /> - - - - + id="stop4634" /> - - - - - @@ -228,27 +193,7 @@ gradientTransform="matrix(0.16299088,0,0,1.3685556,14.862771,-7.7508786)" /> - - - + + + image/svg+xml - + @@ -341,13 +306,407 @@ y="50.06245" inkscape:export-xdpi="254" inkscape:export-ydpi="254" /> - + + - - - - - - - - - - + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + inkscape:export-xdpi="254" + inkscape:export-ydpi="254" /> - + + + diff --git a/lowerthird-bg.png b/lowerthird-bg.png index ea954d9..67a96ec 100644 Binary files a/lowerthird-bg.png and b/lowerthird-bg.png differ diff --git a/lowerthird-bg2.png b/lowerthird-bg2.png index 9d22d8c..d5566ab 100644 Binary files a/lowerthird-bg2.png and b/lowerthird-bg2.png differ diff --git a/out.png b/out.png index c4e43c0..7019713 100644 Binary files a/out.png and b/out.png differ diff --git a/out.svg b/out.svg index 02fe295..4a7bf57 100644 --- a/out.svg +++ b/out.svg @@ -15,33 +15,21 @@ viewBox="0 0 210 297" version="1.1" id="svg11445" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.92.3pre0 (0ab9bec, 2018-03-03)" sodipodi:docname="out.svg"> + id="linearGradient4636"> + id="stop4632" /> - - - - + id="stop4634" /> - - - - - @@ -228,27 +193,7 @@ gradientTransform="matrix(0.16299088,0,0,1.3685556,14.862771,-7.7508786)" /> - - - + + + - + - - - - - - - - - + inkscape:connector-curvature="0" + inkscape:export-xdpi="254" + inkscape:export-ydpi="254" /> - + + + diff --git a/pick.png b/pick.png index 8e31213..09289cf 100644 Binary files a/pick.png and b/pick.png differ diff --git a/pick.svg b/pick.svg index 8e80656..66683c6 100644 --- a/pick.svg +++ b/pick.svg @@ -15,33 +15,21 @@ viewBox="0 0 210 297" version="1.1" id="svg11445" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.92.3pre0 (0ab9bec, 2018-03-03)" sodipodi:docname="pick.svg"> + id="linearGradient4636"> + id="stop4632" /> - - - - + id="stop4634" /> - - - - - @@ -228,27 +193,7 @@ gradientTransform="matrix(0.16299088,0,0,1.3685556,14.862771,-7.7508786)" /> - - - + + + - + + - - - - - - - - - - + inkscape:connector-curvature="0" + inkscape:export-xdpi="254" + inkscape:export-ydpi="254" /> - + + + diff --git a/score.css b/score.css index f35086a..a5b5d5b 100644 --- a/score.css +++ b/score.css @@ -14,12 +14,12 @@ body { transform-origin: top left; */ } body { - font-family: 'Lato', sans-serif; - color: white; + font-family: 'Exo', sans-serif; + color: #222; /* Needs to be adjusted per-font! 2px/4px is a good choice for Exo. */ - --main-padding-top-adjust: 0px; - --main-padding-top-large-adjust: 0px; + --main-padding-top-adjust: 2px; + --main-padding-top-large-adjust: 4px; } #entire-bug { @@ -35,11 +35,11 @@ body { top: 10px; border-collapse: collapse; white-space: nowrap; - border: 1px solid black; + border: 1px solid #ccc; z-index: 1; } .scorebug td { - border: 1px solid #000; + border: 1px solid #ccc; } .scorebug2 { /*top: 52px; */ @@ -59,35 +59,35 @@ body { } .team1color { background-color: red; - background-image: linear-gradient(to right, rgba(0,0,0,0.2), rgba(0,0,0,0.05) 3px, rgba(0,0,0,0)); + background-image: linear-gradient(to right, rgba(255,255,255,0.2), rgba(255,255,255,0.05) 3px, rgba(255,255,255,0)); } .team2color { background-color: green; - background-image: linear-gradient(to left, rgba(0,0,0,0.2), rgba(0,0,0,0.05) 3px, rgba(0,0,0,0)); + background-image: linear-gradient(to left, rgba(255,255,255,0.2), rgba(255,255,255,0.05) 3px, rgba(255,255,255,0)); } .team1, .team2 { font-weight: bold; width: 100px; text-align: center; height: 35px; - background: linear-gradient(to bottom, #00a, #008); + background: linear-gradient(to bottom, #fff, #eee); padding-top: var(--main-padding-top-adjust); } #score2_team1, #score2_team2 { - background: linear-gradient(to bottom, #00a8, #0088); + background: linear-gradient(to bottom, #fff8, #eee8); } #score2_team1, #score2_team2, #score2_score { height: 30px; } .score { text-align: center; - background: linear-gradient(to bottom, #00c, #00a); + background: linear-gradient(to bottom, #fff, #eee); width: 110px; height: 35px; padding-top: var(--main-padding-top-adjust); } #score2_score { - background: linear-gradient(to bottom, #00c8, #00a8); + background: linear-gradient(to bottom, #fff8, #eee8); } /* Clock, to the right of score */ @@ -98,18 +98,18 @@ body { top: 10px; border-collapse: collapse; white-space: nowrap; - border: 1px solid black; + border: 1px solid #ccc; } .clock { - border: 1px solid #000; - background: linear-gradient(to bottom, #00a, #008); + border: 1px solid #ccc; + background: linear-gradient(to bottom, #fff, #eee); text-align: center; height: 35px; padding-top: var(--main-padding-top-adjust); width: 90px; } #clock2 { - background: linear-gradient(to bottom, #00a8, #0088); + background: linear-gradient(to bottom, #fff8, #eee8); height: 30px; } .clockbug-hidden { @@ -131,11 +131,11 @@ body { top: 52px; border-collapse: collapse; white-space: nowrap; - border: 1px solid black; + border: 1px solid #ccc; } .comment { - border: 1px solid #000; - background: linear-gradient(to bottom, #00a, #008); + border: 1px solid #ccc; + background: linear-gradient(to bottom, #fff, #eee); text-align: center; height: 30px; width: 334px; @@ -160,7 +160,7 @@ body { top: 520px; border-collapse: collapse; white-space: nowrap; - border: 2px solid #ccc; + border: 1px solid #ccc; height: 118px; font-weight: bold; width: 1050px; @@ -208,7 +208,7 @@ body { width: 600px; border-collapse: collapse; white-space: nowrap; - border: 1px solid black; + border: 1px solid #6ad; /*display: flex; align-items: center; */ /*background: linear-gradient(to right, #44c, #33a 15px); */ @@ -334,7 +334,7 @@ body { } #carousel tr { /* background: rgba(0, 0, 170, 0.8); */ - background: linear-gradient(to bottom, rgba(0, 0, 170, 0.9), rgba(0, 0, 130, 0.9)); + background: linear-gradient(to bottom, rgba(255, 255, 255, 0.9), rgba(255, 255, 255, 0.8)); /* -webkit-animation: fade-in calc(counter(rowNumber) * 1.0)s ease; */ -webkit-animation: fade-in calc(counter-value(rowNumber) * 1.0s) ease; } @@ -446,11 +446,11 @@ body { @-webkit-keyframes scale-in { 0% { width: 1050px; - border: 2px solid #ccc; + border: 1px solid #ccc; } 100% { width: 0px; - border: 2px solid #ccc; + border: 1px solid #ccc; } } @-webkit-keyframes scale-in-no-border { @@ -471,7 +471,7 @@ body { } 20% { width: 0px; - border: 1px solid black; + border: 1px solid #6ad; } 100% { width: 600px; @@ -480,11 +480,11 @@ body { @-webkit-keyframes scale-in-small { 0% { width: 600px; - border: 1px solid black; + border: 1px solid #6ad; } 80% { width: 0px; - border: 1px solid black; + border: 1px solid #6ad; } 80.01% { border: 0px; diff --git a/score.html b/score.html index f3b6350..08873cb 100644 --- a/score.html +++ b/score.html @@ -3,8 +3,7 @@ - - + diff --git a/stall.png b/stall.png index 60c0b3e..b5d9b34 100644 Binary files a/stall.png and b/stall.png differ diff --git a/stall.svg b/stall.svg index 13b4b54..803ff9d 100644 --- a/stall.svg +++ b/stall.svg @@ -15,33 +15,21 @@ viewBox="0 0 210 297" version="1.1" id="svg11445" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.92.3pre0 (0ab9bec, 2018-03-03)" sodipodi:docname="stall.svg"> + id="linearGradient4636"> + id="stop4632" /> - - - - + id="stop4634" /> - - - - - @@ -228,27 +193,7 @@ gradientTransform="matrix(0.16299088,0,0,1.3685556,14.862771,-7.7508786)" /> - - - + + + - + - - - - - - - - - + inkscape:connector-curvature="0" + inkscape:export-xdpi="254" + inkscape:export-ydpi="254" /> - + + + diff --git a/travel.png b/travel.png index 47058a5..ef98b8d 100644 Binary files a/travel.png and b/travel.png differ diff --git a/travel.svg b/travel.svg index 5a24d7a..0b92e49 100644 --- a/travel.svg +++ b/travel.svg @@ -15,33 +15,21 @@ viewBox="0 0 210 297" version="1.1" id="svg11445" - inkscape:version="0.92.2 (5c3e80d, 2017-08-06)" + inkscape:version="0.92.3pre0 (0ab9bec, 2018-03-03)" sodipodi:docname="travel.svg"> + id="linearGradient4636"> + id="stop4632" /> - - - - + id="stop4634" /> - - - - - @@ -228,27 +193,7 @@ gradientTransform="matrix(0.16299088,0,0,1.3685556,14.862771,-7.7508786)" /> - - - + + + image/svg+xml - + @@ -341,13 +306,402 @@ y="50.06245" inkscape:export-xdpi="254" inkscape:export-ydpi="254" /> - + - - - - - - - - - - + + inkscape:connector-curvature="0" + inkscape:export-xdpi="254" + inkscape:export-ydpi="254" /> - + + +