Skip to content

Commit

Permalink
misc bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexadam
alexadam committed Nov 2, 2016
1 parent 29f3877 commit 58efdd4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 17 deletions.
11 changes: 5 additions & 6 deletions lib/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ return /******/ (function(modules) { // webpackBootstrap


// module
exports.push([module.id, ".SSUI-LiveEvents {\n width: 100%;\n box-sizing: border-box; }\n\n.SSUI-LiveEvents-Header {\n width: 100%;\n display: flex;\n flex-flow: row;\n position: relative;\n background-color: rgba(211, 217, 229, 0.5);\n padding: 5px 0;\n box-shadow: 0 0 5px 7px transparent; }\n\n.SSUI-LiveEvents-Header-Home {\n width: 40%;\n margin: 0;\n flex-grow: 1;\n text-align: center;\n display: flex;\n flex-flow: column;\n color: black; }\n\n.SSUI-LiveEvents-Header-Data {\n width: 20%;\n margin: 0;\n display: flex;\n flex-flow: column;\n justify-content: center; }\n\n.SSUI-LiveEvents-Header-Data-Score {\n font-size: 3em;\n text-align: center;\n color: black; }\n\n.SSUI-LiveEvents-Header-Data-Time {\n text-align: center;\n margin-top: 0.1em;\n color: black;\n font-size: 1.25em; }\n\n.SSUI-LiveEvents-Header-Away {\n width: 40%;\n margin: 0;\n flex-grow: 1;\n text-align: center;\n display: flex;\n flex-flow: column;\n color: black; }\n\n.SSUI-LiveEvents-Header-Logo {\n width: 4em;\n height: auto;\n margin: 0;\n align-self: center; }\n .SSUI-LiveEvents-Header-Logo img {\n width: 100%;\n height: auto; }\n\n.SSUI-LiveEvents-Header-Text {\n margin: 0;\n font-weight: bold; }\n\n.SSUI-LiveEvents-List {\n margin-top: 1em;\n padding: 0 0.5em;\n height: 30em;\n overflow-y: auto; }\n\n.SSUI-LiveEvents-List-ExpandCollapse {\n position: absolute;\n right: 0;\n top: 0;\n background: orange;\n color: black;\n display: block;\n border: none;\n outline: none;\n padding: 0;\n margin: 0;\n width: 20px;\n height: 20px;\n font-weight: bold; }\n\n.SSUI-LiveEvents-List-ExpandCollapse:hover {\n cursor: pointer; }\n", ""]);
exports.push([module.id, ".SSUI-LiveEvents {\n width: 100%;\n box-sizing: border-box; }\n\n.SSUI-LiveEvents-Header {\n width: 100%;\n display: flex;\n flex-flow: row;\n position: relative;\n background-color: rgba(255, 255, 255, 0);\n border-bottom: solid 3px #ccc;\n padding: 5px 0;\n box-shadow: 0 0 5px 7px transparent; }\n\n.SSUI-LiveEvents-Header-Home {\n width: 40%;\n margin: 0;\n flex-grow: 1;\n text-align: center;\n display: flex;\n flex-flow: column;\n color: black; }\n\n.SSUI-LiveEvents-Header-Data {\n width: 20%;\n margin: 0;\n display: flex;\n flex-flow: column;\n justify-content: center; }\n\n.SSUI-LiveEvents-Header-Data-Score {\n font-size: 3em;\n text-align: center;\n color: black; }\n\n.SSUI-LiveEvents-Header-Data-Time {\n text-align: center;\n margin-top: 0.1em;\n color: black;\n font-size: 1.25em; }\n\n.SSUI-LiveEvents-Header-Away {\n width: 40%;\n margin: 0;\n flex-grow: 1;\n text-align: center;\n display: flex;\n flex-flow: column;\n color: black; }\n\n.SSUI-LiveEvents-Header-Logo {\n width: 4em;\n height: auto;\n margin: 0;\n align-self: center; }\n .SSUI-LiveEvents-Header-Logo img {\n width: 100%;\n height: auto; }\n\n.SSUI-LiveEvents-Header-Text {\n margin: 0;\n font-weight: bold; }\n\n.SSUI-LiveEvents-List {\n margin-top: 1em;\n padding: 0 0.5em;\n height: 40em;\n overflow-y: auto; }\n\n.SSUI-LiveEvents-List-ExpandCollapse {\n position: absolute;\n right: 0;\n top: 0;\n background: rgba(255, 255, 255, 0.15);\n color: black;\n display: block;\n border: none;\n outline: none;\n padding: 0;\n margin: 0;\n width: 20px;\n height: 20px;\n font-weight: bold; }\n\n.SSUI-LiveEvents-List-ExpandCollapse:hover {\n cursor: pointer; }\n", ""]);

// exports

Expand Down Expand Up @@ -724,7 +724,7 @@ return /******/ (function(modules) { // webpackBootstrap


// module
exports.push([module.id, ".SSUI-LiveEvent {\n width: 100%;\n display: block;\n display: flex;\n flex-flow: row;\n box-sizing: border-box;\n border-bottom: solid 1px rgba(255, 255, 255, 0.2);\n background-color: rgba(255, 255, 255, 0);\n padding: 8px; }\n\n.SSUI-LiveEvent:nth-of-type(2n) {\n background-color: rgba(255, 255, 255, 0); }\n\n.SSUI-LiveEvent:nth-of-type(2n+1) {\n background-color: rgba(255, 255, 255, 0); }\n\n.SSUI-LiveEvent-Home {\n width: 40%;\n flex-grow: 1;\n display: block;\n margin: 0;\n text-align: center;\n display: flex;\n flex-flow: column;\n justify-content: center; }\n\n.SSUI-LiveEvent-Logo {\n width: calc(20%/3);\n display: flex;\n flex-flow: column;\n justify-content: center;\n margin: 0 8px;\n text-align: center; }\n .SSUI-LiveEvent-Logo img {\n max-width: 30px;\n width: 1.25em;\n height: auto;\n align-self: center; }\n\n.SSUI-LiveEvent-Time {\n width: calc(20%/3);\n display: flex;\n flex-flow: column;\n justify-content: center;\n margin: 0;\n vertical-align: middle; }\n .SSUI-LiveEvent-Time span {\n background-color: rgba(255, 255, 255, 0.35);\n border-radius: 3px;\n padding: 2px 5px;\n color: black;\n align-self: center;\n min-width: 1.5em;\n text-align: center; }\n\n.SSUI-LiveEvent-Away {\n width: 40%;\n flex-grow: 1;\n display: flex;\n flex-flow: column;\n justify-content: center;\n margin: 0;\n text-align: center; }\n\n.SSUI-LiveEvent-Text {\n width: 100%;\n display: block;\n margin: 0;\n text-align: center; }\n\n.SSUI-LiveEvent-Text-Button {\n background-color: transparent;\n border: none;\n outline: none;\n cursor: pointer;\n padding: 0;\n color: white; }\n\n.SSUI-LiveEvent-Text-Button:hover {\n background-color: rgba(255, 255, 255, 0.4);\n padding: 0px 5px; }\n", ""]);
exports.push([module.id, ".SSUI-LiveEvent {\n width: 100%;\n display: block;\n display: flex;\n flex-flow: row;\n box-sizing: border-box;\n border-bottom: solid 1px rgba(255, 255, 255, 0.2);\n background-color: rgba(255, 255, 255, 0);\n padding: 4px; }\n\n.SSUI-LiveEvent:nth-of-type(2n) {\n background-color: rgba(255, 255, 255, 0); }\n\n.SSUI-LiveEvent:nth-of-type(2n+1) {\n background-color: rgba(255, 255, 255, 0); }\n\n.SSUI-LiveEvent-Home {\n width: 40%;\n flex-grow: 1;\n display: block;\n margin: 0;\n text-align: center;\n display: flex;\n flex-flow: column;\n justify-content: center; }\n\n.SSUI-LiveEvent-Logo {\n width: calc(20%/3);\n display: flex;\n flex-flow: column;\n justify-content: center;\n margin: 0 8px;\n text-align: center; }\n .SSUI-LiveEvent-Logo img {\n max-width: 30px;\n width: 1.25em;\n height: auto;\n align-self: center; }\n\n.SSUI-LiveEvent-Time {\n width: calc(20%/3);\n display: flex;\n flex-flow: column;\n justify-content: center;\n margin: 0;\n vertical-align: middle; }\n .SSUI-LiveEvent-Time span {\n background-color: #ccc;\n border-radius: 3px;\n padding: 2px 5px;\n color: black;\n align-self: center;\n min-width: 1.5em;\n text-align: center; }\n\n.SSUI-LiveEvent-Away {\n width: 40%;\n flex-grow: 1;\n display: flex;\n flex-flow: column;\n justify-content: center;\n margin: 0;\n text-align: center; }\n\n.SSUI-LiveEvent-Text {\n width: 100%;\n display: block;\n margin: 0;\n text-align: center; }\n\n.SSUI-LiveEvent-Text-Button {\n background-color: transparent;\n border: none;\n outline: none;\n cursor: pointer;\n padding: 0;\n color: white; }\n\n.SSUI-LiveEvent-Text-Button:hover {\n background-color: rgba(255, 255, 255, 0.4);\n padding: 0px 5px; }\n", ""]);

// exports

Expand Down Expand Up @@ -798,7 +798,6 @@ return /******/ (function(modules) { // webpackBootstrap
}, _this.displayTShirts = function () {
var perspective = _this.props.perspective || true;

// let svg = d3.select('#SSUI-Field2D').append('svg');
var svg = d3.select(_reactDom2.default.findDOMNode(_this)).append('svg');

svg.attr({
Expand Down Expand Up @@ -10886,7 +10885,7 @@ return /******/ (function(modules) { // webpackBootstrap
var tShirtNrStartX = imgWidth - tShirtNrDim;
var tShirtNrStartY = imgHeight - textHeight - tShirtNrDim;
var tShirtNrFontSize = 60;
var playerNameFontSize = 20;
var playerNameFontSize = 30;
var tShirtNrLeftPadding = playerData.tShirtNr > 9 ? 5 : 20;

if (!isHomeTeam) {
Expand Down Expand Up @@ -10915,7 +10914,7 @@ return /******/ (function(modules) { // webpackBootstrap

ctx.fillStyle = 'white';
ctx.font = playerNameFontSize + 'px Arial';
ctx.fillText(playerData.name, 5, tShirtDim + textHeight / 2 + 5);
ctx.fillText(playerData.name, 5, tShirtDim + textHeight / 2 + 10);

// tshirt number
ctx.fillStyle = 'rgba(255,255,255,0.75)';
Expand Down Expand Up @@ -54241,7 +54240,7 @@ return /******/ (function(modules) { // webpackBootstrap


// module
exports.push([module.id, ".SSUI-GameStats {\n display: flex;\n flex-flow: row;\n width: 100%;\n padding: 0;\n font-size: 12px; }\n\n.SSUI-GameStats-Zone {\n display: flex;\n flex-flow: column;\n padding: 0; }\n\n.SSUI-GameStats-Player {\n display: flex;\n flex-flow: row;\n border-bottom: solid 1px rgba(255, 255, 255, 0.25); }\n\n.SSUI-GameStats-TShirtNr {\n background-color: black;\n color: white;\n text-align: center;\n padding: 5px;\n min-width: 20px; }\n\n.SSUI-GameStats-PlayerName {\n flex-grow: 1;\n padding: 0 5px; }\n\n.SSUI-GameStats-Text-Button {\n color: white;\n background-color: transparent;\n padding: 5px;\n border: 0;\n outline: 0;\n cursor: pointer; }\n\n.SSUI-GameStats-Text-Button:hover {\n background-color: rgba(255, 255, 255, 0.4); }\n\n.SSUI-GameStats-Stats {\n display: flex;\n flex-flow: row;\n justify-content: space-between;\n padding: 2px 5px;\n border-bottom: solid 1px rgba(0, 0, 0, 0.25);\n background-color: #ccc;\n color: black;\n margin: 0 5px;\n box-shadow: 0 15px 30px rgba(0, 0, 0, 0.75); }\n\n.SSUI-GameStats-Stats-Number {\n text-align: center;\n padding: 0 5px; }\n\n.SSUI-GameStats-Stats-Type {\n text-align: center;\n padding: 0 2em;\n font-weight: bold; }\n\n.text-left {\n text-align: left; }\n\n.text-right {\n text-align: right; }\n\n.text-center {\n text-align: center; }\n\n.bigger {\n flex-grow: 1; }\n\n@media (max-width: 600px) {\n .SSUI-GameStats {\n flex-wrap: wrap; } }\n", ""]);
exports.push([module.id, ".SSUI-GameStats {\n display: flex;\n flex-flow: row;\n width: 100%;\n padding: 0;\n font-size: 12px; }\n\n.SSUI-GameStats-Zone {\n display: flex;\n flex-flow: column;\n padding: 0; }\n\n.SSUI-GameStats-Player {\n display: flex;\n flex-flow: row;\n border-bottom: solid 1px rgba(255, 255, 255, 0.25); }\n\n.SSUI-GameStats-TShirtNr {\n background-color: black;\n color: white;\n text-align: center;\n padding: 1px;\n min-width: 20px; }\n\n.SSUI-GameStats-PlayerName {\n flex-grow: 1;\n padding: 0 5px; }\n\n.SSUI-GameStats-Text-Button {\n color: white;\n background-color: transparent;\n padding: 0 5px;\n border: 0;\n outline: 0;\n cursor: pointer; }\n\n.SSUI-GameStats-Text-Button:hover {\n background-color: rgba(255, 255, 255, 0.4); }\n\n.SSUI-GameStats-Stats {\n display: flex;\n flex-flow: row;\n justify-content: space-between;\n padding: 2px 5px;\n border-bottom: solid 1px rgba(0, 0, 0, 0.25);\n background-color: #ccc;\n color: black;\n margin: 0 5px;\n box-shadow: 0 15px 30px rgba(0, 0, 0, 0.75); }\n\n.SSUI-GameStats-Stats-Number {\n text-align: center;\n padding: 0 5px; }\n\n.SSUI-GameStats-Stats-Type {\n text-align: center;\n padding: 0 2em;\n font-weight: bold; }\n\n.text-left {\n text-align: left; }\n\n.text-right {\n text-align: right; }\n\n.text-center {\n text-align: center; }\n\n.bigger {\n flex-grow: 1; }\n\n@media (max-width: 600px) {\n .SSUI-GameStats {\n flex-wrap: wrap; } }\n", ""]);

// exports

Expand Down
4 changes: 2 additions & 2 deletions src/field-3d/STLViewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ class STLViewer extends Component {
let tShirtNrStartX = imgWidth - tShirtNrDim;
let tShirtNrStartY = imgHeight - textHeight - tShirtNrDim;
let tShirtNrFontSize = 60;
let playerNameFontSize = 20;
let playerNameFontSize = 30;
let tShirtNrLeftPadding = playerData.tShirtNr > 9 ? 5 : 20;

if (!isHomeTeam) {
Expand Down Expand Up @@ -202,7 +202,7 @@ class STLViewer extends Component {

ctx.fillStyle = 'white';
ctx.font = playerNameFontSize + 'px Arial';
ctx.fillText(playerData.name, 5, tShirtDim + textHeight/2 + 5);
ctx.fillText(playerData.name, 5, tShirtDim + textHeight/2 + 10);

// tshirt number
ctx.fillStyle ='rgba(255,255,255,0.75)';
Expand Down
4 changes: 2 additions & 2 deletions src/game-stats/GameStats.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $statsColor: black;
background-color: $tShirtNrBgColor;
color: $tShirtNrColor;
text-align: center;
padding: 5px;
padding: 1px;
min-width: 20px;
}

Expand All @@ -43,7 +43,7 @@ $statsColor: black;
.SSUI-GameStats-Text-Button {
color: $playerNameColor;
background-color: $playerNameBgColor;
padding: 5px;
padding: 0 5px;
border: 0;
outline: 0;
cursor: pointer;
Expand Down
4 changes: 2 additions & 2 deletions src/live-events/LiveEvent.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $eventBackgroundColor: rgba(255, 255, 255, 0);
$eventBackgroundColorOdd: rgba(255, 255, 255, 0);
$eventBackgroundColorEven: rgba(255, 255, 255, 0);
$playerNameColor: rgba(255,255,255,1);
$eventTimeBackgroundColor: rgba(255, 255, 255, 0.35);
$eventTimeBackgroundColor: #ccc;
$eventTimeColor: black;

.SSUI-LiveEvent {
Expand All @@ -15,7 +15,7 @@ $eventTimeColor: black;
box-sizing: border-box;
border-bottom: $eventBottomBorder;
background-color: $eventBackgroundColor;
padding: 8px;
padding: 4px;
}

.SSUI-LiveEvent:nth-of-type(2n) {
Expand Down
10 changes: 5 additions & 5 deletions src/live-events/LiveEvents.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
$fontSize: 14px;
$textColor: rgba(255,255,255,1);
$teamNameColor: black;
$headerBackgrounfColor: #D3D9E5;
$headerBackgrounfColor: rgba(#D3D9E5, 0.5);
$headerBackgroundColor: rgba(#ffffff, 0);
$headerShadow: 0 0 5px 7px rgba(0, 0, 0, 0);
$scoreColor: black;
$timeColor: black;
$expandButtonBackgroundColor: orange;
$expandButtonBackgroundColor: rgba(#ffffff, 0.15);
$expandButtonColor: black;

.SSUI-LiveEvents {
Expand All @@ -20,7 +19,8 @@ $expandButtonColor: black;
display: flex;
flex-flow: row;
position: relative;
background-color: $headerBackgrounfColor;
background-color: $headerBackgroundColor;
border-bottom: solid 3px #ccc;
padding: 5px 0;
box-shadow: $headerShadow;
}
Expand Down Expand Up @@ -86,7 +86,7 @@ $expandButtonColor: black;
.SSUI-LiveEvents-List {
margin-top: 1em;
padding: 0 0.5em;
height: 30em;
height: 40em;
overflow-y: auto;
}

Expand Down

0 comments on commit 58efdd4

Please sign in to comment.