diff --git a/README.md b/README.md index aa1b10e..c434572 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # VillaFleurie rental site +[![Netlify Status](https://api.netlify.com/api/v1/badges/aa5c29ee-eced-46dd-ad53-1e0822001364/deploy-status)](https://app.netlify.com/sites/villafleurie-site/deploys) + ## TODO -- [ ] Create a base template for the header and footer +- [X] Create a base template for the header and footer - [ ] Build index page - [ ] Build room pages - [ ] Build contact pages diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..1dbe6db Binary files /dev/null and b/images/logo.png differ diff --git a/images/logo.svg b/images/logo.svg deleted file mode 100644 index 7357ec3..0000000 --- a/images/logo.svg +++ /dev/null @@ -1 +0,0 @@ -logo \ No newline at end of file diff --git a/index.html b/index.html index 3326f07..8cb8dae 100644 --- a/index.html +++ b/index.html @@ -3,97 +3,76 @@ -<<<<<<< HEAD - -======= ->>>>>>> 975f0fb (use jinja) - - + + - - - - - - - + + + + + + + + - Villa + VillaFleurie - + - - + + - + - - + @@ -719,87 +698,85 @@ - - - -
-
-
-
-

If you are looking too have a comfortable and relaxing time then you should get in touch with us using reception@villa.com

- +
+
+
+
+ - -
-
-
-
-
-
-
-
-
- -
-
-

Copyright © Name

-
-
-
-
- + +
+
+
+
+
+
+
+
+
+ +
+
+

Copyright © VillaFleurie

+
+
+
+
+ - - - - - - - - + + + + + + + + diff --git a/templates/layout.html b/templates/layout.html index fcf22f2..a0de994 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -5,177 +5,157 @@ - - + + - - - - - - - + + + + + + + + VillaFleurie - + - - + + - + - - + {% block content %} {% endblock %} - - - - -
-
-
-
-

If you are looking too have a comfortable and relaxing time then you should get in touch with us using reception@villa.com

- +
+
+
+
+ - -
-
-
-
-
-
-
-
-
- -
-
-

Copyright © Name

-
-
-
-
- + +
+
+
+
+
+
+
+
+
+ +
+
+

Copyright © VillaFleurie

+
+
+
+
+ - - - - - - - - + + + + + + + + \ No newline at end of file