diff --git a/.DS_Store b/.DS_Store index 0f6655c..d88c2f2 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/content/.DS_Store b/content/.DS_Store index 0e7febd..ac0d3b5 100644 Binary files a/content/.DS_Store and b/content/.DS_Store differ diff --git a/content/blog/.DS_Store b/content/blog/.DS_Store new file mode 100644 index 0000000..144419a Binary files /dev/null and b/content/blog/.DS_Store differ diff --git a/content/header/_index copy.md b/content/header/_index copy.md new file mode 100644 index 0000000..5ca3679 --- /dev/null +++ b/content/header/_index copy.md @@ -0,0 +1,84 @@ +--- +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/ourworld_logo2.png" + imgPath: "" +--- + +- Learn + +{% row(style="lean") %} + +### PURPOSE + +
+
+ +#### [The Internot](/apage) + +Whats wrong with the [internet](/apage) + +
+ +#### Our Internet + +Vision for the new internet + +||| + +### ECOSYSTEM + +
+
+ +#### OurWorld DAO + +Be a part of governance + +
+ +#### Communities + +Explore communities in OurWorld + +
+ +#### DAOs + +Decentralized autonomous organizations + +||| + +### APPLICATIONS + +
+
+ +#### DAPPs + +Decentralized applications + +
+ +#### Projects + +Projects in OurWorld + +||| + +### FEATURED + +
+
+ +#### OurWorld is Live + +Be a part of the new internet + +- [Join us]("/join-us") +- [Blog]("/blog") + +{% end %} diff --git a/content/header/_index.md b/content/header/_index.md index 5ca3679..5151495 100644 --- a/content/header/_index.md +++ b/content/header/_index.md @@ -10,26 +10,23 @@ extra: - Learn -{% row(style="lean") %} +{% menu() %} -### PURPOSE +##### PURPOSE -
-
- -#### [The Internot](/apage) +###### [The Internot](/apage) Whats wrong with the [internet](/apage)
-#### Our Internet +###### Our Internet Vision for the new internet ||| -### ECOSYSTEM +##### ECOSYSTEM

diff --git a/css/index.css b/css/index.css index bd53cb2..29e6674 100644 --- a/css/index.css +++ b/css/index.css @@ -4,16 +4,20 @@ @import "tailwindcss/base"; @import "layout.css"; @import "tailwindcss/components"; -@import "ffoxobliq.css"; /*! purgecss end ignore */ @import "tailwindcss/utilities"; @import url("https://fonts.googleapis.com/css2?family=Ubuntu&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"); /* Custom CSS for header partial */ .backdrop-blur { -webkit-backdrop-filter: blur(40px); } +* { + font-family: "Work Sans"; +} + .bg-semi-white { background-color: rgba(255, 255, 255, 0.75); } @@ -49,7 +53,10 @@ img[src*="#large"] { @apply text-lg lg:text-xl font-light; } h5 { - @apply text-base lg:text-base font-light leading-8; + @apply text-base not-italic font-light leading-8; + } + h6 { + @apply text-sm lg:text-sm font-normal; } nav p { @apply hidden sm:block md:block lg:block xl:block 2xl:block; @@ -79,3 +86,7 @@ p { a { border: none; } + +header { + font-family: "Work Sans"; +} diff --git a/css/layout.css b/css/layout.css index 81353e1..a61abb2 100644 --- a/css/layout.css +++ b/css/layout.css @@ -159,6 +159,10 @@ h4, @apply text-2xl; } +h5 { + @apply not-italic; +} + h5, .h5, h6, diff --git a/static/.DS_Store b/static/.DS_Store index 5008ddf..df7c91f 100644 Binary files a/static/.DS_Store and b/static/.DS_Store differ diff --git a/templates/.DS_Store b/templates/.DS_Store index 5446c6f..f9ee9ae 100644 Binary files a/templates/.DS_Store and b/templates/.DS_Store differ diff --git a/templates/partials/header.html b/templates/partials/header.html index 6a8e0ca..0471cdb 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -12,11 +12,13 @@ function toggleMenu(button) { if (displayedMenu === button.id.split("-")[0]) { + button.className = button.className.replace("text-blue-500", " text-gray-900"); hideMenu(button.id.split("-")[0]); displayedMenu = ""; } else { showMenu(button.id.split("-")[0]); + button.className = button.className.replace("text-gray-900", " text-blue-500"); displayedMenu = button.id.split("-")[0] } } @@ -40,6 +42,7 @@ function showMenu(menuName) { var menuId = menuName + (isMobile ? '-mobile-menu' : '-menu'); + var menuBtnId = menuName + (isMobile ? '-mobile-menu' : '-menu'); var menuElement = document.getElementById(menuId) menuElement.className = menuElement.className.replace(" hidden" , ""); setTimeout(function() { menuElement.className = menuElement.className.replace("duration-200 ease-in opacity-0 -translate-y-1", "duration-150 ease-out opacity-1 -translate-y-0"); }, 10); @@ -87,8 +90,8 @@
-
-
+
+
Ourworld Logo @@ -118,14 +121,13 @@ {% if ' + {{link_label}} {% else %}
{% set button_id = header_label ~ "-menu-btn" | slugify %} - -