From 51c2536f16dc3b80a25287fda9c564c2083e4e30 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Mon, 6 Aug 2012 23:57:08 -0700 Subject: ajout d'une zolie fonte gougle --- rules.html | 1 + style.css | 6 ++++-- tableau.html | 1 + teams.html | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/rules.html b/rules.html index 69a083a..2f4d785 100644 --- a/rules.html +++ b/rules.html @@ -4,6 +4,7 @@ Rules - Technicolor's Series of Foosball +
diff --git a/style.css b/style.css index fa6f31f..2bbe815 100644 --- a/style.css +++ b/style.css @@ -1,7 +1,9 @@ /* 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 { diff --git a/tableau.html b/tableau.html index cb3aa6e..d4295db 100644 --- a/tableau.html +++ b/tableau.html @@ -4,6 +4,7 @@ Technicolor's Foosball Tournament +
diff --git a/teams.html b/teams.html index ba55134..0561cfd 100644 --- a/teams.html +++ b/teams.html @@ -4,6 +4,7 @@ Technicolor's Foosball Tournament +
-- cgit v1.2.3-70-g09d2 From a1926f47e2c81672c455cbb11c5d9d08841a6d98 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Mon, 6 Aug 2012 23:57:26 -0700 Subject: les regles en moins de 60em --- rules.html | 3 +++ style.css | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/rules.html b/rules.html index 2f4d785..55211c5 100644 --- a/rules.html +++ b/rules.html @@ -21,6 +21,8 @@
+
+

Rules

Definitions

@@ -91,6 +93,7 @@
  • Scoring from the midfield during the game
  • Scoring from the attack rod without stopping the ball first
  • +
    © Copyright 2012, Entité TriCastor diff --git a/style.css b/style.css index 2bbe815..42530c0 100644 --- a/style.css +++ b/style.css @@ -207,3 +207,10 @@ tr:nth-child(even) td { height: 80px; background-color: #ADFF09 } + +.readable { + margin-left: auto; + margin-right: auto; + font-size: 125%; + width: 50em; +} -- cgit v1.2.3-70-g09d2 From 01bd786c03b1d92b458d4be88c5c88bc98059508 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Mon, 6 Aug 2012 23:57:36 -0700 Subject: moar css --- style.css | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/style.css b/style.css index 42530c0..2571cf5 100644 --- a/style.css +++ b/style.css @@ -10,21 +10,20 @@ body { 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 { @@ -40,17 +39,32 @@ footer { article { padding: 1em 3em 1em; font-size: 85%; - background-color: #F0F0C3 + background-color: #fff; } 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 @@ -81,7 +95,8 @@ header h1 { article h1 { text-align: center; - font-size: 200% + font-size: 300%; + margin-bottom: 0; } table { -- cgit v1.2.3-70-g09d2 From 8cedef0453bb55686083d3f1b3d9d7921e2f6c3d Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:02:12 -0700 Subject: titre sur la page Teams + tailles de fontes --- style.css | 9 ++++++--- teams.html | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/style.css b/style.css index 2571cf5..bdf6622 100644 --- a/style.css +++ b/style.css @@ -38,10 +38,13 @@ footer { article { padding: 1em 3em 1em; - font-size: 85%; background-color: #fff; } +article#bracket { + font-size: 85%; +} + menu { margin: 0; padding: 0.5em; @@ -96,7 +99,8 @@ header h1 { article h1 { text-align: center; font-size: 300%; - margin-bottom: 0; + margin-top: 0; + margin-bottom: .5ex; } table { @@ -226,6 +230,5 @@ tr:nth-child(even) td { .readable { margin-left: auto; margin-right: auto; - font-size: 125%; width: 50em; } diff --git a/teams.html b/teams.html index 0561cfd..20f5a6b 100644 --- a/teams.html +++ b/teams.html @@ -23,6 +23,7 @@
    +

    Teams

    -- cgit v1.2.3-70-g09d2 From 267937c8319387535f3c39b34aebe7396654c3ed Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:07:24 -0700 Subject: schedule sur une page à part + m-à-j du menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bracket.html | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++ rules.html | 4 +- tableau.html | 155 ----------------------------------------------------------- teams.html | 4 +- 4 files changed, 140 insertions(+), 159 deletions(-) create mode 100644 bracket.html delete mode 100644 tableau.html diff --git a/bracket.html b/bracket.html new file mode 100644 index 0000000..6108d75 --- /dev/null +++ b/bracket.html @@ -0,0 +1,136 @@ + + + + + Technicolor's Foosball Tournament + + + + +
    +
    +

    Technicolor's Series of Foosball

    +

    The coolest Bay Area event

    +
    + + + + + +
    + + +
    +
    +

    GROUP A

    +

    Gaijin vs Olympic Croquet

    +

    {Pedro, ?} vs Gaijin

    +

    Olympics Croquet vs {Pedro, ?}

    +
    + +
    +

    GROUP B

    +

    Night Hawks vs Cake and Death

    +
    + +
    +

    GROUP C

    +

    Red and Ruskie vs {Sandy, ?}

    +

    {Vijay, Zhen} vs Red and Ruskie

    +

    {Sandy, ?} vs {Vijay, Zhen}

    +
    + +
    +

    GROUP D

    +

    {Nadia, Salman} vs {Nina, Smriti}

    +
    +
    + +
    + +
    +

    Ranking group A

    +

    1 ...

    +

    2 ...

    +

    3 ...

    +
    + +
    +

    Ranking group B

    +

    1 ...

    +

    2 ...

    +
    + +
    +

    Ranking group C

    +

    1 ...

    +

    2 ...

    +

    3 ...

    +
    + +
    +

    Ranking group D

    +

    1 ...

    +

    2 ...

    +
    + +
    + + +
    +

    Quarter-final 1

    +

    First team group A vs Second team group B

    +
    + +
    +

    Quarter-final 2

    +

    First team group B vs Second team group A

    +
    + +
    +

    Quarter-final 3

    +

    First team group C vs Second team group D

    +
    + +
    +

    Quarter-final 4

    +

    First team group D vs Second team group C

    +
    + +
    + +
    +

    Semi-final 1

    +

    Winner Q1 vs Winner Q3

    +
    + +
    +

    Semi-final 2

    +

    Winner Q2 vs Winner Q4

    +
    + +
    + +
    +

    FINAL

    +

    ? vs ?

    +
    + + + + + + +
    + + +
    + © Copyright 2012, Entité TriCastor +
    +
    + + diff --git a/rules.html b/rules.html index 55211c5..af718dd 100644 --- a/rules.html +++ b/rules.html @@ -14,9 +14,9 @@ diff --git a/tableau.html b/tableau.html deleted file mode 100644 index d4295db..0000000 --- a/tableau.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - - Technicolor's Foosball Tournament - - - - -
    -
    -

    Technicolor's Series of Foosball

    -

    The coolest Bay Area event

    -
    - - - - - -
    - - -
    -
    -

    GROUP A

    -

    Gaijin vs Olympic Croquet

    -

    {Pedro, ?} vs Gaijin

    -

    Olympics Croquet vs {Pedro, ?}

    -
    - -
    -

    GROUP B

    -

    Night Hawks vs Cake and Death

    -
    - -
    -

    GROUP C

    -

    Red and Ruskie vs {Sandy, ?}

    -

    {Vijay, Zhen} vs Red and Ruskie

    -

    {Sandy, ?} vs {Vijay, Zhen}

    -
    - -
    -

    GROUP D

    -

    {Nadia, Salman} vs {Nina, Smriti}

    -
    -
    - -
    - -
    -

    Ranking group A

    -

    1 ...

    -

    2 ...

    -

    3 ...

    -
    - -
    -

    Ranking group B

    -

    1 ...

    -

    2 ...

    -
    - -
    -

    Ranking group C

    -

    1 ...

    -

    2 ...

    -

    3 ...

    -
    - -
    -

    Ranking group D

    -

    1 ...

    -

    2 ...

    -
    - -
    - - -
    -

    Quarter-final 1

    -

    First team group A vs Second team group B

    -
    - -
    -

    Quarter-final 2

    -

    First team group B vs Second team group A

    -
    - -
    -

    Quarter-final 3

    -

    First team group C vs Second team group D

    -
    - -
    -

    Quarter-final 4

    -

    First team group D vs Second team group C

    -
    - -
    - -
    -

    Semi-final 1

    -

    Winner Q1 vs Winner Q3

    -
    - -
    -

    Semi-final 2

    -

    Winner Q2 vs Winner Q4

    -
    - -
    - -
    -

    FINAL

    -

    ? vs ?

    -
    - - - -
    - -

    Games schedule

    - -

    Wednesday, August 8th

    -
    Cake and DeathAlicia
    Stratis
    - - - - - - - - -
    3:30pmGroup A - Gaijin vs Olympic Croquets
    3:45pmGroup B - Night Hawks vs Cake and Death
    4:00pmGroups C - Red and Ruskie vs {Sandy, ?}
    4:15pmGroup D - {Nadia, Salman} vs {Nina, Smriti}
    4:30pmGroup A - {Pedro, ?} vs Gaijin
    5:00pmGroup C - {Vijay, Zhen} vs Red and Ruskie
    5:15pmGroup A - Olympics Croquet vs {Pedro, ?}
    5:30pmGroup C - {Sandy, ?} vs {Vijay, Zhen}
    - - - -
    - - - - - - -
    - © Copyright 2012, Entité TriCastor -
    -
    - - diff --git a/teams.html b/teams.html index 20f5a6b..9ff75d5 100644 --- a/teams.html +++ b/teams.html @@ -16,8 +16,8 @@ -- cgit v1.2.3-70-g09d2 From 2def978e85167ae293d1a956b8262b44fbd66b18 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:10:26 -0700 Subject: suppression du rognnnnnntudjuuu de fichier teams.txt, maintenant inutile et qui me pourrit mon auto-complétion façon sauce grand-veneur… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- teams.txt | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 teams.txt 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 -- cgit v1.2.3-70-g09d2 From 96f8d6469adeddce64b73dc3be1b7a151183c014 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:11:52 -0700 Subject: ajout d'un fichier .gitignore (les lignes de ce fichier décrivent les noms de fichier que git doit ignorer, notamment lors des git-add de nouveaux dossiers, etc.) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b72f9be --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +*.swp -- cgit v1.2.3-70-g09d2 From 4da8a398fec34dd61ba78c1d991632b0cfe15552 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Tue, 7 Aug 2012 00:12:19 -0700 Subject: j'avais oublié d'ajouter la page Schedule MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- schedule.html | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 schedule.html diff --git a/schedule.html b/schedule.html new file mode 100644 index 0000000..b0d4cdd --- /dev/null +++ b/schedule.html @@ -0,0 +1,51 @@ + + + + + Technicolor's Foosball Tournament + + + + +
    +
    +

    Technicolor's Series of Foosball

    +

    The coolest Bay Area event

    +
    + + + + + +
    +

    Games schedule

    + +
    + + +

    Wednesday, August 8th

    + + + + + + + + + +
    3:30pmGroup A - Gaijin vs Olympic Croquets
    3:45pmGroup B - Night Hawks vs Cake and Death
    4:00pmGroups C - Red and Ruskie vs {Sandy, ?}
    4:15pmGroup D - {Nadia, Salman} vs {Nina, Smriti}
    4:30pmGroup A - {Pedro, ?} vs Gaijin
    5:00pmGroup C - {Vijay, Zhen} vs Red and Ruskie
    5:15pmGroup A - Olympics Croquet vs {Pedro, ?}
    5:30pmGroup C - {Sandy, ?} vs {Vijay, Zhen}
    +
    + +
    + + +
    + © Copyright 2012, Entité TriCastor +
    +
    + + -- cgit v1.2.3-70-g09d2 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