From d691b3c84931573657d35ade4d354670e24452c2 Mon Sep 17 00:00:00 2001 From: Hadrien RENAUD Date: Mon, 9 Sep 2019 00:58:53 +0200 Subject: [PATCH] :lipstick: Add navbar --- assets/style.css | 82 ++--------------- server_files/config.php | 16 ++-- server_files/views/footer.php | 2 - server_files/views/header.php | 164 ++++++++++++++++++++-------------- 4 files changed, 111 insertions(+), 153 deletions(-) diff --git a/assets/style.css b/assets/style.css index bf10db5..3a2b5f9 100644 --- a/assets/style.css +++ b/assets/style.css @@ -1,80 +1,8 @@ -body { - display: flex; +:root { + --navbar-height: 32px; } -html, body { - height: 100%; - width: 100%; - margin: 0; -} - -#menu { - list-style-type: none; - margin: 0; - padding: 0; - width: 220px; - background-color: #f1f1f1; - height: 100%; - overflow: auto; - flex-grow: 0; -} - -#menu a { +#navbar-logo { + height: var(--navbar-height); display: block; - color: #000; - padding: 10px 20px; - text-decoration: none; -} - -#menu a.active { - background-color: #4CAF50; - color: white; -} - -#menu a:hover:not(.active) { - background-color: #555; - color: white; -} - -#menu-logo img { - width: calc(100% - 40px); - margin: 40px auto; - display: block; -} - -#main-container { - margin: 0; - flex-grow: 1; - height: 100%; - overflow-y: scroll; -} - -#main-content { - padding-top: 100px; - padding-bottom: 100px; - margin: 0 auto; - max-width: 1000px; - text-align: justify; -} - -@media only screen and (max-width: 700px) { - body { - flex-direction: column; - height: auto; - } - #menu { - height: auto; - width: 100%; - padding-bottom: 20px; - } - #menu-logo img { - height: 70px; - padding-left: 7px; - } - #menu a { - text-align: center; - } - #main-content { - padding: 100px 16px; - } -} +} \ No newline at end of file diff --git a/server_files/config.php b/server_files/config.php index a57349b..99b7008 100644 --- a/server_files/config.php +++ b/server_files/config.php @@ -3,10 +3,10 @@ * Config options */ -$YEAR = $_ENV["TFJM_YEAR"]; -$URL_BASE = $_ENV["TFJM_URL_BASE"]; -$LOCAL_PATH = $_ENV["TFJM_LOCAL_PATH"]; -$MAIL_DOMAIN = $_ENV["TFJM_MAIL_DOMAIN"]; +$YEAR = getenv("TFJM_YEAR"); +$URL_BASE = getenv("TFJM_URL_BASE"); +$LOCAL_PATH = getenv("TFJM_LOCAL_PATH"); +$MAIL_DOMAIN = getenv("TFJM_MAIL_DOMAIN"); // TODO Remove $MAIL_ADDRESS = "contact@" . $MAIL_DOMAIN; @@ -14,10 +14,10 @@ $MAIL_ADDRESS = "contact@" . $MAIL_DOMAIN; * DB infos */ -$DB_HOST = $_ENV["TFJM_DB_HOST"]; -$DB_NAME = $_ENV["TFJM_DB_NAME"]; -$DB_USER = $_ENV["TFJM_DB_USER"]; -$DB_PASSWORD = $_ENV["TFJM_DB_PASSWORD"]; +$DB_HOST = getenv("TFJM_DB_HOST"); +$DB_NAME = getenv("TFJM_DB_NAME"); +$DB_USER = getenv("TFJM_DB_USER"); +$DB_PASSWORD = getenv("TFJM_DB_PASSWORD"); try { $DB = new PDO("mysql:host=$DB_HOST;dbname=$DB_NAME;charset=utf8", "$DB_USER", "$DB_PASSWORD", array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)); diff --git a/server_files/views/footer.php b/server_files/views/footer.php index 078caa7..5181ba3 100644 --- a/server_files/views/footer.php +++ b/server_files/views/footer.php @@ -1,5 +1,3 @@ - - diff --git a/server_files/views/header.php b/server_files/views/header.php index 584ff64..fb7d9f5 100644 --- a/server_files/views/header.php +++ b/server_files/views/header.php @@ -1,76 +1,108 @@ - - - - Site d'inscription pour le TFJM² <?= $YEAR ?> + + + Site d'inscription pour le TFJM² <?= $YEAR ?> - + - - - - - - - - - - - + + - + + + + -
-
-
\ No newline at end of file +
\ No newline at end of file