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

fix conflict

Browse Source
This commit is contained in:
Ehab Hassan
2022-07-21 18:52:36 +02:00
parent f67d98391e d501012928
commit 2494f31013
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/partials/header.html
View File

@@ -40,7 +40,7 @@
<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"> <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}} {{link_label}}
</a> </a>
{% elif current_url is containing("www_threefold_io") %} {% elif header_label is starting_with("/") %}
{% set path = current_url ~ link_path[1] %} {% set path = current_url ~ link_path[1] %}
<a href="{{path}}" 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"> <a href="{{path}}" 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}} {{link_label}}
@@ -174,7 +174,7 @@
<a href="{{link_path[1]}}" target="_blank" class="text-lg px-8 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"> <a href="{{link_path[1]}}" target="_blank" class="text-lg px-8 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}} {{link_label}}
</a> </a>
{% elif current_url is containing("www_threefold_io") %} {% elif header_label is starting_with("/") %}
{% set path = current_url ~ link_path[1] %} {% set path = current_url ~ link_path[1] %}
<a href="{{path}}" 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"> <a href="{{path}}" 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}} {{link_label}}

4
templates/shortcodes/button.html
View File

@@ -7,8 +7,8 @@
{{ body | trim_start_matches(pat="<p>") | safe}} {{ body | trim_start_matches(pat="<p>") | safe}}
</button> </button>
{% elif current_url is containing('www_threefold_io') %} {% elif path is starting_with('/') %}
{% set btn_path = 'www_threefold_io' ~ path%} {% set btn_path = 'www_threefold_io' ~ path %}
<button onclick="window.location='{{btn_path}}'" <button onclick="window.location='{{btn_path}}'"
class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left"> class="leading-6 border-transparent flex flex-col border-2 w-full items-start rounded transition hover:first:text-gray-500 hover:border-stone-200 hover:bg-stone-100 p-2 text-left">
{{ body | trim_start_matches(pat="<p>") | safe}} {{ body | trim_start_matches(pat="<p>") | safe}}

5
templates/shortcodes/cloud_header.html
View File

@@ -8,9 +8,8 @@
class="text-5xl font-extrabold uppercase">Store</a> class="text-5xl font-extrabold uppercase">Store</a>
</div> </div>
<div class="mb-4"> <div class="mb-4">
{% if current_url is containing("www_threefold_io")%} {% if base is containing("www_threefold_io") %}
{% set path = "www_threefold_io/images/cloud_header_seprated.png"%} <img class="mx-auto sm:w-1/2 lg:w-full" src="www_threefold_io/images/cloud_header_seprated.png" alt="TF Cloud" />
<img class="mx-auto sm:w-1/2 lg:w-full" src="{{path}}" alt="TF Cloud" />
{% else %} {% else %}
<img class="mx-auto sm:w-1/2 lg:w-full" src="images/cloud_header_seprated.png" alt="TF Cloud" /> <img class="mx-auto sm:w-1/2 lg:w-full" src="images/cloud_header_seprated.png" alt="TF Cloud" />
{% endif %} {% endif %}