flayks/housesof
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'v2' of https://git.server.flayks.com/cetrucflotte/housesof into v2

Browse Source 
# Conflicts:
#	src/components/molecules/Location.svelte
#	src/routes/index.svelte
This commit is contained in:
Shelby Kay
2021-09-30 23:31:40 +02:00
parent 7777d26907 a5380070a1
commit b393e0b64d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/molecules/Location.svelte
View File

@@ -73,4 +73,4 @@
<div class="location__photos"> <div class="location__photos">
<span>{photoIndex}</span> <span>{photoIndex}</span>
</div> </div>
</div> </div>

1
src/routes/__layout.svelte
View File

@@ -55,6 +55,7 @@
seo_name seo_name
seo_title seo_title
seo_description seo_description
limit_new
instagram instagram
footer_links footer_links
newsletter_url newsletter_url

5
src/routes/index.svelte
View File

@@ -1,9 +1,8 @@
<script lang="ts"> <script lang="ts">
import { getContext } from 'svelte' import { getContext } from 'svelte'
// Components // Components
import Button from '$components/atoms/Button.svelte'
import Locations from '$components/organisms/Locations.svelte'
import Metas from '$components/Metas.svelte' import Metas from '$components/Metas.svelte'
import Button from '$components/atoms/Button.svelte'
import PhotoCard from '$components/molecules/PhotoCard.svelte' import PhotoCard from '$components/molecules/PhotoCard.svelte'
import Newsletter from '$components/organisms/Newsletter.svelte' import Newsletter from '$components/organisms/Newsletter.svelte'
import Shop from '$components/organisms/Shop.svelte' import Shop from '$components/organisms/Shop.svelte'
@@ -86,4 +85,4 @@
} }
} }
} }
</script> </script>