diff --git a/assets/audio/USA.mp3 b/assets/audio/USA.mp3
new file mode 100644
index 0000000..1b9f7b5
Binary files /dev/null and b/assets/audio/USA.mp3 differ
diff --git a/assets/audio/USSR.mp3 b/assets/audio/USSR.mp3
new file mode 100644
index 0000000..b078e11
Binary files /dev/null and b/assets/audio/USSR.mp3 differ
diff --git a/assets/css/photos.css b/assets/css/photos.css
index 315b50f..5bac914 100644
--- a/assets/css/photos.css
+++ b/assets/css/photos.css
@@ -1,15 +1,15 @@
-.photos_folder {
+.photos-folder {
width: 100%;
border: 1px solid #5a5a5a;
border-radius: 5px;
}
-.photos_folder a:hover, .photos_path a:hover, #download_album:hover {
+.photos-folder a:hover, .photos-path a:hover, #download-album:hover {
box-shadow: 0 0 10px #000;
background-color: #635247;
}
-.photos_folder a {
+.photos-folder a {
text-decoration: none;
border-radius: 5px;
min-width: 150px;
@@ -25,7 +25,7 @@
transition: 0.3s;
}
-#folder_title {
+#folder-title {
position: absolute;
top: 10px;
color: #73b795;
@@ -33,18 +33,18 @@
text-shadow: 0 0 5px #1c1c1c;
}
-#folder_photos, #folder_albums {
+#folder-photos, #folder-albums {
color: #808080;
font-size: 18px;
text-shadow: 0 0 5px #1c1c1c;
}
-#folder_photos {
+#folder-photos {
position: absolute;
bottom: 30px;
}
-#folder_albums {
+#folder-albums {
position: absolute;
bottom: 0;
}
@@ -73,14 +73,14 @@
box-shadow: 0 0 10px #000;
}
-.photos_path {
+.photos-path {
width: 100%;
display: flex;
list-style: none;
padding: 0;
}
-.photos_path a {
+.photos-path a {
font-size: 15px;
text-decoration: none;
border-radius: 5px;
@@ -96,7 +96,7 @@
color: #e0e0e0;
}
-#img_big {
+#img-big {
margin: 0;
padding: 0;
position: fixed;
@@ -195,7 +195,7 @@
transform: translateY(-50%);
}
-#photo_control {
+#photo-control {
position: fixed;
bottom: 0;
right: 50%;
@@ -208,11 +208,11 @@
transition: 0.3s;
}
-#photo_control:hover {
+#photo-control:hover {
height: 50px;
}
-#photo_buttons {
+#photo-buttons {
position: fixed;
display: block;
z-index: 10;
@@ -222,13 +222,13 @@
-ms-user-select: none; /* IE 10+ */
}
-#close_back {
+#close-back {
position: fixed;
width: 100%;
height: 100%;
}
-#photo_overlay {
+#photo-overlay {
top: 0;
left: 0;
position: fixed;
@@ -238,7 +238,7 @@
z-index: 5;
}
-#download_album {
+#download-album {
height: 70px;
width: 200px;
display: inline-flex;
@@ -254,31 +254,31 @@
margin: 5px;
}
-#download_text {
+#download-text {
margin-top: 5px;
position: absolute;
top: 0;
}
-#album_photo_count {
+#album-photo-count {
color: #929ba8;
margin-bottom: 5px;
position: absolute;
bottom: 0;
}
-#download_text svg {
+#download-text svg {
width: 24px;
height: 24px;
margin-right: 5px;
}
@media screen and (max-width: 480px) {
- .photos_folder a {
+ .photos-folder a {
min-width: 100px;
height: 70px;
}
- #folder_title {
+ #folder-title {
position: absolute;
top: 5px;
color: #73b795;
@@ -286,17 +286,17 @@
text-shadow: 0 0 5px #1c1c1c;
}
- #folder_photos, #folder_albums {
+ #folder-photos, #folder-albums {
color: #808080;
font-size: 10px;
}
- #folder_photos {
+ #folder-photos {
position: absolute;
bottom: 20px;
}
- #folder_albums {
+ #folder-albums {
position: absolute;
bottom: 0;
}
diff --git a/assets/css/planning_events.css b/assets/css/planning_events.css
index 98657dd..3d2b8e2 100644
--- a/assets/css/planning_events.css
+++ b/assets/css/planning_events.css
@@ -2,7 +2,7 @@
General
*******************************************************************************/
-#table_planning {
+#table-planning {
width: 100%;
border: none;
border-collapse: separate;
@@ -10,7 +10,7 @@ General
font-size: 15px;
}
-#table_planning th {
+#table-planning th {
border: none;
border-radius: 5px;
background: #414141;
@@ -19,7 +19,7 @@ General
font-size: 17px;
}
-#table_planning td {
+#table-planning td {
padding: 0;
margin: 0 0 0 0;
}
@@ -85,10 +85,10 @@ Events Specific
@media screen and (max-width: 750px) {
- #table_planning {
+ #table-planning {
font-size: 10px;
}
- #table_planning th{
+ #table-planning th{
font-size: 12px;
}
}
\ No newline at end of file
diff --git a/assets/css/score.css b/assets/css/score.css
new file mode 100644
index 0000000..c9a4513
--- /dev/null
+++ b/assets/css/score.css
@@ -0,0 +1,69 @@
+#score-counter {
+ display: block;
+ height: 200px;
+}
+
+#score-counter #title-image {
+ height: 100px;
+ margin: 0;
+}
+
+
+#score-container {
+ display: block;
+}
+
+
+#score-display {
+ background-color: #1C1C1C;
+ box-shadow: 0 0 20px #1C1C1C;
+ border-radius: 10px;
+ display: inline-flex;
+ vertical-align: center;
+ font-family: 'Russo One', sans-serif;
+ height: 80px;
+}
+
+
+#score-display a {
+ display: inline-flex;
+ vertical-align: middle;
+ align-items: center;
+ height: 80px;
+}
+
+#score-usa, #score-urss {
+ font-size: 50px;
+}
+
+#score-usa{
+ color: #1a5dad;
+}
+
+#score-urss{
+ color: #d72229;
+}
+
+#score-separator{
+ font-size: 70px;
+}
+
+.score-logo {
+ width: 100px;
+ margin: 5px;
+}
+
+@media screen and (max-width: 480px) {
+ #score-counter #title-image {
+ height: 75px;
+ }
+ #score-separator{
+ font-size: 50px;
+ }
+ .score-logo{
+ width: 50px;
+ }
+ #score-usa, #score-urss {
+ font-size: 40px;
+ }
+}
\ No newline at end of file
diff --git a/assets/css/stats.css b/assets/css/stats.css
index a3a6017..f0b0937 100644
--- a/assets/css/stats.css
+++ b/assets/css/stats.css
@@ -1,59 +1,59 @@
-#stats_container {
+#stats-container {
display: inline-flex;
width: 100%;
}
-.stats_table {
+.stats-table {
width: 48%;
border: none;
margin: 1% 1% 1% 1%;
}
-.stats_table th{
+.stats-table th{
border-radius: 10px 10px 0 0;
font-family: 'Russo One', sans-serif;
}
-.stats_table .stat_log, .stats_table .stat_points {
+.stats-table .stat-log, .stats-table .stat-points {
color: #1c1c1c;
border-radius: 0;
font-weight: bold;
}
-#stats_usa th {
+#stats-usa th {
background-color: #1a5dad;
border-color: #1a5dad;
}
-#stats_usa .stat_log, #stats_usa .stat_points {
+#stats-usa .stat-log, #stats-usa .stat-points {
background-color: #639fad;
border-color: #639fad;
}
-#stats_usa td {
+#stats-usa td {
border-color: #639fad;
}
-#stats_urss th {
+#stats-urss th {
background-color: #d72229;
border-color: #d72229;
}
-#stats_urss .stat_log, #stats_urss .stat_points {
+#stats-urss .stat-log, #stats-urss .stat-points {
background-color: #d75556;
border-color: #d75556;
}
-#stats_urss td {
+#stats-urss td {
border-color: #d75556;
}
-.stat_log {
+.stat-log {
width: 80%;
}
-.stat_points {
+.stat-points {
width: 20%;
}
@@ -67,12 +67,12 @@
}
@media screen and (max-width: 480px) {
- #stats_container {
+ #stats-container {
display: block;
width: 100%;
}
- .stats_table {
+ .stats-table {
width: 100%;
}
}
\ No newline at end of file
diff --git a/assets/css/style.css b/assets/css/style.css
index 18fa83e..975311c 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -30,13 +30,6 @@ Theme Styles
*******************************************************************************/
body {
- /*Full page background*/
- background: url("../images/bg.jpg") no-repeat fixed center;
- background-size: cover;
- -webkit-background-size: cover;
- -moz-background-size: cover;
- -o-background-size: cover;
-
box-sizing: border-box;
color: #b5b5b5;
font-size: 16px;
@@ -171,11 +164,11 @@ Full-Width Styles
margin: 0 auto;
}
-#header_wrap {
+#header-wrap {
background-position: top;
}
-#header_top {
+#header-top {
display: flex;
color: white;
position: fixed;
@@ -186,33 +179,34 @@ Full-Width Styles
pointer-events: none;
}
-#header_top a {
+#header-top a {
display: inline-flex;
pointer-events: auto;
+ vertical-align: middle;
height: 40px;
+ margin: 5px;
}
-#header_wrap .inner {
+#header-wrap .inner {
padding: 100px 10px 100px 10px;
}
-#menu_title {
- color: white;
+#menu-title {
line-height: 40px;
- border-bottom: none;
- margin: 5px;
+ margin: 0 0 0 5px;
+ height: 40px;
}
-#menu_icon {
+#menu-icon {
width: 40px;
height: 40px;
padding: 0;
- margin: 5px;
+ margin: auto;
}
#title {
margin: 0;
- color: #fff;
+ color: #e0e0e0;
font-size: 42px;
text-shadow: #111 0 0 10px;
text-align: center;
@@ -221,24 +215,38 @@ Full-Width Styles
cursor: default;
}
-#description {
- color: #fff;
- font-size: 24px;
+#timer {
+ color: #b5b5b5;
+ font-size: 20px;
font-weight: 300;
background: none;
text-shadow: #111 0 0 10px;
border-bottom: none;
+ height: 30px;
}
-#home_content_wrap {
+#home-image {
+ width: 50%;
+ margin: 0;
+ padding: 0;
+}
+
+#home-title {
+ width: 60%;
+ margin: 0;
+ padding: 0;
+}
+
+#home-content-wrap {
background: none;
+ height: 100%;
}
-#home_content {
+#home-content {
padding-top: 100px;
}
-#home_content h1 {
+#home-content h1 {
color: white;
font-size: 70px;
border: none;
@@ -246,66 +254,85 @@ Full-Width Styles
text-shadow: 0 0 10px #000;
}
-#home_content p {
+#home-content p {
color: white;
font-size: 30px;
text-align: center;
text-shadow: 0 0 5px #000;
}
-#main_fading_top_edge {
+.background {
+ background: url("../images/bg_up.jpg") no-repeat center fixed;
+ background-size: cover;
+ position: fixed;
+ height: 100%;
+ width: 100%;
+ z-index: -10;
+}
+
+#bg_ussr {
+ background: url("../images/urss.png") no-repeat center fixed;
+ background-size: cover;
+}
+
+#bg_usa {
+ background: url("../images/usa.png") no-repeat center fixed;
+ background-size: cover;
+}
+
+#main-fading-top-edge {
height: 200px;
background: linear-gradient(to top, #1c1c1c, transparent 90%);
}
-#main_fading_bottom_edge {
+#main-fading-bottom-edge {
height: 200px;
background: linear-gradient(to bottom, #1c1c1c, transparent 90%);
}
-#main_content_wrap {
+#main-content-wrap {
background: #1c1c1c;
}
-#main_content {
+#main-content {
padding-top: 10px;
}
-#footer_wrap {
+#footer-wrap {
padding: 50px 0 50px 0;
}
-#table_wrapper {
+#table-wrapper {
width: 100%;
overflow: auto;
}
-#table_coms{
+#table-coms{
width: 100%;
table-layout: auto;
text-align: center;
border: 1px solid #494949;
}
-#table_coms .spacer{
+#table-coms .spacer{
width: 20%;
}
-#table_coms td{
+#table-coms td{
vertical-align: middle;
border: none;
padding: 0;
width: 30%;
}
-#table_coms img{
+#table-coms img{
height: 100px;
}
-.com_description{
+.com-description{
width: 100%;
font-weight: bold;
}
-#back_button{
+#back-button{
top: 0;
left: 0;
position: fixed;
@@ -317,12 +344,12 @@ Full-Width Styles
transition: 0.3s;
}
-.active_background {
+.active-background {
z-index: 100 !important;
opacity: 0.7 !important;
}
-.main_button {
+.main-button {
background-color: #1a1a1a;
padding: 2px 2px 2px 2px;
border-radius: 5px;
@@ -332,7 +359,7 @@ Full-Width Styles
box-shadow: 0 0 4px #000;
}
-.main_button:hover {
+.main-button:hover {
box-shadow: 0 0 10px #000;
background-color: #635247;
}
@@ -357,43 +384,7 @@ Full-Width Styles
color: #a3a7b3;
}
-#score_counter {
- height: 100px;
-}
-
-#score_container {
- width: 600px;
- display: inline-flex;
- vertical-align: middle;
- align-items: center;
- justify-content: center;
- font-family: 'Russo One', sans-serif;
- background-color: #1C1C1C;
- border-radius: 10px;
- box-shadow: 0 0 20px #1C1C1C;
-}
-
-#score_usa, #score_urss {
- font-size: 50px;
-}
-
-#score_usa{
- color: #1a5dad;
-}
-
-#score_urss{
- color: #d72229;
-}
-
-#score_separator{
- font-size: 70px;
-}
-
-.score_logo {
- width: 100px;
-}
-
-#main_pages{
+#main-pages{
width: 100%;
display: inline-grid;
padding: 0;
@@ -401,12 +392,12 @@ Full-Width Styles
}
.main-link{
- display: inline-flex;
+ width: 80px;
+ height: 80px;
+ margin: 2px;
+ display: inline-grid;
vertical-align: middle;
- width: 100%;
padding: 0;
- margin: 5px;
- height: 100px;
color: #e0e0e0;
}
@@ -414,11 +405,12 @@ Full-Width Styles
color: #1a5dad;
}
+#main-link-container{
+ display: block;
+}
+
.main-logo {
- width: 20%;
font-size: 64px;
- background: #1c1c1c;
- box-shadow: 0 0 10px #1c1c1c;
display: inline-flex;
}
@@ -426,18 +418,8 @@ Full-Width Styles
margin: auto;
}
-.main-text {
- width: 80%;
- font-size: 20px;
- display: inline-flex;
- background: linear-gradient(to right, #1c1c1c, transparent 90%);
-}
-.main-text span {
- margin-top: auto;
- margin-bottom: auto;
-}
-#list_blouse{
+#list-blouse{
text-align: left;
list-style: square;
}
@@ -488,33 +470,23 @@ Small Device Styles
code, pre {
font-size: 11px;
}
- #table_wrapper {
+ #table-wrapper {
width: 100%;
overflow: scroll;
}
- #score_counter {
- height: 50px;
- }
-
- #score_container {
- width: 300px;
- }
-
- #score_usa, #score_urss {
- font-size: 25px;
- }
- #table_coms .spacer{
+ #table-coms .spacer{
width: 0;
}
- #table_coms td{
+ #table-coms td{
width: 50%;
}
+ .main-link {
+ width: 40px;
+ height: 40px;
+ }
.main-logo {
font-size: 32px;
}
- .main-text {
- font-size: 15px;
- }
}
@media screen and (max-width: 320px) {
@@ -551,7 +523,7 @@ Small Device Styles
max-width: 320px;
font-size: 11px;
}
- #table_wrapper {
+ #table-wrapper {
width: 100%;
overflow: scroll;
}
diff --git a/assets/css/usa.css b/assets/css/usa.css
new file mode 100644
index 0000000..6b507bb
--- /dev/null
+++ b/assets/css/usa.css
@@ -0,0 +1,4 @@
+#title {
+ font-size: 50px;
+ margin: 0;
+}
\ No newline at end of file
diff --git a/assets/images/bg_down.jpg b/assets/images/bg_down.jpg
new file mode 100644
index 0000000..bc13e89
Binary files /dev/null and b/assets/images/bg_down.jpg differ
diff --git a/assets/images/bg.jpg b/assets/images/bg_up.jpg
similarity index 100%
rename from assets/images/bg.jpg
rename to assets/images/bg_up.jpg
diff --git a/assets/images/blouse_example_2017.jpeg b/assets/images/blouse_example_2017.jpeg
new file mode 100644
index 0000000..030a186
Binary files /dev/null and b/assets/images/blouse_example_2017.jpeg differ
diff --git a/assets/images/logo-site-accueil.png b/assets/images/logo-site-accueil.png
new file mode 100644
index 0000000..edd005e
Binary files /dev/null and b/assets/images/logo-site-accueil.png differ
diff --git a/assets/images/logo-site-accueil.svg b/assets/images/logo-site-accueil.svg
deleted file mode 100644
index 9583617..0000000
--- a/assets/images/logo-site-accueil.svg
+++ /dev/null
@@ -1,523 +0,0 @@
-
-
-
-
diff --git a/assets/images/map.svg b/assets/images/map.svg
index edf0e4f..5b82f81 100644
--- a/assets/images/map.svg
+++ b/assets/images/map.svg
@@ -39,14 +39,14 @@
inkscape:window-height="835"
id="namedview10784"
showgrid="false"
- inkscape:zoom="1.8101934"
- inkscape:cx="487.11698"
- inkscape:cy="515.87114"
+ inkscape:zoom="2.7689797"
+ inkscape:cx="476.82607"
+ inkscape:cy="543.79717"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="surface1"
- showguides="false" />
+ showguides="true" />
- Cette année, le thème étant l'espace, tu devra teinter ta blouse en Bleu - inter-sidéral et la + Cette année, le thème étant l'espace, tu devras teinter ta blouse en Bleu inter-sidéral et la décorer en brodant et cousant selon ce thème en respectant les règles ci-dessous. - Qui sait, peut-être que tu sera élu Miss ou Mister Blouse. + Qui sait, peut-être que tu seras élu Miss ou Mister Blouse.
Fichiers à télécharger.
+Sur cette page tu peux télécharger les différents documents de ta semaine d'accueil
++ Et non, y'en a aucun en ligne encore +
+?> \ No newline at end of file diff --git a/favicon.ico b/favicon.ico index 1f3eb38..7569363 100644 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/historique.json b/historique.json index f0bda3c..d25491d 100644 --- a/historique.json +++ b/historique.json @@ -1,47 +1,26 @@ { "usa": [ { - "text": "Chute dans le Canal!", - "points": 56 + "text": "whoa, des points!", + "points": 99 }, { - "text": "Perdre le coude face à un ecocup", - "points": 15 - }, - { - "text": "Créer une crise financière chez supaéro", - "points": 15 - }, - { - "text": "Aimer la sieste", - "points": 70 + "text": "whoa, encore des points!", + "points": 2 } ], - "urss":[ { - "text": "Soissons46", - "points": 46 + "text": "ah ! Mes points!", + "points": 49 }, { - "text": "Traiter avec l'ennemi", - "points": -46 + "text": "yes, des points!", + "points": 45 }, { - "text": "Demander MIC sans valider les Maths", - "points": 50 - }, - { - "text": "Camper en amphi", - "points": 20 - }, - { - "text": "Inaugurer la chasie du Fabcamp", - "points": 20 - }, - { - "text": "Vomir dans son themro en amphi", - "points": 20 + "text": "encore !", + "points": 5 } ] -} +} \ No newline at end of file diff --git a/includes/coms/com_template.php b/includes/coms/com_template.php index bf3568c..edc11a2 100644 --- a/includes/coms/com_template.php +++ b/includes/coms/com_template.php @@ -1,7 +1,7 @@= $comDescription ?> | += $comDescription ?> | ||||||
diff --git a/includes/copyright.html b/includes/copyright.html new file mode 100644 index 0000000..827cc6e --- /dev/null +++ b/includes/copyright.html @@ -0,0 +1,13 @@ + |