From fd4007a9b4f0d43ed4258303912f3a6edc47c321 Mon Sep 17 00:00:00 2001 From: timurgordon Date: Thu, 10 Feb 2022 14:29:01 +0300 Subject: [PATCH] created new navbar partial --- .DS_Store | Bin 6148 -> 6148 bytes css/nav.css | 167 +---------- getContent.ts | 5 +- static/.DS_Store | Bin 0 -> 6148 bytes templates/_default/base.html | 4 +- templates/blog/page.html | 30 -- templates/index.html | 20 +- templates/list.html | 3 +- templates/page.html | 3 +- templates/partials/navbar.html | 480 ++++++++++++++++++++++++++++++ templates/partials/splitRow.html | 8 +- templates/partials/splitRow2.html | 15 - 12 files changed, 510 insertions(+), 225 deletions(-) create mode 100644 static/.DS_Store delete mode 100644 templates/blog/page.html delete mode 100644 templates/partials/splitRow2.html diff --git a/.DS_Store b/.DS_Store index f8d2617b98aab3660f1bff91c8cb3c00ae8166b2..5a82b6bee09bc4b87e60b249a861eb5c82222bbf 100644 GIT binary patch delta 42 ucmZoMXfc?uOo{;r*cgf#N*EG>IFlhcr8qe!DL+4lapOTZ_RVY@|M&syZww~@ delta 42 xcmZoMXfc?uOp1|#fq{*ofT5Hji6Ms}lOZ{!I5{UNKR<_Y<3Ts}&1@Y1_yOy;3?Bdh diff --git a/css/nav.css b/css/nav.css index 0a7a592..46e8431 100644 --- a/css/nav.css +++ b/css/nav.css @@ -1,166 +1,7 @@ -/* -CSS-only and **accessible** menu based on... https://codepen.io/jonraedeke/pen/WRwJQX ...but considerably changed since then, especially due to change to Tailwind CSS -*/ - -.nav__item { - margin: 0px; -} -/* - @apply font-sans p-0 m-0; - - - & a { - @apply block py-1 px-4 mb-1 text-white no-underline transition-opacity duration-500 ease-linear; - - &:link, - &:visited { - @apply text-blue; - } - - &:hover, - &:focus { - @apply no-underline opacity-75; - } - } +.backdrop-blur { + -webkit-backdrop-filter: blur(40px); } -*/ -@media (min-width: 900px) { - .nav__item { - @apply font-bold lowercase text-xs inline-block; - font-variant: small-caps; - letter-spacing: 0.15rem; - & a { - @apply inline-block pt-1 pb-0 no-underline; - } - } +.bg-semi-white { + background-color: rgba(255, 255, 255, 0.75); } - -.nav__icon { - @apply block absolute cursor-pointer; - top: 15px; - right: 13px; - height: 27px; - width: 27px; - text-indent: -9999px; - /* hide the label */ - transition: all 1s cubic-bezier(0.19, 1, 0.22, 1); - /* Remove blinking cursor */ - @apply border-none text-transparent text-center; - text-shadow: 0 0 0 gray; - &:focus { - @apply outline-none; - } -} -@media (min-width: 900px) { - .nav__icon { - @apply hidden; - } -} - -.nav__icon-line { - @apply absolute block bg-white rounded left-0 transition-all duration-500 w-6 h-1 ease-linear; - - &:first-child { - @apply top-0; - } - - &:nth-child(2) { - top: 8px; - } - - &:nth-child(3) { - top: 16px; - } -} - -/* Checkbox hack for toggling mobile menu */ -input[type="checkbox"] { - @apply hidden invisible; - &:checked { - & ~ nav .nav__items { - height: auto; - /*@apply bg-black dark:bg-blue-700 transition-all duration-500 ease-linear;*/ - max-height: 30rem; - } - & ~ label .nav__icon-line:first-child { - @apply top-0 -rotate-45 translate-y-2 w-6; - } - & ~ label .nav__icon-line:nth-child(2) { - @apply opacity-0; - } - & ~ label .nav__icon-line:nth-child(3) { - @apply rotate-45 -translate-y-2 w-6; - } - } -} - -nav { - @apply absolute text-left left-0 w-full transition duration-500 ease-linear scale-x-100 scale-y-0 origin-top; - top: 100%; - & ul { - @apply pl-0 m-0 text-right list-none transition duration-500 ease-linear; - } - & li { - @apply mb-2 inline; - margin-right: 5%; - @media screen and (max-width: 899px) { - display: inherit; - } - } - & a { - @apply text-white text-lg opacity-0; - text-decoration: none !important; - border: 0 !important; - } /* - & a:hover, & a:active { - @apply border-b-0 text-gray-500; - }*/ -} - -.nav-toggle:checked ~ nav { - transform: scale(1, 1); - & a { - opacity: 1; - } -} - -/* === Beginning of primary settings for larger screens === */ -@media screen and (min-width: 900px) { - .nav-toggle-label { - @apply hidden; - } - - header { - @apply fixed grid grid-cols-5; - } - - .site-logo { - @apply z-50 text-left col-start-1 col-end-3 text-lg; - padding-left: 8%; - } - - nav { - @apply mt-0 col-start-4 col-end-6; - top: 15%; - transform: none; - & a { - @apply opacity-100 relative; - } - & ul { - padding-right: 10%; - @apply text-right; - } - & li { - @apply inline-block p-0 mb-0; - } - } -} - -.site-logo-holder { - @apply mt-1 pt-1 w-full; - & a { - @apply no-underline border-b-0; - } -} -/* === End of primary settings for larger screens === */ diff --git a/getContent.ts b/getContent.ts index 53c0545..f10f1b6 100644 --- a/getContent.ts +++ b/getContent.ts @@ -8,9 +8,7 @@ async function main() { async function deploy() { try { - // must find way to get twinId and proxyUrl - // perhaps use getMyTwinId @ grid3_client_ts/src/clients/tf-grid/twins.ts - const rmb = new HTTPMessageBusClient(0, "https://gridproxy.test.grid.tf", "https://graphql.dev.grid.tf/graphql", ""); + const rmb = new HTTPMessageBusClient(414, "https://gridproxy.test.grid.tf", "https://graphql.test.grid.tf/graphql", "idle tourist member mail flame often invest ring region fashion cloth zebra"); // second url graph url const msg = rmb.prepare("zos.statistics.get", [dstNodeId], 0, 2); const retMsg = await rmb.send(msg, "{'test':'test'}"); const result = await rmb.read(retMsg); @@ -24,6 +22,7 @@ async function main() { } deploy(); + } main(); diff --git a/static/.DS_Store b/static/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..668ff50677ea6fc8eafab9a27dca689f70d58445 GIT binary patch literal 6148 zcmeHKyH3ME5S)b+k!V~}-Y@V6RusN~58x3;2r0;jD7`Dbi%(KhZtso9@PWP&h<6 kCPq2t!pre(BxPRnIp6n%Q)18=4?0ml1Fnlq3jDVMKa*G(0RR91 literal 0 HcmV?d00001 diff --git a/templates/_default/base.html b/templates/_default/base.html index 6c0e9a9..50dce1e 100644 --- a/templates/_default/base.html +++ b/templates/_default/base.html @@ -1,8 +1,10 @@ {% include "partials/head.html" %} + {% include "partials/navbar.html" %} + - {% include "partials/header.html" %} +
{% block content %}{% endblock %}
diff --git a/templates/blog/page.html b/templates/blog/page.html deleted file mode 100644 index 9c1e629..0000000 --- a/templates/blog/page.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "_default/base.html" %} - -{% block content %} - -
-
-
- {{ page.content | safe }} -
-
-{% if page.earlier or page.later %} -
-

Other posts

- {% if page.later %} -

- Next: - {{ page.later.title }} -

- {% endif %} - {% if page.earlier %} -

- Previous: - {{ page.earlier.title}} -

- {% else %} -   - {% endif %} -
-{% endif %} -{% endblock content %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index b5d52a3..8a69b6b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,27 +1,27 @@ {% extends "_default/base.html" %} - {% block content %} + +
{% include "partials/splitRow.html" %} - + +
{%- set section = get_section(path="about/community/_index.md") %} -
- {% include "partials/splitRow.html" %} +
+ + {%- set section = get_section(path="about/sustainability/_index.md") %} - -
- {% include "partials/splitRow.html" %} - {%- set section = get_section(path="about/creators/_index.md") %} -
- + + + {%- set section = get_section(path="about/creators/_index.md") %} {% include "partials/splitRow.html" %} diff --git a/templates/list.html b/templates/list.html index 91c42f8..3a9d1e5 100644 --- a/templates/list.html +++ b/templates/list.html @@ -1,6 +1,7 @@ {% extends "_default/base.html" %} - {% block content %} + +

{{ section.title }}

diff --git a/templates/page.html b/templates/page.html index 18102a0..1ba3333 100644 --- a/templates/page.html +++ b/templates/page.html @@ -1,6 +1,7 @@ {% extends "_default/base.html" %} - {% block content %} + +
diff --git a/templates/partials/navbar.html b/templates/partials/navbar.html index e69de29..fad7284 100644 --- a/templates/partials/navbar.html +++ b/templates/partials/navbar.html @@ -0,0 +1,480 @@ + + + + + + + + + + +
+ diff --git a/templates/partials/splitRow.html b/templates/partials/splitRow.html index 4bba3fc..b818af5 100644 --- a/templates/partials/splitRow.html +++ b/templates/partials/splitRow.html @@ -1,6 +1,11 @@ + - +
+

{{ section.title }} @@ -13,6 +18,7 @@
+

diff --git a/templates/partials/splitRow2.html b/templates/partials/splitRow2.html deleted file mode 100644 index 77d1f7e..0000000 --- a/templates/partials/splitRow2.html +++ /dev/null @@ -1,15 +0,0 @@ - - -
-
- {{ section.content | safe }} -
- -
- -
-
- -
- - \ No newline at end of file