diff --git a/assets/.htaccess b/assets/.htaccess old mode 100644 new mode 100755 diff --git a/assets/audio/USA.mp3 b/assets/audio/USA.mp3 old mode 100644 new mode 100755 diff --git a/assets/audio/USSR.mp3 b/assets/audio/USSR.mp3 old mode 100644 new mode 100755 diff --git a/assets/css/hamburger.css b/assets/css/hamburger.css old mode 100644 new mode 100755 diff --git a/assets/css/photos.css b/assets/css/photos.css old mode 100644 new mode 100755 diff --git a/assets/css/planning_events.css b/assets/css/planning_events.css old mode 100644 new mode 100755 diff --git a/assets/css/score.css b/assets/css/score.css old mode 100644 new mode 100755 index 70fc837..4827143 --- a/assets/css/score.css +++ b/assets/css/score.css @@ -71,6 +71,16 @@ margin: 0; } +#main-score .score-logo { + height: 60px; + margin: 0 5px 0 5px; +} + +#main-score .score-usa, #main-score .score-urss { + font-size: 40px; + line-height: 80px; +} + @media screen and (max-width: 480px) { #top-bar-score { display: none; diff --git a/assets/css/sidenav.css b/assets/css/sidenav.css old mode 100644 new mode 100755 diff --git a/assets/css/stats.css b/assets/css/stats.css old mode 100644 new mode 100755 diff --git a/assets/css/style.css b/assets/css/style.css old mode 100644 new mode 100755 index 49b9cf6..5744d68 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -402,8 +402,8 @@ Full-Width Styles } .main-link{ - width: 80px; - height: 80px; + width: 85px; + height: 85px; margin: 2px; display: inline-grid; vertical-align: middle; @@ -420,7 +420,7 @@ Full-Width Styles } .main-logo { - font-size: 64px; + font-size: 70px; display: inline-flex; } @@ -428,6 +428,12 @@ Full-Width Styles margin: auto; } +.main-logo img { + width: 90%; + margin: auto; + padding: 0; +} + #list-blouse{ text-align: left; diff --git a/assets/images/bg_up.jpg b/assets/images/bg_up.jpg old mode 100644 new mode 100755 diff --git a/assets/images/blouse_example.png b/assets/images/blouse_example.png old mode 100644 new mode 100755 diff --git a/assets/images/blouse_example_2017.jpeg b/assets/images/blouse_example_2017.jpeg old mode 100644 new mode 100755 diff --git a/assets/images/general_urss.jpg b/assets/images/general_urss.jpg old mode 100644 new mode 100755 diff --git a/assets/images/general_usa.jpg b/assets/images/general_usa.jpg old mode 100644 new mode 100755 diff --git a/assets/images/logo-site-accueil.svg b/assets/images/logo-site-accueil.svg old mode 100644 new mode 100755 diff --git a/assets/images/map.svg b/assets/images/map.svg old mode 100644 new mode 100755 diff --git a/assets/images/planning.png b/assets/images/planning.png old mode 100644 new mode 100755 diff --git a/assets/images/titre-site-accueil.svg b/assets/images/titre-site-accueil.svg old mode 100644 new mode 100755 diff --git a/assets/images/urss.png b/assets/images/urss.png old mode 100644 new mode 100755 diff --git a/assets/images/urss_logo.png b/assets/images/urss_logo.png old mode 100644 new mode 100755 diff --git a/assets/images/usa.png b/assets/images/usa.png old mode 100644 new mode 100755 diff --git a/assets/images/usa_logo.png b/assets/images/usa_logo.png old mode 100644 new mode 100755 diff --git a/assets/scripts/TimerScript.js b/assets/scripts/TimerScript.js old mode 100644 new mode 100755 diff --git a/assets/scripts/jquery.mousewheel.min.js b/assets/scripts/jquery.mousewheel.min.js old mode 100644 new mode 100755 diff --git a/assets/scripts/map.js b/assets/scripts/map.js old mode 100644 new mode 100755 diff --git a/assets/scripts/photosScript.js b/assets/scripts/photosScript.js old mode 100644 new mode 100755 diff --git a/assets/scripts/planningScript.js b/assets/scripts/planningScript.js old mode 100644 new mode 100755 diff --git a/assets/scripts/sidenavScript.js b/assets/scripts/sidenavScript.js old mode 100644 new mode 100755 diff --git a/blouse.php b/blouse.php old mode 100644 new mode 100755 index 46abdaa..6387dd2 --- a/blouse.php +++ b/blouse.php @@ -53,7 +53,10 @@ ob_start(); // Start reading html D’humour tu feras preuve, bonus à la clé - +

+ Pour t’aider dans l ‘élaboration de ton œuvre magistrale, voici les logos de + la semaine (à ne surtout pas coller évidement, utilise-les seulement comme modèle !). +

diff --git a/classes/dao.php b/classes/dao.php old mode 100644 new mode 100755 diff --git a/coms.php b/coms.php old mode 100644 new mode 100755 diff --git a/downloads.php b/downloads.php old mode 100644 new mode 100755 index 39c52c6..a8fbb13 --- a/downloads.php +++ b/downloads.php @@ -1,20 +1,26 @@ -

Téléchargements

+

Les Téléchargements

Sur cette page tu peux télécharger les différents documents de ta semaine d'accueil

" class="main-link" href=""> \ No newline at end of file diff --git a/includes/map_descriptions/amicale.html b/includes/map_descriptions/amicale.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/bib.html b/includes/map_descriptions/bib.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/csh.html b/includes/map_descriptions/csh.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/exam.html b/includes/map_descriptions/exam.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/gc.html b/includes/map_descriptions/gc.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/gei.html b/includes/map_descriptions/gei.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/gm.html b/includes/map_descriptions/gm.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/gmm.html b/includes/map_descriptions/gmm.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/gp.html b/includes/map_descriptions/gp.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/gpe.html b/includes/map_descriptions/gpe.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/gymnase.html b/includes/map_descriptions/gymnase.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/laverie.html b/includes/map_descriptions/laverie.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/loge.html b/includes/map_descriptions/loge.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/pk.html b/includes/map_descriptions/pk.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/r1.html b/includes/map_descriptions/r1.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/r2.html b/includes/map_descriptions/r2.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/r3.html b/includes/map_descriptions/r3.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/r4.html b/includes/map_descriptions/r4.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/r5.html b/includes/map_descriptions/r5.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/r6.html b/includes/map_descriptions/r6.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/r7.html b/includes/map_descriptions/r7.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/ru.html b/includes/map_descriptions/ru.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/stpi.html b/includes/map_descriptions/stpi.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/tp.html b/includes/map_descriptions/tp.html old mode 100644 new mode 100755 diff --git a/includes/map_descriptions/trou.html b/includes/map_descriptions/trou.html old mode 100644 new mode 100755 diff --git a/includes/photos/folder_template.php b/includes/photos/folder_template.php old mode 100644 new mode 100755 diff --git a/includes/photos/path_template.php b/includes/photos/path_template.php old mode 100644 new mode 100755 diff --git a/includes/photos/photo_template.php b/includes/photos/photo_template.php old mode 100644 new mode 100755 diff --git a/includes/planning_events/act_prev.html b/includes/planning_events/act_prev.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/banquet.html b/includes/planning_events/banquet.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/barbecue.html b/includes/planning_events/barbecue.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/com_ville.html b/includes/planning_events/com_ville.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/com_walle.html b/includes/planning_events/com_walle.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/discours.html b/includes/planning_events/discours.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/escape_game.html b/includes/planning_events/escape_game.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/fabcamp.html b/includes/planning_events/fabcamp.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/remise_niveau.html b/includes/planning_events/remise_niveau.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/soir.html b/includes/planning_events/soir.html old mode 100644 new mode 100755 diff --git a/includes/planning_events/wini.html b/includes/planning_events/wini.html old mode 100644 new mode 100755 index 68d7d1f..140de2a --- a/includes/planning_events/wini.html +++ b/includes/planning_events/wini.html @@ -1,2 +1,6 @@

Le WINI

-

Un petit week-end avec ta promo et des 3èmes années. Nous on n'est pas invités (#pascontent)... Mais tu vas t'éclater quand même !

+

+ Un petit week-end pour clôturer ta semaine. On sera toujours là pour t’accompagner t’inquiète pas ! Comme ya déjà + une page pour le WINI et que j’ai la flemme de réécrire la même chose, va donc voire cette magnifique page pour le + WINI. +

\ No newline at end of file diff --git a/includes/score_counter.php b/includes/score_counter.php old mode 100644 new mode 100755 diff --git a/includes/sidenav.html b/includes/sidenav.html old mode 100644 new mode 100755 index abed556..498f2c8 --- a/includes/sidenav.html +++ b/includes/sidenav.html @@ -5,6 +5,9 @@ Le Planning + Le + WINI Le Plan diff --git a/includes/top_bar.php b/includes/top_bar.php old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100644 new mode 100755 index d385a88..de9adb0 --- a/index.php +++ b/index.php @@ -25,7 +25,7 @@ $scoreURSS = get_total_points('urss'); - + Semaine d'Accueil 2018 | INSA Toulouse @@ -57,11 +57,17 @@ $scoreURSS = get_total_points('urss');

Semaine d'Accueil INSA Toulouse 2018