From 54dca3ae891e85e7ffa8f177d1654c8dd279f026 Mon Sep 17 00:00:00 2001 From: MathieuRethers <71334121+MaretSoldier@users.noreply.github.com> Date: Fri, 4 Dec 2020 03:44:07 +0100 Subject: [PATCH 1/3] correction et modif de menu --- css/index.css | 5 +++++ css/menu.css | 9 ++++++++- inscription.html | 6 ------ js/menu | 0 menu.html | 48 +++++++++++++++++++++++++----------------------- 5 files changed, 38 insertions(+), 30 deletions(-) create mode 100644 js/menu diff --git a/css/index.css b/css/index.css index a84a243..9343da1 100644 --- a/css/index.css +++ b/css/index.css @@ -1,3 +1,8 @@ +html +{ + background-color: #dbdbdbde; +} + body { font-style: normal; diff --git a/css/menu.css b/css/menu.css index eeae68f..c5bfccb 100644 --- a/css/menu.css +++ b/css/menu.css @@ -1,3 +1,10 @@ +#Menu +{ + width: 100%; + position: sticky; + top: 0; +} + #blockMenu { float: right; @@ -84,4 +91,4 @@ height: 10px; float: right; background-color: #5496c2; -} +} \ No newline at end of file diff --git a/inscription.html b/inscription.html index e0f12b1..1aff92c 100644 --- a/inscription.html +++ b/inscription.html @@ -19,18 +19,12 @@
-<<<<<<< HEAD - - - -======= ->>>>>>> b9bf5b2edb8e213d4bd18f03395ccc8c4d5450d2
diff --git a/js/menu b/js/menu new file mode 100644 index 0000000..e69de29 diff --git a/menu.html b/menu.html index 46972a1..48e1c5b 100644 --- a/menu.html +++ b/menu.html @@ -9,29 +9,31 @@ -