correction et modif de menu

2020-12-04 03:44:07 +01:00 · 2020-12-04 03:44:07 +01:00 · 54dca3ae89
commit 54dca3ae89
parent bd69b17b91
5 changed files with 38 additions and 30 deletions
--- a/css/index.css
+++ b/css/index.css
@ -1,3 +1,8 @@
+html
+{
+    background-color: #dbdbdbde;
+}
+
 body
 {
    font-style: normal;
--- a/css/menu.css
+++ b/css/menu.css
@ -1,3 +1,10 @@
+#Menu
+{
+	width: 100%;
+	position: sticky;
+	top: 0;
+}
+
 #blockMenu
 {
 	float: right;
--- a/inscription.html
+++ b/inscription.html
@ -19,18 +19,12 @@

        <!-- Login Form -->
        <form>
-<<<<<<< HEAD
-            <input type="text" id="login" class="fondu second" name="login" placeholder="Nom d'utilisateur">
-            <input type="text" id="password" class="fondu third" name="password" placeholder="Mot de passe">
-            <input type="submit" class="fondu fourth" value="S'inscrire">
-=======
            <input type="text" id="nom" class="fondu premier" name="nom" placeholder="Nom">
            <input type="text" id="prenom" class="fondu deuxieme" name="prenom" placeholder="Prenom">
            <input type="text" id="mail" class="fondu troisieme" name="mail" placeholder="E-mail">
            <input type="text" id="login" class="fondu quatrieme" name="login" placeholder="Nom d'utilisateur">
            <input type="text" id="password" class="fondu cinquieme" name="login" placeholder="Mot de passe">
            <input type="submit" class="fondu sixieme" value="S'inscrire">
->>>>>>> b9bf5b2edb8e213d4bd18f03395ccc8c4d5450d2
        </form>

        <!-- Remind Passowrd -->
--- a/js/menu
+++ b/js/menu
--- a/menu.html
+++ b/menu.html
@ -9,6 +9,7 @@
    </head>

    <body>
+        <div id="Menu">
            <div id="blockLogo">
                <img id="logo" src="img/logoV2.jpg">
            </div>
@ -33,5 +34,6 @@
                </ul>
            </nav>
            <div id="blockDeco"></div>
+        </div>
    </body>
 </html>