Update index and Readme

full-stack-web-developer-and-designer · full-stack-web-developer-and-designer · commit a929728b4cfe · 2022-01-15T20:05:49.000+01:00
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 # Corsera-test
 test of my first repository
 =======
@@ -14,3 +15,16 @@ Also, after selecting a date, the selection of previous dates is disabled.
 [PREVIEW](https://full-stack-web-developer-and-designer.github.io/jQuery-datepicker/)
 
 >>>>>>> 2aeb6a3 (Update README file)
+=======
+# jQuery datepicker
+This is the repository for **jQuery datepicker**. For this repository we need three different jQuery files.
+1.  [jQuery.js](https://code.jquery.com/jquery-2.2.4.js)
+2. [jQuery.ui.css](https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css)
+3. [jQuery.ui.js](https://code.jquery.com/ui/1.12.1/jquery-ui.js)
+---
+This repository contains the **jQuery** _function_ for change the _year_, _month_, _date format_ and _the first day of the week_, which in this case is set to Monday. 
+Also, after selecting a date, the selection of previous dates is disabled. 
+## 
+[PREVIEW](https://full-stack-web-developer-and-designer.github.io/jQuery-datepicker/)
+
+>>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107
diff --git a/index.html b/index.html
@@ -35,6 +35,7 @@
 	});
 });
         </script>
+<<<<<<< HEAD
          <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" integrity="sha384-+d0P83n9kaQMCwj8F4RJB66tzIwOKmrdb46+porD/OvrJ+37WqIM7UoBtwHO6Nlg" crossorigin="anonymous">
         <style>
         main {
@@ -71,6 +72,9 @@
             background-color: #FFF;
         }
         </style>
+=======
+        <style>main{width: 70%;margin: 100px auto;padding: 1px 50px 50px;background-color:#AAA;}h1{color:#FFF;text-align:center;}input{margin: 0 15px 0 0;}</style>
+>>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107
     </head>
     <body>
     <main>
@@ -85,6 +89,7 @@ <h1>Make your reservation in the time!</h1>
         </select> 
         <input type="submit" value="Search">
     </main>
+<<<<<<< HEAD
     <div id="footer">
         <section class="footer-social">
           <a href="https://www.facebook.com/mirnes.glamocic.5/" target="_blank">
@@ -100,5 +105,7 @@ <h1>Make your reservation in the time!</h1>
           </a>
         </section>
       </div><!-- end #footer -->
+=======
+>>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107
 </body>
 </html>
