ourworld_web/www_threefold_io
23
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Ehab Hassan
2024-03-05 12:04:48 +02:00
parent 69e7b7bcf5 956086789c
commit 45260efbea
405 changed files with 9302 additions and 1924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/layouts/blog.html
View File

@@ -24,7 +24,7 @@ and a side nav for category and featured post navigation
{% include "partials/featuredBlog.html" %}
<div class="flex flex-col md:flex-row container mx-auto">
<div class="flex flex-col md:flex-row container mx-auto my-6">
{% include "partials/blogPosts.html" %}
{% include "partials/blogSidebar.html" %}
</div>

2
templates/layouts/newsroom.html
View File

@@ -24,7 +24,7 @@ and a side nav for category and featured post navigation
{% include "partials/featuredNews.html" %}
<div class="flex flex-col md:flex-row container mx-auto">
<div class="flex flex-col md:flex-row container mx-auto my-6">
{% include "partials/newsPosts.html" %}
{% include "partials/newsSidebar.html" %}
</div>