summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlicia <alicia@ubuntu.ubuntu-domain>2012-08-07 00:50:43 -0700
committerAlicia <alicia@ubuntu.ubuntu-domain>2012-08-07 00:50:43 -0700
commit8f26af99d48ea552e92ccae18104ac4e4368c67e (patch)
tree20e1f274efbed8495b037660cef7c8461d79469f
parent655a603ecd9951ee8a8d73b724ed44c5d04802c9 (diff)
parentd63721adde9a6790973b9aedda4ad0aae8ae57cf (diff)
downloadfoosball-8f26af99d48ea552e92ccae18104ac4e4368c67e.tar.gz
et tout le monde au dodo
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--bracket.html (renamed from tableau.html)26
-rw-r--r--rules.html8
-rw-r--r--schedule.html51
-rw-r--r--style.css100
-rw-r--r--teams.html28
-rw-r--r--teams.txt10
7 files changed, 161 insertions, 64 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b72f9be
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*~
+*.swp
diff --git a/tableau.html b/bracket.html
index cb3aa6e..2164567 100644
--- a/tableau.html
+++ b/bracket.html
@@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>Technicolor's Foosball Tournament</title>
<link rel="stylesheet" type="text/css" href="style.css">
+ <link href='http://fonts.googleapis.com/css?family=Nunito:300,700' rel='stylesheet' type='text/css'>
</head>
<body>
<div id="content">
@@ -13,8 +14,8 @@
</header>
<menu>
<ul>
- <li><a href="tableau.html">Bracket</a></li>
<li><a href="teams.html">Teams</a></li>
+ <li><a href="schedule.html">Schedule</a></li>
<li><a href="rules.html">Rules</a></li>
</ul>
</menu>
@@ -22,7 +23,9 @@
<!-- list of games -->
<article id="bracket">
- <!-- group stage -->
+ <h1>Bracket</h1>
+
+ <!-- group stage -->
<div id="listGroups">
<div id="groupA" class="group">
<h2>GROUP A</h2>
@@ -121,25 +124,6 @@
- <div id="calendar">
-
- <h2>Games schedule</h2>
-
- <h3>Wednesday, August 8th</h3>
- <table>
- <tr><td><strong>3:30pm</strong></td><td>Group A - Gaijin vs Olympic Croquets</td></tr>
- <tr><td><strong>3:45pm</strong></td><td>Group B - Night Hawks vs Cake and Death</td></tr>
- <tr><td><strong>4:00pm</strong></td><td>Groups C - Red and Ruskie vs {Sandy, ?}</td></tr>
- <tr><td><strong>4:15pm</strong></td><td>Group D - {Nadia, Salman} vs {Nina, Smriti}</td></tr>
- <tr><td><strong>4:30pm</strong></td><td>Group A - {Pedro, ?} vs Gaijin</td></tr>
- <tr><td><strong>5:00pm</strong></td><td>Group C - {Vijay, Zhen} vs Red and Ruskie</td></tr>
- <tr><td><strong>5:15pm</strong></td><td>Group A - Olympics Croquet vs {Pedro, ?}</td></tr>
- <tr><td><strong>5:30pm</strong></td><td>Group C - {Sandy, ?} vs {Vijay, Zhen}</td></tr>
- </table>
-
-
-
- </div>
diff --git a/rules.html b/rules.html
index 69a083a..af718dd 100644
--- a/rules.html
+++ b/rules.html
@@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>Rules - Technicolor's Series of Foosball</title>
<link rel="stylesheet" type="text/css" href="style.css">
+ <link href='http://fonts.googleapis.com/css?family=Nunito:300,700' rel='stylesheet' type='text/css'>
</head>
<body>
<div id="content">
@@ -13,13 +14,15 @@
</header>
<menu>
<ul>
- <li><a href="tableau.html">Bracket</a></li>
+ <li><a href="bracket.html">Bracket</a></li>
<li><a href="teams.html">Teams</a></li>
- <li><a href="rules.html">Rules</a></li>
+ <li><a href="schedule.html">Schedule</a></li>
</ul>
</menu>
<article>
+ <div class="readable">
+
<h1>Rules</h1>
<h2>Definitions</h2>
@@ -90,6 +93,7 @@
<li>Scoring from the midfield during the game</li>
<li>Scoring from the attack rod without stopping the ball first</li>
</ul></p>
+ </div> <!-- readable -->
</article>
<footer>
© Copyright 2012, Entité TriCastor
diff --git a/schedule.html b/schedule.html
new file mode 100644
index 0000000..b0d4cdd
--- /dev/null
+++ b/schedule.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<html lang="fr">
+<head>
+ <meta charset="utf-8">
+ <title>Technicolor's Foosball Tournament</title>
+ <link rel="stylesheet" type="text/css" href="style.css">
+ <link href='http://fonts.googleapis.com/css?family=Nunito:300,700' rel='stylesheet' type='text/css'>
+</head>
+<body>
+ <div id="content">
+ <header>
+ <h1>Technicolor's Series of Foosball</h1>
+ <p>The coolest Bay Area event</p>
+ </header>
+ <menu>
+ <ul>
+ <li><a href="bracket.html">Bracket</a></li>
+ <li><a href="teams.html">Teams</a></li>
+ <li><a href="rules.html">Rules</a></li>
+ </ul>
+ </menu>
+
+ <!-- list of games -->
+ <article id="bracket">
+ <h1>Games schedule</h1>
+
+ <div id="calendar">
+
+
+ <h3>Wednesday, August 8th</h3>
+ <table>
+ <tr><td><strong>3:30pm</strong></td><td>Group A - Gaijin vs Olympic Croquets</td></tr>
+ <tr><td><strong>3:45pm</strong></td><td>Group B - Night Hawks vs Cake and Death</td></tr>
+ <tr><td><strong>4:00pm</strong></td><td>Groups C - Red and Ruskie vs {Sandy, ?}</td></tr>
+ <tr><td><strong>4:15pm</strong></td><td>Group D - {Nadia, Salman} vs {Nina, Smriti}</td></tr>
+ <tr><td><strong>4:30pm</strong></td><td>Group A - {Pedro, ?} vs Gaijin</td></tr>
+ <tr><td><strong>5:00pm</strong></td><td>Group C - {Vijay, Zhen} vs Red and Ruskie</td></tr>
+ <tr><td><strong>5:15pm</strong></td><td>Group A - Olympics Croquet vs {Pedro, ?}</td></tr>
+ <tr><td><strong>5:30pm</strong></td><td>Group C - {Sandy, ?} vs {Vijay, Zhen}</td></tr>
+ </table>
+ </div> <!-- calendar -->
+
+ </article>
+
+
+ <footer>
+ © Copyright 2012, Entité TriCastor
+ </footer>
+ </div>
+</body>
+</html>
diff --git a/style.css b/style.css
index 4b26ec4..3be6e14 100644
--- a/style.css
+++ b/style.css
@@ -1,28 +1,29 @@
/* page structure */
body {
- font-family: "Helvetica Neue", Helvetica, sans-serif;
- background-color: #abe;
+ font-family: "Nunito", "Helvetica Neue", Helvetica, sans-serif;
+ background-color: #765;
+ margin-top: 0;
+ padding-top: 0;
}
#content {
width: 1200px;
margin-left: auto;
margin-right: auto;
- margin-top: .5em;
+ margin-top: 0;
+ padding-top: 0;
border: thin solid #333;
background-color: white;
- border-top-left-radius: .75em;
- border-top-right-radius: .75em;
+ border-top: 0;
}
header {
- background: -moz-linear-gradient(top, #ffa, #9d9);
+ background: -moz-linear-gradient(top, #acf, #dfe);
padding: 1em 3em 1em;
color: #333;
border-bottom: thin solid #d6d6d6;
- border-top-left-radius: .75em;
- border-top-right-radius: .75em;
- margin: 0
+ border-top: 0;
+ margin: 0;
}
footer {
@@ -37,18 +38,36 @@ footer {
article {
padding: 1em 3em 1em;
+ background-color: #fff;
+}
+
+article#bracket {
font-size: 85%;
- background-color: #F0F0C3
}
menu {
margin: 0;
padding: 0.5em;
- background-color: #ddd;
+ background-color: #eee;
border-top: thin solid #a0a0a0;
border-bottom: thin solid #a0a0a0;
}
+menu a {
+ font-weight: bold;
+ color: #644;
+}
+
+menu a:visited {
+ text-decoration: underline;
+ color: #644;
+}
+
+
+menu a:hover {
+ color: #f6f;
+}
+
menu ul {
list-style: none;
padding: 0
@@ -79,7 +98,8 @@ header h1 {
article h1 {
text-align: center;
- font-size: 200%
+ font-size: 300%;
+ margin: 1ex auto;
}
table {
@@ -91,14 +111,9 @@ table {
td {
border: thin solid;
padding: 0.3em;
- text-align: center
-}
-
-#calendar td {
- text-align: left
}
-tr:nth-child(even) td {
+tr:nth-child(even) {
background-color: #9d9
}
@@ -212,3 +227,52 @@ tr:nth-child(even) td {
}
+.readable {
+ margin-left: auto;
+ margin-right: auto;
+ width: 50em;
+}
+
+table#teams {
+ width: 80%;
+}
+
+#teams td {
+ text-align: center;
+}
+
+td.team-name {
+ font-weight: bold;
+ font-size: 200%;
+ text-shadow: .1em .1em .2em #424242;
+}
+
+#teams tr:hover {
+ background-color: #bef;
+}
+
+#teams td.members {
+ font-size: 150%;
+ line-height: 5ex;
+ font-variant: small-caps;
+ text-shadow: .1em .1em .3em #666;
+}
+
+#teams img {
+ border: thick solid #666;
+ border-radius: 1em;
+ opacity: 0.6;
+}
+
+#teams tr:hover img {
+ border-color: #444;
+ opacity: 1.0;
+}
+
+.cred { color: #900; }
+.cgreen { color: #090; }
+.cblue { color: #009; }
+.cpink { color: #909; }
+.cyellow { color: #a60; }
+
+
diff --git a/teams.html b/teams.html
index ba55134..5f795df 100644
--- a/teams.html
+++ b/teams.html
@@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>Technicolor's Foosball Tournament</title>
<link rel="stylesheet" type="text/css" href="style.css">
+ <link href='http://fonts.googleapis.com/css?family=Nunito:300,700' rel='stylesheet' type='text/css'>
</head>
<body>
<div id="content">
@@ -15,33 +16,34 @@
<menu>
<ul>
- <li><a href="tableau.html">Bracket</a></li>
- <li><a href="teams.html">Teams</a></li>
+ <li><a href="bracket.html">Bracket</a></li>
+ <li><a href="schedule.html">Schedule</a></li>
<li><a href="rules.html">Rules</a></li>
</ul>
</menu>
<article>
- <table>
- <tr><td>Cake and Death</td><td>Alicia<br/>Stratis</td><td><img
+ <h1>Teams</h1>
+ <table id="teams">
+ <tr><td class="team-name">Cake and Death</td><td class="members">Alicia<br/>Stratis</td><td><img
src="imagesResized/stratis-alicia.jpg" width="288" height="283" /></td></tr>
- <tr><td>Gaijin</td><td>Stéphane<br/>Yuko</td><td><img
+ <tr><td class="team-name cblue">Gaijin</td><td class="members">Stéphane<br/>Yuko</td><td><img
src="imagesResized/yuko-stephane.jpg" width="288" height="354"/></td></tr>
- <tr><td>Red and Ruskie</td><td>Robert<br/>Valeria</td><td><img
+ <tr><td class="team-name cred">Red and Ruskie</td><td class="members">Robert<br/>Valeria</td><td><img
src="imagesResized/robert-valeria.jpg" width="368" height="276"/></td></tr>
- <tr><td>Olympic Croquet</td><td>Mathilde<br/>Nima</td><td><img
+ <tr><td class="team-name cpink">Olympic Croquet</td><td class="members">Mathilde<br/>Nima</td><td><img
src="imagesResized/nima-mathilde.jpg" width="288" height="335"/></td></tr>
- <tr><td>Nighthawks</td><td>Fernando<br/>Thibaut</td><td><img
+ <tr><td class="team-name cyellow">Nighthawks</td><td class="members">Fernando<br/>Thibaut</td><td><img
src="imagesResized/fernando-thibaut.jpg" width="368" height="252"/></td></tr>
- <tr><td></td><td>Nina<br/>Smriti</td><td><img
+ <tr><td class="team-name"></td><td class="members">Nina<br/>Smriti</td><td><img
src="imagesResized/nina-smriti.jpg" width="288" height="374"/></td></tr>
- <tr><td></td><td>Vijay<br/>Zhen</td><td><img
+ <tr><td class="team-name"></td><td class="members">Vijay<br/>Zhen</td><td><img
src="imagesResized/tom-jerry.jpg" width="288" height="388"/></td></tr>
- <tr><td></td><td>Nadia<br/>Salman</td><td><img
+ <tr><td class="team-name"></td><td class="members">Nadia<br/>Salman</td><td><img
src="imagesResized/baloo-bagheera.jpg" width="368" height="209"/></td></tr>
- <tr><td></td><td>Pedro<br/>?</td><td><img
+ <tr><td class="team-name"></td><td class="members">Pedro<br/>?</td><td><img
src="imagesResized/dupont-dupond.jpg" width="368" height="294"/></td></tr>
- <tr><td></td><td>Sandy<br/>?</td><td><img
+ <tr><td class="team-name"></td><td class="members">Sandy<br/>?</td><td><img
src="imagesResized/batman-robin.jpg" width="288" height="266"/></td></tr>
</table>
</article>
diff --git a/teams.txt b/teams.txt
deleted file mode 100644
index 77e3976..0000000
--- a/teams.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Stéphane and Yuko : Gaijin
-Nima and Mathilde : Olympic Croquet
-Thibaut and Fernando : Nighthawks
-Alicia and Stratis : Cake and Death
-Robert and Valeria : Red and Ruskie
-Pedro
-Sandy
-Nina and Smriti
-Nadia and Salman
-Vijay and Zhen
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-21 10:32:03 +0000