From 50301f071b2971db43d7b572cfabb182a3927e91 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:32:46 -0700 Subject: kron mineur --- bracket.html | 4 +++- style.css | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bracket.html b/bracket.html index 6108d75..2164567 100644 --- a/bracket.html +++ b/bracket.html @@ -15,7 +15,7 @@ @@ -23,6 +23,8 @@
+

Bracket

+
diff --git a/style.css b/style.css index bdf6622..4e678a6 100644 --- a/style.css +++ b/style.css @@ -99,8 +99,7 @@ header h1 { article h1 { text-align: center; font-size: 300%; - margin-top: 0; - margin-bottom: .5ex; + margin: 1ex auto; } table { -- cgit v1.2.3-70-g09d2 From d63721adde9a6790973b9aedda4ad0aae8ae57cf Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:32:56 -0700 Subject: jolification de la page Teams --- style.css | 45 ++++++++++++++++++++++++++++++++++++++++++++- teams.html | 22 +++++++++++----------- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/style.css b/style.css index 4e678a6..834f6a5 100644 --- a/style.css +++ b/style.css @@ -113,7 +113,7 @@ td { padding: 0.3em } -tr:nth-child(even) td { +tr:nth-child(even) { background-color: #9d9 } @@ -231,3 +231,46 @@ tr:nth-child(even) td { 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 9ff75d5..5f795df 100644 --- a/teams.html +++ b/teams.html @@ -24,26 +24,26 @@

Teams

- - - - - - - - - - -
Cake and DeathAlicia
Stratis		 +
Cake and DeathAlicia
Stratis
GaijinStéphane
Yuko		GaijinStéphane
Yuko
Red and RuskieRobert
Valeria		Red and RuskieRobert
Valeria
Olympic CroquetMathilde
Nima		Olympic CroquetMathilde
Nima
NighthawksFernando
Thibaut		NighthawksFernando
Thibaut
Nina
Smriti		Nina
Smriti
Vijay
Zhen		Vijay
Zhen
Nadia
Salman		Nadia
Salman
Pedro
?		Pedro
?
Sandy
?		Sandy
?
-- cgit v1.2.3-70-g09d2 From cac0c9bf96120f73a391e7d46618f7c2d28c303f Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:38:38 -0700 Subject: dernier soupir cosmétique avant le dodo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schedule.html | 7 +++---- style.css | 23 ++++++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/schedule.html b/schedule.html index b0d4cdd..477d0fb 100644 --- a/schedule.html +++ b/schedule.html @@ -21,13 +21,12 @@ -
-

Games schedule

+
+

Games Schedule

- -

Wednesday, August 8th

+

Wednesday, August 8th

diff --git a/style.css b/style.css index 834f6a5..990c9f6 100644 --- a/style.css +++ b/style.css @@ -26,6 +26,16 @@ header { margin: 0; } +header h1 { + font-size: 350%; + margin-bottom: 0 +} + +header p { + font-size: 110%; + margin-top: .5ex; +} + footer { color: #333; font-size: 80%; @@ -92,10 +102,6 @@ menu a { text-decoration: none; } -header h1 { - margin-bottom: 0 -} - article h1 { text-align: center; font-size: 300%; @@ -123,12 +129,11 @@ tr:nth-child(even) { } #calendar h2 { - text-align: left; - margin-top: 10px + text-align: center } -#calendar h3 { - text-align: center +#calendar table { + margin-bottom: 2ex; } .group { @@ -247,7 +252,7 @@ td.team-name { } #teams tr:hover { - background-color: #bef; + background-color: #d0f0ff; } #teams td.members { -- cgit v1.2.3-70-g09d2 From 655a603ecd9951ee8a8d73b724ed44c5d04802c9 Mon Sep 17 00:00:00 2001 From: Alicia Date: Tue, 7 Aug 2012 00:44:47 -0700 Subject: le petit commit d'avant aller faire un très gros dodo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- style.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/style.css b/style.css index fa6f31f..4b26ec4 100644 --- a/style.css +++ b/style.css @@ -90,7 +90,12 @@ table { td { border: thin solid; - padding: 0.3em + padding: 0.3em; + text-align: center +} + +#calendar td { + text-align: left } tr:nth-child(even) td { @@ -187,7 +192,7 @@ tr:nth-child(even) td { border-radius: .75em; width: 220px; height: 80px; - background-color: #FFB042 + background-color: #FFC0C0 } #S1 { @@ -203,5 +208,7 @@ tr:nth-child(even) td { border-radius: .75em; width: 220px; height: 80px; - background-color: #ADFF09 + background-color: #FF58F7 } + + -- cgit v1.2.3-70-g09d2 From ffd390e909c259258c56cc455dbee978b208d236 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:44:47 -0700 Subject: c'était trop tentant —leCastorMasqué MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- images/beaver.jpg | Bin 0 -> 8740 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/beaver.jpg diff --git a/images/beaver.jpg b/images/beaver.jpg new file mode 100644 index 0000000..0558ece Binary files /dev/null and b/images/beaver.jpg differ -- cgit v1.2.3-70-g09d2 From e512cd90c582894fcc19c4e8b19de97184c94471 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 08:32:46 -0700 Subject: oups, j'avais oublié de commiter ça MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schedule.html | 5 ++++- style.css | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/schedule.html b/schedule.html index 477d0fb..55f7e98 100644 --- a/schedule.html +++ b/schedule.html @@ -38,7 +38,10 @@
3:30pmGroup A - Gaijin vs Olympic Croquets
3:45pmGroup B - Night Hawks vs Cake and Death
5:30pmGroup C - {Sandy, ?} vs {Vijay, Zhen}
- + +
+ kroOon +
diff --git a/style.css b/style.css index 990c9f6..cd8c387 100644 --- a/style.css +++ b/style.css @@ -279,3 +279,17 @@ td.team-name { .cpink { color: #909; } .cyellow { color: #a60; } +.center { + text-align: center; + margin-left: auto; + margin-right: auto; +} + +#beaver { + opacity: 0.25; + margin-top: 5ex; +} + +#beaver:hover { + opacity: 1.0; +} -- cgit v1.2.3-70-g09d2 From 3cb7c4d7eed824f550ab5b3accd86bfa312442d9 Mon Sep 17 00:00:00 2001 From: Stéphane Caron Date: Tue, 7 Aug 2012 08:46:21 -0700 Subject: petites corrections dans Rules --- rules.html | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/rules.html b/rules.html index af718dd..544b450 100644 --- a/rules.html +++ b/rules.html @@ -27,8 +27,8 @@

Definitions

-

We will use the following table to refer to refer to the different rods of - the table:

+

We will use the following table to refer to the different rods of + the foosball table:

@@ -48,35 +48,35 @@
  • Groupe phase: the teams are divided in groups of two or three teams. Each team meets all the other teams in its group. The worse teams from each group of three teams leaves the tournament at the end - of this phases.
    • + of this phase.
  • Knockout phase: this phase is organized as a single elimination bracket; 4 quarter-finals, 2 semi-finals, 1 final (and - 1 final to decide the third place.
    • + 1 additional final to decide the third place).

    Organization of games

    -

    The first team to score ten points wins the game

    +

    The first team to score 10 points wins the game.

    -

    There is a half-time when the first team reaches five points: the teams - switch sides, and the players inside a team can decide to swap positions - (the attacker becomes the defender and vice-versa). Swapping positions - during the half-time is not mandatory.

    +

    There is a half-time when the first team reaches five points: the two + teams switch sides, and the players inside a team can decide to swap positions + (the attacker becoming the defender and vice-versa). Swapping positions + during the half-time is not mandatory.

    The ball is served by the attacker on the side of the serving hole.

    In-game rules

    -

    When the ball stops and cannot be reached by any foosmen, the action to - be taken depends on the position where the ball stopped:

    +

    When the ball stops and cannot be reached by any foosman, the action to + be taken depends on the position where the ball stopped:

    • Before the third rod: the ball is put in the closest - corner
      • + corner;
    • Between the third and sixth rods: the ball is served from the - middle
      • + middle;
    • After the sixth rod: the ball is put in the closest - corner
      • -
    + corner. +

    Things you cannot do:

      @@ -90,8 +90,8 @@

      Apart from that, everything is allowed, in particular:

        -
      • Scoring from the midfield during the game
        • -
      • Scoring from the attack rod without stopping the ball first
        • +
      • Scoring from the midfield during the game;
        • +
      • Scoring from the attack rod without stopping the ball first.

      -- cgit v1.2.3-70-g09d2 From cf73c87ddb9a261616c2c84a2fdeffac29e9dc45 Mon Sep 17 00:00:00 2001 From: Stéphane Caron Date: Tue, 7 Aug 2012 08:48:33 -0700 Subject: d'après le validateur du W3C (http://validator.w3.org), on ne met pas de
        dans un

        MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rules.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rules.html b/rules.html index 544b450..2653e49 100644 --- a/rules.html +++ b/rules.html @@ -43,7 +43,7 @@

        Tournament structure

        -

        The tournament is divided in two phases: +

        The tournament is divided in two phases:

        • Groupe phase: the teams are divided in groups of two or three teams. Each team meets all the other teams in its group. The @@ -52,7 +52,7 @@
        • Knockout phase: this phase is organized as a single elimination bracket; 4 quarter-finals, 2 semi-finals, 1 final (and 1 additional final to decide the third place).
          • -

        +

      Organization of games

      @@ -68,7 +68,7 @@

      In-game rules

      When the ball stops and cannot be reached by any foosman, the action to - be taken depends on the position where the ball stopped: + be taken depends on the position where the ball stopped:

      • Before the third rod: the ball is put in the closest corner;
        • @@ -76,9 +76,9 @@ middle;
      • After the sixth rod: the ball is put in the closest corner.
        • -

      +
    -

    Things you cannot do: +

    Things you cannot do:

    • Spinning: swiftly spinning the rods all around without holding them. @@ -86,13 +86,13 @@ touched by two of your players from two different rows before a goal. If this happens, the goal does not count and the ball is simply served again from the middle.
      • -

    + -

    Apart from that, everything is allowed, in particular: +

    Apart from that, everything is allowed, in particular:

    • Scoring from the midfield during the game;
    • Scoring from the attack rod without stopping the ball first.
      • -

    +
    -- cgit v1.2.3-70-g09d2 From 475c13c0e9dc85c78c8edb4e3315342a42735660 Mon Sep 17 00:00:00 2001 From: Stéphane Caron Date: Tue, 7 Aug 2012 08:51:29 -0700 Subject: ajout de alt='' inutiles pour que teams.html passe le validateur W3C --- teams.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/teams.html b/teams.html index 5f795df..185b1b6 100644 --- a/teams.html +++ b/teams.html @@ -26,25 +26,25 @@

    Teams

    Row 1Goalkeeper (1 foosman)
    + src="imagesResized/stratis-alicia.jpg" alt="" width="288" height="283" /> + src="imagesResized/yuko-stephane.jpg" alt="" width="288" height="354"/> + src="imagesResized/robert-valeria.jpg" alt="" width="368" height="276"/> + src="imagesResized/nima-mathilde.jpg" alt="" width="288" height="335"/> + src="imagesResized/fernando-thibaut.jpg" alt="" width="368" height="252"/> + src="imagesResized/nina-smriti.jpg" alt="" width="288" height="374"/> + src="imagesResized/tom-jerry.jpg" alt="" width="288" height="388"/> + src="imagesResized/baloo-bagheera.jpg" alt="" width="368" height="209"/> + src="imagesResized/dupont-dupond.jpg" alt="" width="368" height="294"/> + src="imagesResized/batman-robin.jpg" alt="" width="288" height="266"/>
    Cake and DeathAlicia
    Stratis
    GaijinStéphane
    Yuko
    Red and RuskieRobert
    Valeria
    Olympic CroquetMathilde
    Nima
    NighthawksFernando
    Thibaut
    Nina
    Smriti
    Vijay
    Zhen
    Nadia
    Salman
    Pedro
    ?
    Sandy
    ?
    -- cgit v1.2.3-70-g09d2 From 81b95e09f2a3385e65c32ba3ae4d9aec3ebdfad6 Mon Sep 17 00:00:00 2001 From: Stéphane Caron Date: Tue, 7 Aug 2012 08:53:26 -0700 Subject: ajout d'une conclusion aux règles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rules.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rules.html b/rules.html index 2653e49..258e53e 100644 --- a/rules.html +++ b/rules.html @@ -93,6 +93,10 @@
  • Scoring from the midfield during the game;
  • Scoring from the attack rod without stopping the ball first.
    • + +
    + kroOon +