Merge remote branch 'origin/stable'

2011-12-08 14:20:38 -06:00 · 2011-12-08 14:20:38 -06:00 · 944c59c85e
parent a09a87f541 bd6cdfafce
commit 944c59c85e
2 changed files with 3 additions and 1 deletions
--- a/scoreboard.html
+++ b/scoreboard.html
@ -27,6 +27,7 @@
      }
      body {
        background: url(bg.jpg) #222;
        background-size: 100% auto;
        color: #eee;
        font-family: Most Wazted, fantasy;
        font-size: 5em;
--- a/style.css
+++ b/style.css
@ -4,6 +4,7 @@
 }
 body {
    background: #222 url(bg.jpg);
    background-size: 100% auto;
    color: #eee;
    max-width: 40em;
    margin: auto auto;