Merge pull request #6 from ourworld-tsc/development

update prod

README.md

@@ -8,7 +8,10 @@
 
 The official website of OurPhone™
 
-[ourphone.ourworld.tf](https://ourphone.ourworld.tf/)
+Production(master branch) [www.ourphone.ourworld.tf](https://ourphone.ourworld.tf/)
+
+Staging(developmentr branch) [www2.ourphone.ourworld.tf](https://www2.ourphone.ourworld.tf/)
+
 
 Last updated: March 2023
 

content/buynow/index.md

@@ -23,7 +23,7 @@ weight: 2
 
 <div class="container mx-auto">
 
-{% row(style="center" margin="withContainer" padding="both") %}
+{% row(style="center" margin="narrow" padding="both") %}
 
 ![image](./img/phone1.png)
 
@@ -41,11 +41,11 @@ Learn more about how to purchase **OurPhone&trade;** Company's shares, and becom
 
 |||
 
-![image](./img/invest.png)
+![image](./img/3nodes.png)
 
-<button>[Invest](/)</button>
+<button>[Buy 3Node](https://marketplace.3node.global/index.php)</button>
 
-Support **OurPhone&trade;** project by financing **OurPhone&trade;** Company's hardware acquisition.
+Become a **ThreeFold Farmer**, Buy ThreeFold's **3Node**, be the host for our sovereign Digital Life.
 {% end %}
 
 </div>

content/header/_index.md

@@ -0,0 +1,15 @@
+---
+title: "Header"
+description: "NEAR is on a mission to empower everyone to take back control of their money, their data, and their identity. Join us."
+insert_anchor_links: "left"
+template: "partials/header.html"
+extra:
+  logoPath: "/images/logo_placeholder.png"
+  imgPath: ""
+---
+
+- [OURPHONE]("/")
+- [BUYNOW]("/buynow")
+- [SPECS]("/specs")
+- [OUEVERSE]("https://ourverse.tf/")
+- [TECHNOLOGY]("/technology")

content/home/index.md

@@ -50,7 +50,7 @@ Have no concerns about your data being manipulated or stolen.
 
 <!-- section 3 features title -->
 
-{% row(style="center" margin="withContainer" padding="top") %}
+{% row(style="center" margin="narrow" padding="top") %}
 
 # Decentralized Smartphone <br> Like No Other
 
@@ -59,7 +59,7 @@ Discover many unique features of __OurPhone&trade;__ that makes it <br>the ultim
 
 {% end %}
 
-{% row(style="center" margin="withContainer" padding="none") %}
+{% row(style="center" margin="narrow" padding="none") %}
 
 ![Image](./img/data.png#sm#mx-auto)
 ### 100% Data Ownership
@@ -79,7 +79,7 @@ __OurApps&trade;__: decentralized SuperApps powered by  __OurPhone&trade;__ are
 
 {% end %}
 
-{% row(style="center" margin="withContainer" padding="bottom") %}
+{% row(style="center" margin="narrow" padding="bottom") %}
 
 ![Image](./img/decentralized.png#sm#mx-auto)
 ### Decentralized Network Support
@@ -102,7 +102,7 @@ Any transfer of data is powered by __Planetary Network&trade;__: a fully encrypt
 
 <!-- section 5 apps -->
 
-{% row(style="center" margin="withContainer" padding="top") %}
+{% row(style="center" margin="narrow" padding="top") %}
 
 # OurVerse&trade; <br> Our Limitless Possibilities
 

content/specs/index.md

@@ -23,12 +23,12 @@ weight: 2
 
 - Based on Google Pixel 6a, 7 and 7 Pro
 - Graphene OS (Google-less Android)
-- ThreeFold Quantum Safe Storage, 
+- ThreeFold Quantum Safe Storage
 - ThreeFold Planetary network
 - ThreeFold Edge Compute Technology
 - OurVerse SuperApps, Android apps Compatibility
 - FreeFlow Twin Technology
-- Secure network layer 
+- Secure network layer
 
 {% end %}
 
@@ -100,7 +100,7 @@ Fast and Responsive Display with High Durability
 
 #### __Battery and charging__
 ###### 5000 mAh3 
-###### 24+ hour battery life
+###### 24h+ hour battery life
 ###### Fast wireless charging
 
 |||
@@ -168,7 +168,7 @@ Fast and Responsive Display with High Durability
 
 {% end %}
 
-{% row(style="center" margin="narrow" padding="bottom") %}
+{% row(margin="narrow" padding="bottom") %}
 
 ### __OurPhone<sup>X</sup>__
 <br>

templates/partials/header_custom.html

@@ -120,9 +120,15 @@
     {% if '<a' in header_label %}
         {% set link_label = header_label | striptags %}
         {% set link_path = header_label | split(pat="%22") | safe%}
-        <a href="{{link_path[1]}}" class="text-lg leading-6 font-medium text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
+        {% if header_label is containing("http") %}
-            {{link_label}}
+            <a href="{{link_path[1]}}" target="_blank" class="text-lg leading-6 font-medium text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
-        </a>
+                {{link_label}}
+            </a>
+        {% else %}
+            <a href="{{link_path[1]}}" class="text-lg leading-6 font-medium text-gray-900 focus:outline-none focus:text-gray-900 transition ease-in-out duration-150 mt-0">
+                {{link_label}}
+            </a>
+        {% endif %}
     {% else %}
         <div class="relative">
             {% set button_id = header_label ~ "-menu-btn" | slugify %}