From 0d3a6b5773dab28daa9b11c6f61a6e1e91752e95 Mon Sep 17 00:00:00 2001 From: Andy Tudhope Date: Thu, 29 Nov 2018 13:55:56 +0200 Subject: [PATCH 1/5] Updates shared-partials and removes Studio --- themes/navy/layout/partial/header.swig | 1 - themes/navy/layout/partial/shared-partials | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/themes/navy/layout/partial/header.swig b/themes/navy/layout/partial/header.swig index 684a9cf..e772342 100644 --- a/themes/navy/layout/partial/header.swig +++ b/themes/navy/layout/partial/header.swig @@ -21,7 +21,6 @@
  • Incubate
  • Nimbus
  • Embark
    • -
  • Studio
  • Hardwallet
    • diff --git a/themes/navy/layout/partial/shared-partials b/themes/navy/layout/partial/shared-partials index 100498f..4a37794 160000 --- a/themes/navy/layout/partial/shared-partials +++ b/themes/navy/layout/partial/shared-partials @@ -1 +1 @@ -Subproject commit 100498f37bca143184217d3531d33bd5c78f22f0 +Subproject commit 4a37794713b071c7e946c13aeecc32d04d9e5463 From 6799193586b23739968a5d69fb6477318593d22c Mon Sep 17 00:00:00 2001 From: Andy Tudhope Date: Thu, 29 Nov 2018 15:10:56 +0200 Subject: [PATCH 2/5] Moves more stuff to shared folder --- package.json | 4 +- themes/navy/layout/partial/header.swig | 124 +-------------------- themes/navy/layout/partial/shared-partials | 2 +- 3 files changed, 5 insertions(+), 125 deletions(-) diff --git a/package.json b/package.json index 862b2f1..1adcfda 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "hexo": { - "version": "3.8.0" + "version": "3.7.1" }, "scripts": { "clean": "rm -rf public/*", @@ -49,4 +49,4 @@ "vinyl-source-stream": "^2.0.0", "watchify": "^3.11.0" } -} +} \ No newline at end of file diff --git a/themes/navy/layout/partial/header.swig b/themes/navy/layout/partial/header.swig index e772342..a26fdc6 100644 --- a/themes/navy/layout/partial/header.swig +++ b/themes/navy/layout/partial/header.swig @@ -38,126 +38,6 @@
    -
    -
    - -

    Community

    -
    -
    -
    - -
    -

    Join the chat in Status

    -

    Whisper sweet, encrypted nothings on a distributed network that no-one owns.

    -     -
    -
    - -
    -

    Join the Discussion

    -

    Join longer discussions, work in progress, and our research here.

    -     -
    -
    - -
    -

    Contribute to our Repos

    -

    Help us #buidl the future by getting involved in the most active code base in Ethereum.

    -     -
    -
    -
    Find Out More
    -
    -
    -
    -
    -
    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Life at Status

    -

    What's it like to live the decentralized lifestyle? Find out here.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Follow us on Twitter

    -

    Join the conversation on our social channels to learn more.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -
    -
    +{{ partial('partial/shared-partials/partials/community-popup') }} -
    -
    - -

    Projects

    -
    -
    Help us #buidl
    -
    -
    -
    -
    -

    Embark

    -

    Embark is a simple and easy to use development framework that enables you to build and deploy your own decentralized applications smoothly.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Nimbus

    -

    A research project and light client for Ethereum 2.0 designed to perform well on embedded systems and resource-restricted hardware.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Status Studio

    -

    Studio is an integrated developer environment and educational platform designed to be a one-stop-shop for ÐApp development.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    Tools for Everyone
    -
    -
    -
    -
    -

    Incubate

    -

    Incubate supports open source, early stage startups with funding, technical mentorship, legal and regulatory compliance and much more.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Status Hardwallet

    -

    A hardware wallet in the form of a card with a safe, contactless transaction experience

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -
    -
    +{{ partial('partial/shared-partials/partials/projects-popup') }} diff --git a/themes/navy/layout/partial/shared-partials b/themes/navy/layout/partial/shared-partials index 4a37794..54e23cf 160000 --- a/themes/navy/layout/partial/shared-partials +++ b/themes/navy/layout/partial/shared-partials @@ -1 +1 @@ -Subproject commit 4a37794713b071c7e946c13aeecc32d04d9e5463 +Subproject commit 54e23cfb3eaa9e16d2668577e5dbb76d37bde501 From fa2ba3cccf8ed459bf51c3c2401386227cd1553d Mon Sep 17 00:00:00 2001 From: Andy Tudhope Date: Thu, 29 Nov 2018 15:24:03 +0200 Subject: [PATCH 3/5] Revert "Moves more stuff to shared folder" This reverts commit 6799193586b23739968a5d69fb6477318593d22c. --- package.json | 4 +- themes/navy/layout/partial/header.swig | 124 ++++++++++++++++++++- themes/navy/layout/partial/shared-partials | 2 +- 3 files changed, 125 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1adcfda..862b2f1 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "hexo": { - "version": "3.7.1" + "version": "3.8.0" }, "scripts": { "clean": "rm -rf public/*", @@ -49,4 +49,4 @@ "vinyl-source-stream": "^2.0.0", "watchify": "^3.11.0" } -} \ No newline at end of file +} diff --git a/themes/navy/layout/partial/header.swig b/themes/navy/layout/partial/header.swig index a26fdc6..e772342 100644 --- a/themes/navy/layout/partial/header.swig +++ b/themes/navy/layout/partial/header.swig @@ -38,6 +38,126 @@
    -{{ partial('partial/shared-partials/partials/community-popup') }} +
    +
    + +

    Community

    +
    +
    +
    + +
    +

    Join the chat in Status

    +

    Whisper sweet, encrypted nothings on a distributed network that no-one owns.

    +     +
    +
    + +
    +

    Join the Discussion

    +

    Join longer discussions, work in progress, and our research here.

    +     +
    +
    + +
    +

    Contribute to our Repos

    +

    Help us #buidl the future by getting involved in the most active code base in Ethereum.

    +     +
    +
    +
    Find Out More
    +
    +
    +
    +
    +
    +
    +
    Learn more
    +
    +
    +
    +
    +
    +

    Life at Status

    +

    What's it like to live the decentralized lifestyle? Find out here.

    +
    +
    Learn more
    +
    +
    +
    +
    +
    +

    Follow us on Twitter

    +

    Join the conversation on our social channels to learn more.

    +
    +
    Learn more
    +
    +
    +
    +
    +
    +
    +
    -{{ partial('partial/shared-partials/partials/projects-popup') }} +
    +
    + +

    Projects

    +
    +
    Help us #buidl
    +
    +
    +
    +
    +

    Embark

    +

    Embark is a simple and easy to use development framework that enables you to build and deploy your own decentralized applications smoothly.

    +
    +
    Learn more
    +
    +
    +
    +
    +
    +

    Nimbus

    +

    A research project and light client for Ethereum 2.0 designed to perform well on embedded systems and resource-restricted hardware.

    +
    +
    Learn more
    +
    +
    +
    +
    +
    +

    Status Studio

    +

    Studio is an integrated developer environment and educational platform designed to be a one-stop-shop for ÐApp development.

    +
    +
    Learn more
    +
    +
    +
    +
    +
    Tools for Everyone
    +
    +
    +
    +
    +

    Incubate

    +

    Incubate supports open source, early stage startups with funding, technical mentorship, legal and regulatory compliance and much more.

    +
    +
    Learn more
    +
    +
    +
    +
    +
    +

    Status Hardwallet

    +

    A hardware wallet in the form of a card with a safe, contactless transaction experience

    +
    +
    Learn more
    +
    +
    +
    +
    +
    +
    +
    diff --git a/themes/navy/layout/partial/shared-partials b/themes/navy/layout/partial/shared-partials index 54e23cf..4a37794 160000 --- a/themes/navy/layout/partial/shared-partials +++ b/themes/navy/layout/partial/shared-partials @@ -1 +1 @@ -Subproject commit 54e23cfb3eaa9e16d2668577e5dbb76d37bde501 +Subproject commit 4a37794713b071c7e946c13aeecc32d04d9e5463 From c62b0f919476009d8d0cddafddd3d7fba3a172e4 Mon Sep 17 00:00:00 2001 From: Andy Tudhope Date: Thu, 29 Nov 2018 15:25:28 +0200 Subject: [PATCH 4/5] Moves more to shared-partials --- themes/navy/layout/partial/header.swig | 124 +------------------------ 1 file changed, 2 insertions(+), 122 deletions(-) diff --git a/themes/navy/layout/partial/header.swig b/themes/navy/layout/partial/header.swig index e772342..a26fdc6 100644 --- a/themes/navy/layout/partial/header.swig +++ b/themes/navy/layout/partial/header.swig @@ -38,126 +38,6 @@
    -
    -
    - -

    Community

    -
    -
    -
    - -
    -

    Join the chat in Status

    -

    Whisper sweet, encrypted nothings on a distributed network that no-one owns.

    -     -
    -
    - -
    -

    Join the Discussion

    -

    Join longer discussions, work in progress, and our research here.

    -     -
    -
    - -
    -

    Contribute to our Repos

    -

    Help us #buidl the future by getting involved in the most active code base in Ethereum.

    -     -
    -
    -
    Find Out More
    -
    -
    -
    -
    -
    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Life at Status

    -

    What's it like to live the decentralized lifestyle? Find out here.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Follow us on Twitter

    -

    Join the conversation on our social channels to learn more.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -
    -
    +{{ partial('partial/shared-partials/partials/community-popup') }} -
    -
    - -

    Projects

    -
    -
    Help us #buidl
    -
    -
    -
    -
    -

    Embark

    -

    Embark is a simple and easy to use development framework that enables you to build and deploy your own decentralized applications smoothly.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Nimbus

    -

    A research project and light client for Ethereum 2.0 designed to perform well on embedded systems and resource-restricted hardware.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Status Studio

    -

    Studio is an integrated developer environment and educational platform designed to be a one-stop-shop for ÐApp development.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    Tools for Everyone
    -
    -
    -
    -
    -

    Incubate

    -

    Incubate supports open source, early stage startups with funding, technical mentorship, legal and regulatory compliance and much more.

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -

    Status Hardwallet

    -

    A hardware wallet in the form of a card with a safe, contactless transaction experience

    -
    -
    Learn more
    -
    -
    -
    -
    -
    -
    -
    +{{ partial('partial/shared-partials/partials/projects-popup') }} From dfbc3fef9f722d9773a8b5818fc92da5f90119ae Mon Sep 17 00:00:00 2001 From: Andy Tudhope Date: Thu, 29 Nov 2018 15:43:05 +0200 Subject: [PATCH 5/5] Change submodule commit --- themes/navy/layout/partial/shared-partials | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/navy/layout/partial/shared-partials b/themes/navy/layout/partial/shared-partials index 4a37794..ef5db8a 160000 --- a/themes/navy/layout/partial/shared-partials +++ b/themes/navy/layout/partial/shared-partials @@ -1 +1 @@ -Subproject commit 4a37794713b071c7e946c13aeecc32d04d9e5463 +Subproject commit ef5db8a4de18fe58b1e5e44c7b7f965b13850a91