fix conflicts
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
<!-- End Twitter universal website tag code -->
|
||||
|
||||
{% include "partials/header.html" %}
|
||||
<div id="content" class="p-4 pt-12 sm:p-12 md:p-16 lg:p-20 overflow-hidden">
|
||||
<div id="content" class="px-4 lg:px-0 pt-12 overflow-hidden">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
<div class="p-8">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -2,36 +2,44 @@
|
||||
Tailwind UI components require Tailwind CSS v1.8 and the @tailwindcss/ui plugin.
|
||||
Read the documentation to get started: https://tailwindui.com/documentation
|
||||
-->
|
||||
|
||||
{%- set section = get_section(path="footer/_index.md") %}
|
||||
{%- set logoPath = section.extra.logoPath %}
|
||||
|
||||
<html>
|
||||
<head/>
|
||||
<body>
|
||||
<head /><body>
|
||||
<div class="mt-6 border-t border-gray-200 pt-2"></div>
|
||||
<footer class="bg-white">
|
||||
<div class="max-w-screen-2xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
|
||||
<div class="xl:flex xl:gap-4">
|
||||
<div class="space-y-8 lg:max-w-sm xl:max-w-sm lg:mr-8 lg:mb-8 xl:col-span-1">
|
||||
<img class="w-16 h-auto sm:w-15" src="{{ get_url(path=logoPath)}}" alt="ThreeFold Logo">
|
||||
<p class="text-gray-500 text-base leading-6 ">
|
||||
{{section.description}}
|
||||
</p>
|
||||
{% include "partials/socialLinks.html" %}
|
||||
</div>
|
||||
<div class="mt-6 lg:mt-0 w-full px-8 sm:px-12 md:px-16 lg:px-20 footer-cust">
|
||||
{{ section.content | safe }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-12 mx-auto border-t border-gray-200 pt-8">
|
||||
<p data-v-14efe4a7="" class="text-base leading-6 text-gray-400 text-center">
|
||||
©
|
||||
<span id="year"></span>
|
||||
ThreeFold, All rights reserved.
|
||||
<a target="_blank" href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" class="leading-6 text-gray-500 hover:text-gray-900">Terms & Conditions |</a>
|
||||
<a target="_blank" href="https://library.threefold.me/info/legal/#/legal__privacypolicy" class="leading-6 text-gray-500 hover:text-gray-900">Privacy Policy</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="max-w-screen-2xl mx-auto py-12 px-4 sm:px-6 lg:py-16 lg:px-8">
|
||||
<div class="xl:flex xl:gap-4">
|
||||
<div class="space-y-8 lg:max-w-sm xl:max-w-sm lg:mr-8 lg:mb-8 xl:col-span-1">
|
||||
<img class="w-16 h-auto sm:w-15" src="{{ get_url(path=logoPath)}}" alt="ThreeFold Logo" />
|
||||
<p class="text-gray-500 text-base leading-6 ">
|
||||
{{section.description}}
|
||||
</p>
|
||||
{% include "partials/socialLinks.html" %}
|
||||
</div>
|
||||
|
||||
<div class="mt-6 lg:mt-0 w-full px-8 sm:px-12 md:px-16 lg:px-20 footer-cust">
|
||||
{{ section.content | safe }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="mt-12 mx-auto border-t border-gray-200 pt-8">
|
||||
<p data-v-14efe4a7="" class="text-base leading-6 text-gray-400 text-center">
|
||||
© <span id="year"></span> ThreeFold, All rights reserved.
|
||||
<a target="_blank" href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" class="leading-6 text-gray-500 hover:text-gray-900">Terms & Conditions |
|
||||
</a><a target="_blank" href="https://library.threefold.me/info/legal/#/legal__privacypolicy" class="leading-6 text-gray-500 hover:text-gray-900">Privacy Policy |
|
||||
</a><a href="/tfLabs" class="leading-6 text-gray-500 hover:text-gray-900">ThreeFold Labs IT</a></p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -151,15 +151,15 @@
|
||||
})(window, document, 'script', 'https://static.mailerlite.com/js/universal.js', 'ml');
|
||||
|
||||
var ml_account = ml('accounts', '1778010', 'x2d3d9f8n1', 'load');
|
||||
</script>
|
||||
<!-- End MailerLite Universal -->
|
||||
<!-- RSS feed -->
|
||||
{% block rss %}
|
||||
<link
|
||||
rel="alternate"
|
||||
type="application/rss+xml"
|
||||
title="RSS"
|
||||
href="{{ get_url(path='atom.xml', trailing_slash=false) }}"
|
||||
>
|
||||
{% endblock %}
|
||||
</script>
|
||||
<!-- End MailerLite Universal -->
|
||||
<!-- RSS feed -->
|
||||
{% block rss %}
|
||||
<link
|
||||
rel="alternate"
|
||||
type="application/rss+xml"
|
||||
title="RSS"
|
||||
href="{{ get_url(path='atom.xml', trailing_slash=false) }}"
|
||||
>
|
||||
{% endblock %}
|
||||
</head>
|
||||
|
||||
@@ -27,33 +27,39 @@
|
||||
<div class="hidden lg:flex-1 lg:flex lg:items-center lg:justify-between lg:space-x-6">
|
||||
<nav class="flex space-x-10">
|
||||
{% for header_item in header_items %}
|
||||
{% if not loop.first %}
|
||||
{% set header_arr = header_item | split(pat="</li>") %}
|
||||
{% set header_label = header_arr[0] %}
|
||||
{% if "<a" in header_label %}
|
||||
{% set link_label = header_label | striptags %}
|
||||
{% set link_path = header_label | split(pat="%22") | safe %}
|
||||
{% if header_label is containing("http") %}
|
||||
{% if header_label is not containing("threefold") %}
|
||||
<a href="{{link_path[1]}}" target="_blank" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
|
||||
{{link_label}}
|
||||
{% if not loop.first %}
|
||||
{% set header_arr = header_item | split(pat="</li>") %}
|
||||
{% set header_label = header_arr[0] %}
|
||||
{% if '<a' in header_label %}
|
||||
{% set link_label = header_label | striptags %}
|
||||
{% set link_path = header_label | split(pat="%22") | safe%}
|
||||
{% set current = get_url(path=link_path[1]) ~ "/" %}
|
||||
{% if header_label is containing("http") %}
|
||||
{% if header_label is not containing("threefold") %}
|
||||
<a href="{{link_path[1]}}" target="_blank" class="text-lg py-3 leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
|
||||
{{link_label}}
|
||||
</a>
|
||||
{% endif %}
|
||||
{% elif current == current_url %}
|
||||
<a href="{{ get_url(path=link_path[1])}}" class="text-lg py-3 leading-6 font-normal active hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
|
||||
{{link_label}}
|
||||
</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<a href="{{ get_url(path=link_path[1])}}" class="text-lg leading-6 font-medium text-gray-900 hover:text-gray-500 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
|
||||
{{link_label}}
|
||||
</a>
|
||||
<a href="{{ get_url(path=link_path[1])}}" class="text-lg py-3 leading-6 font-normal text-gray-900 hover:text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150">
|
||||
{{link_label}}
|
||||
</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<div class="relative">
|
||||
{% set button_id = header_label ~ "-menu-btn" | slugify %}
|
||||
<button type="button" id="{{button_id}}" class="nav_btn text-gray-900 hover:text-gray-500 group inline-flex items-center space-x-2 text-lg leading-6 font-normal hover:text-gray-500 focus:outline-none transition ease-in-out duration-150">
|
||||
{{ header_label }}
|
||||
<div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
|
||||
</button>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<div class="relative">
|
||||
{% set button_id = header_label ~ "-menu-btn" | slugify %}
|
||||
<button type="button" id="{{button_id}}" class="nav_btn py-3 text-gray-900 group inline-flex items-center space-x-2 text-lg leading-6 font-normal hover:text-gray-500 focus:outline-none transition ease-in-out duration-150">
|
||||
<span>{{ header_label }}</span>
|
||||
<div class="-rotate-90 transition-transform"><svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"/></svg></div>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</nav>
|
||||
|
||||
@@ -207,4 +213,4 @@
|
||||
</div>
|
||||
|
||||
|
||||
</header>
|
||||
</header>
|
||||
@@ -55,7 +55,7 @@
|
||||
</a>
|
||||
</button>
|
||||
<button class="my-8">
|
||||
<a href="/farm" target="_self">
|
||||
<a href="/host" target="_self">
|
||||
Become a Cloud Provider
|
||||
</a>
|
||||
</button>
|
||||
|
||||
82
templates/shortcodes/grid_stats_expand.html
Normal file
82
templates/shortcodes/grid_stats_expand.html
Normal file
@@ -0,0 +1,82 @@
|
||||
{% set styles = "background-image: url('V3.png');" %}
|
||||
{% set data = load_data(url="https://gridproxy.grid.tf/stats?status=up", required=false, format="json") %}
|
||||
{% if data %}
|
||||
{% set capacity = (data.totalHru + data.totalSru) / 1024 / 1024 / 1024 / 1024 / 1024 %}
|
||||
{% set nodes = data.nodes %}
|
||||
{% set countries = data.countries %}
|
||||
{% set cores = data.totalCru %}
|
||||
{% endif %}
|
||||
|
||||
{% if data %}
|
||||
<section class="px-2 h-auto bg-center lg:py-28 p-12 bg-cover bg-no-repeat" style="{{styles}}">
|
||||
<div class="relative lg:max-w-6xl mx-auto">
|
||||
<div class="text-center rounded lg:px-6 mt-10 lg:mt-0 mx-auto">
|
||||
{{body | markdown | safe }}
|
||||
|
||||
<div class="my-10 grid lg:grid-cols-4 lg:gap-8">
|
||||
|
||||
|
||||
<!-- capacity -->
|
||||
<div class="flex flex-col border border-gray-50 shadow-lg bg-white py-8 my-4">
|
||||
<img class="mx-auto p-4" src="V3-08.png" width="150" alt="">
|
||||
<div class="leading-none font-extrabold text-3xl">
|
||||
{{ capacity | round(precision=2) }}PB
|
||||
<span class="block text-lg mt-4 font-normal capitalize">capacity</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Nodes -->
|
||||
<div class="flex flex-col border border-gray-50 shadow-lg bg-white py-8 my-4">
|
||||
<img class="mx-auto p-4" src="V3-09.png" width="150" alt="">
|
||||
<div class="leading-none font-extrabold text-3xl">
|
||||
{{ nodes }}
|
||||
<span class="block text-lg mt-4 font-normal capitalize">nodes</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- countries -->
|
||||
<div class="flex flex-col border border-gray-50 shadow-lg bg-white py-8 my-4">
|
||||
<img class="mx-auto p-4" src="V3-10.png" width="150" alt="">
|
||||
<div class="leading-none font-extrabold text-3xl">
|
||||
{{ countries }}
|
||||
<span class="block text-lg mt-4 font-normal capitalize">countries</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- cores -->
|
||||
<div class="flex flex-col border border-gray-50 shadow-lg bg-white py-8 my-4">
|
||||
<img class="mx-auto p-4" src="V3-11.png" width="150" alt="">
|
||||
<div class="leading-none font-extrabold text-3xl">
|
||||
{{ cores | num_format }}
|
||||
<span class="block text-lg mt-4 font-normal capitalize">cores</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<button><a href="https://dashboard.grid.tf/explorer/statistics">Explore Grid Capacity</a></button>
|
||||
<button><a href="/host">Become a Host</a></button>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{% endif %}
|
||||
<style>
|
||||
dd {
|
||||
display: inline-block;
|
||||
margin: auto;
|
||||
border-radius: 50%;
|
||||
line-height: 100px;
|
||||
}
|
||||
|
||||
.bg-green {
|
||||
background-color: #70dfc9;
|
||||
}
|
||||
|
||||
.bg-pink {
|
||||
background-color: #ea1ff7;
|
||||
}
|
||||
</style>
|
||||
20
templates/shortcodes/header_new.html
Normal file
20
templates/shortcodes/header_new.html
Normal file
@@ -0,0 +1,20 @@
|
||||
<div class="text-gray-900 bg-cover bg-no-repeat mybg" style="background-image:url(expand/BG_wide.png)">
|
||||
<div class="h-full">
|
||||
<div class="flex flex-col items-center md:flex-row">
|
||||
<div class="w-full md:w-1/2">
|
||||
<div class="block">
|
||||
<img
|
||||
src="expand/togethericon.png" class="w-full h-full"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex flex-col items-start justify-center w-full py-24 md:w-1/2">
|
||||
<div class="flex flex-col items-start justify-center p-6">
|
||||
<h1>Be the <strong>Internet</strong></h1>
|
||||
<h3 class="my-0">Host a node, support a decentralized future</h3>
|
||||
<p>By connecting a modern computer at your home or office to the ThreeFold Grid, you can provide Internet capacity to communities and builders, and be rewarded for doing this. Take part in shaping a new Internet era governed by all of us.</p>
|
||||
<button class="mx-0"><a target="_blank" href="https://manual.grid.tf/TF_Farmer_Guide/tf_farmer_guide_readme.html">Get Started</a></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -38,7 +38,6 @@
|
||||
bg-white
|
||||
text-lg
|
||||
learn-button
|
||||
hover:bg-gray-400
|
||||
lg:px-12
|
||||
px-6
|
||||
py-1
|
||||
@@ -77,7 +76,6 @@
|
||||
bg-white
|
||||
text-lg
|
||||
learn-button
|
||||
hover:bg-gray-400
|
||||
lg:px-12
|
||||
px-6
|
||||
py-1
|
||||
@@ -116,7 +114,6 @@
|
||||
bg-white
|
||||
text-lg
|
||||
learn-button
|
||||
hover:bg-gray-400
|
||||
lg:px-12
|
||||
px-6
|
||||
py-1
|
||||
@@ -155,7 +152,6 @@
|
||||
bg-white
|
||||
text-lg
|
||||
learn-button
|
||||
hover:bg-gray-400
|
||||
lg:px-12
|
||||
px-6
|
||||
py-1
|
||||
@@ -194,7 +190,6 @@
|
||||
bg-white
|
||||
text-lg
|
||||
learn-button
|
||||
hover:bg-gray-400
|
||||
lg:px-12
|
||||
px-6
|
||||
py-1
|
||||
|
||||
@@ -51,7 +51,7 @@ Parameters:
|
||||
{% set row_class = row_class ~ " lg:items-center" %}
|
||||
{% endif %}
|
||||
|
||||
{% set col_class = "flex-1 mb-6 md:mb-0 md:mx-2" %}
|
||||
{% set col_class = "flex-1 mb-6 md:mb-0 px-4 md:px-12" %}
|
||||
{% set row_id = '' %}
|
||||
|
||||
{% if id %}
|
||||
@@ -62,6 +62,16 @@ Parameters:
|
||||
|
||||
{% if style %}
|
||||
|
||||
{% if "centerItem" in style %}
|
||||
{% set row_class = "flex flex-col md:flex-row items-start" %}
|
||||
{% endif %}
|
||||
|
||||
<!-- reverse col at mobile -->
|
||||
|
||||
{% if "reverse" in style %}
|
||||
{% set row_class = "flex flex-col-reverse md:flex-row items-center" %}
|
||||
{% endif %}
|
||||
|
||||
{% if "center" in style %}
|
||||
{% set row_class = row_class ~ " text-center mx-auto justify-center" %}
|
||||
{% set col_class = col_class ~ " flex-1 m-4 lg:m-0" %}
|
||||
@@ -71,25 +81,25 @@ Parameters:
|
||||
{% set row_class = row_class ~ " text-white" %}
|
||||
{% endif %}
|
||||
|
||||
<!-- reverse col at mobile -->
|
||||
|
||||
{% if "reverse" in style %}
|
||||
{% set row_class = "flex flex-col-reverse md:flex-row items-center" %}
|
||||
{% endif %}
|
||||
|
||||
<!-- makes row with margins -->
|
||||
{% if "margin" in style %}
|
||||
{% set row_class = row_class ~ " lg:py-28 py-10" %}
|
||||
{% set row_class = row_class ~ " lg:py-24 py-10" %}
|
||||
{% set col_class = col_class ~ " flex-1 m-4 lg:m-0" %}
|
||||
{% endif %}
|
||||
|
||||
<!-- makes row with margins -->
|
||||
{% if "header" in style %}
|
||||
{% set row_class = row_class ~ " h-auto md:h-screen mt-4 lg:mt-0" %}
|
||||
{% set col_class = col_class ~ " m-4 lg:m-0" %}
|
||||
{% endif %}
|
||||
|
||||
{% if "mtop" in style %}
|
||||
{% set row_class = row_class ~ " lg:pt-28 pt-10" %}
|
||||
{% set row_class = row_class ~ " lg:pt-24 pt-2" %}
|
||||
{% set col_class = col_class ~ " flex-1 m-4 lg:m-0" %}
|
||||
{% endif %}
|
||||
|
||||
{% if "mbottom" in style %}
|
||||
{% set row_class = row_class ~ " lg:pb-28" %}
|
||||
{% set row_class = row_class ~ " lg:pb-24" %}
|
||||
{% set col_class = col_class ~ " flex-1 m-4 lg:m-0" %}
|
||||
{% endif %}
|
||||
|
||||
@@ -101,14 +111,14 @@ Parameters:
|
||||
|
||||
<!-- makes row semi-full screen width, strips margins -->
|
||||
{% if "between" in style %}
|
||||
{% set row_class = row_class ~ " lg:max-w-6xl mx-auto" %}
|
||||
{% set row_class = row_class ~ " lg:max-w-6xl lg:mx-auto mx-4" %}
|
||||
{% elif "moderate" in style %}
|
||||
{% set row_class = row_class ~ " lg:m-20" %}
|
||||
{% endif %}
|
||||
|
||||
<!-- makes row full screen width, strips margins -->
|
||||
{% if "narrow" in style %}
|
||||
{% set row_class = row_class ~ " lg:max-w-5xl" %}
|
||||
{% set row_class = row_class ~ " lg:max-w-4xl mx-auto" %}
|
||||
{% elif "moderate" in style %}
|
||||
{% set row_class = row_class ~ " lg:m-20" %}
|
||||
{% endif %}
|
||||
@@ -124,8 +134,9 @@ Parameters:
|
||||
<!-- makes row full screen width and adds background img -->
|
||||
{% set styles = "" %}
|
||||
{% if bgPath %}
|
||||
{% set styles = "background: url('" ~ bgPath ~ "'); background-size: cover" %}
|
||||
{% set row_class = row_class ~ "w-screen -mx-8 sm:-mx-12 md:-mx-16 lg:-mx-20" %}
|
||||
{% set background_url = page.permalink ~ bgPath %}
|
||||
{% set styles = "background: url('" ~ background_url ~ "'); background-size: cover; background-position: bottom;" %}
|
||||
{% set row_class = row_class ~ "w-screen sm:-mx-12 md:-mx-16 lg:-mx-20" %}
|
||||
{% endif %}
|
||||
{% if bgColor %}
|
||||
{% set styles = "background-color: " ~ bgColor ~ "; background-size: cover" %}
|
||||
@@ -135,6 +146,13 @@ Parameters:
|
||||
{% set styles = "background: " ~ gradient ~ "; background-size: cover" %}
|
||||
{% set row_class = row_class ~ " w-auto -mx-4 sm:-mx-12 md:-mx-16 lg:-mx-20" %}
|
||||
{% endif %}
|
||||
{% if bgStyle %}
|
||||
{% if "full" in bgStyle %}
|
||||
{% set styles = styles ~ "height: -webkit-fill-available; height: 100vh;" %}
|
||||
{% elif "hero" in bgStyle %}
|
||||
{% set div_class = div_class ~ " -mt-24 pt-12 " %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% set url = body | split(pat="href=") | slice(start=1) | first | split(pat=">") | first | trim_start_matches(pat='"') %}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user