Skip to content

Commit a929728

Browse files
Update index and Readme
2 parents e268b9d + 2aeb6a3 commit a929728

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<<<<<<< HEAD
2+
<<<<<<< HEAD
23
# Corsera-test
34
test of my first repository
45
=======
@@ -14,3 +15,16 @@ Also, after selecting a date, the selection of previous dates is disabled.
1415
[PREVIEW](https://full-stack-web-developer-and-designer.github.io/jQuery-datepicker/)
1516

1617
>>>>>>> 2aeb6a3 (Update README file)
18+
=======
19+
# jQuery datepicker
20+
This is the repository for **jQuery datepicker**. For this repository we need three different jQuery files.
21+
1. [jQuery.js](https://code.jquery.com/jquery-2.2.4.js)
22+
2. [jQuery.ui.css](https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css)
23+
3. [jQuery.ui.js](https://code.jquery.com/ui/1.12.1/jquery-ui.js)
24+
---
25+
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.
26+
Also, after selecting a date, the selection of previous dates is disabled.
27+
##
28+
[PREVIEW](https://full-stack-web-developer-and-designer.github.io/jQuery-datepicker/)
29+
30+
>>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107

index.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
});
3636
});
3737
</script>
38+
<<<<<<< HEAD
3839
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.10/css/all.css" integrity="sha384-+d0P83n9kaQMCwj8F4RJB66tzIwOKmrdb46+porD/OvrJ+37WqIM7UoBtwHO6Nlg" crossorigin="anonymous">
3940
<style>
4041
main {
@@ -71,6 +72,9 @@
7172
background-color: #FFF;
7273
}
7374
</style>
75+
=======
76+
<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>
77+
>>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107
7478
</head>
7579
<body>
7680
<main>
@@ -85,6 +89,7 @@ <h1>Make your reservation in the time!</h1>
8589
</select>
8690
<input type="submit" value="Search">
8791
</main>
92+
<<<<<<< HEAD
8893
<div id="footer">
8994
<section class="footer-social">
9095
<a href="https://www.facebook.com/mirnes.glamocic.5/" target="_blank">
@@ -100,5 +105,7 @@ <h1>Make your reservation in the time!</h1>
100105
</a>
101106
</section>
102107
</div><!-- end #footer -->
108+
=======
109+
>>>>>>> 2aeb6a3758e04747c16f8ee0fab61ac063e3d107
103110
</body>
104111
</html>

0 commit comments

Comments
 (0)