This repository has been archived by the owner on Jun 16, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 7
Referees 2018/table styling #36
Open
itamargreen
wants to merge
11
commits into
FirstLegoLeague:gh-pages
Choose a base branch
from
itamargreen:referees-2018/table-styling
base: gh-pages
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
827f03b
name column now takes all available space
itamargreen 9abf8eb
Table Styling
itamargreen 8fb9a6e
1st attempt at decent FLL screen
itamargreen 4809bec
Moved things around, added rounded border to event name.
itamargreen c245b3c
gradient in event name background color
itamargreen 89f0d33
formatting
itamargreen dfa4a80
Made suggested changes
itamargreen d3c3a24
made the changes requested, and also removed the ip autoconfig parts
itamargreen 2fb341c
used string literals for image source, as well as removed broken font…
itamargreen be4bcdb
changed the way event name box is styled.
itamargreen d84aadb
resetting config
itamargreen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,17 +8,17 @@ displaySystem.config({ | |
//modules, order determines z stacking | ||
modules: { | ||
'background': { | ||
// visible: false | ||
visible: false, | ||
color: 'black', | ||
//optional chromakey background color | ||
// color: "lime", | ||
}, | ||
'camera': { | ||
// visible: true, | ||
visible: false, | ||
// audio: true, | ||
}, | ||
'gallery': { | ||
visible: true, | ||
visible: false, | ||
transition: 'fade', | ||
size: 'cover', | ||
timeout: 4, | ||
|
@@ -33,74 +33,91 @@ displaySystem.config({ | |
], | ||
}, | ||
'clock': { | ||
visible: true, | ||
visible: false, | ||
// countdown: 20, | ||
}, | ||
'time': { | ||
visible: true, | ||
visible: false, | ||
// format: "MM:ss", | ||
}, | ||
'twitter': { | ||
// visible: true, | ||
// speed: 500, | ||
}, | ||
'lowThird': { | ||
visible: true, | ||
visible: false, | ||
line1: '❤️ press \'C\'', | ||
line2: 'to show the control window', | ||
}, | ||
'list': { | ||
// visible: true, | ||
header: 'results round 1', | ||
data: [ | ||
['🇳🇱 just try',1], | ||
['🇳🇱 to copy',2], | ||
['🇪🇬 and paste',3], | ||
['🇪🇬 some cells',4], | ||
['🇪🇬 from excel',5], | ||
['🇺🇸 into the control',6], | ||
['🇺🇸 window! You\'ll be',7], | ||
['🇺🇸 amazed!',8], | ||
['🇳🇱 It even has',8], | ||
['🇳🇱 automatic',8], | ||
['🇳🇱 paging',8], | ||
['🇳🇱 just try', 1], | ||
['🇳🇱 to copy', 2], | ||
['🇪🇬 and paste', 3], | ||
['🇪🇬 some cells', 4], | ||
['🇪🇬 from excel', 5], | ||
['🇺🇸 into the control', 6], | ||
['🇺🇸 window! You\'ll be', 7], | ||
['🇺🇸 amazed!', 8], | ||
['🇳🇱 It even has', 8], | ||
['🇳🇱 automatic', 8], | ||
['🇳🇱 paging', 8], | ||
], | ||
timer: 5000, | ||
lines: 8 | ||
lines: 12 | ||
}, | ||
'sprite': { | ||
// visible: true, | ||
visible: true, | ||
texts: [{ | ||
data:'2017 Regional, Modiin' | ||
} | ||
], | ||
sprites: [{ | ||
width: '100%', | ||
top: '3.5vh', | ||
fontSize: '8vh', | ||
textAlign: 'center', | ||
color: 'rgba(255,255,255,0.5)', | ||
html: 'FIRST LEGO League' | ||
side: 'top', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These are too specific for one tournament, I'd like to keep the default configuration lightweight and ready-to-go |
||
id: 'FIRST', | ||
alias: 'firstLegoLeague', | ||
imgClass: 'firstLogo', | ||
}, | ||
{ | ||
side: 'top', | ||
id: 'challenge', | ||
alias: 'challengeTheme', | ||
imgClass: 'challengeLogo' | ||
|
||
}, { | ||
side: 'top', | ||
id: 'LEGOEd', | ||
alias: 'legoEducation', | ||
imgClass: 'legoLogo', | ||
}, | ||
{ | ||
side: 'bottom', | ||
id: 'sponsor1', | ||
alias: 'sponsor1', | ||
imgClass: 'sponsor1Img', | ||
}, { | ||
side: 'bottom', | ||
id: 'sponsor2', | ||
alias: 'sponsor2', | ||
imgClass: 'sponsor2Img', | ||
|
||
}] | ||
}, | ||
'table': { | ||
// visible: true, | ||
header: ['team name', 'number', 'score 1', 'score 2'], | ||
visible: true, | ||
header: ['rank', 'NO.', 'name', 'best', '1', '2', '3'], | ||
data: [ | ||
['yuby',1, 100, 167], | ||
['ahgf',2, 120, 198], | ||
['butny',3, 10, 387], | ||
['batey',4, 140, 243], | ||
['meroy',5, 101, 543], | ||
['marnc',6, 123, 198], | ||
['arben',7, 189, 123], | ||
['opic',8, 203, 431], | ||
['poner',9, 403, 142], | ||
['notar',10, 257, 289], | ||
['serminc',11, 143, 365], | ||
['--', '--', ' ', '--', '--', '--', '--'], | ||
|
||
], | ||
timer: 10000, | ||
lines: 8 | ||
}, | ||
'css': { | ||
href: [ | ||
'themes/rednblue-plus/rednblue-plus.css', | ||
'themes/fll/flltable.css', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why? |
||
// 'themes/rednblue-plus/rednblue-plus-mod-rtl.css', | ||
// 'themes/rednblue-plus/rednblue-plus-mod-opaque.css' | ||
], | ||
|
@@ -115,7 +132,7 @@ displaySystem.config({ | |
zoom: 1, | ||
aspect: 'native', | ||
rotation: 0, | ||
overscan: [0,0,0,0] | ||
overscan: [0, 0, 0, 0] | ||
}, | ||
'keybindings': { | ||
'q': 'time.show()', | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
12 lines don't fit with the lower third visible