From 63944d86969ba6ad0e10c66f02caa79eea8486ef Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:14:36 -0400 Subject: [PATCH 01/24] Update Teams and Homepage - update teams page to include standards, update menu --- public/team/index.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/team/index.html b/public/team/index.html index b92dea4..e382810 100755 --- a/public/team/index.html +++ b/public/team/index.html @@ -15,7 +15,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -57,10 +57,9 @@

@@ -74,10 +73,9 @@

- team. + community. github. forum. - standards. blog.
@@ -91,8 +89,10 @@

-

Our team

-

State Channels is an Open Source project that relies on the tireless support of individual contributors. These are the teams that guide the development and instruction of State Channels.

+

Community

+

State Channels is an Open Source project in pursuit of a unified state channel specification for + EVM compatible blockchains. This project relies on the tireless support of individual contributors. + If you'd like to contribute or just chat with us, join our slack community!

From 13b65f7266cbb7acf25e8acfed28a0fa3c9c8848 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:20:54 -0400 Subject: [PATCH 02/24] Update index.html --- public/team/index.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/team/index.html b/public/team/index.html index e382810..f91227a 100755 --- a/public/team/index.html +++ b/public/team/index.html @@ -90,9 +90,13 @@

Community

-

State Channels is an Open Source project in pursuit of a unified state channel specification for +

State Channels is an Open Source project in pursuit of a unified state channel specification for EVM compatible blockchains. This project relies on the tireless support of individual contributors. - If you'd like to contribute or just chat with us, join our slack community! +

+

+ If you'd like to contribute or just chat with us,
+ join our slack community! +

From 86f753075d457e21f1e4d1d4ca6f775f12a649e6 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:29:46 -0400 Subject: [PATCH 03/24] home page content update --- public/index.html | 18 ++++++++---------- public/team/index.html | 10 ++-------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/public/index.html b/public/index.html index 3899c71..22ba747 100755 --- a/public/index.html +++ b/public/index.html @@ -57,10 +57,9 @@ @@ -74,10 +73,9 @@
- team. + community. github. forum. - standards. blog.
@@ -93,11 +91,11 @@

State channels scale peer-to-peer blockchain interactions.

-

Read our latest post: Virtual channels: creating a state channel network

+

State Channels consists of a decentralized, private offchain network which enables high frequency state exchanges with multiple peers + and an on chain arbitration mechanism, providing the security guarantees of the blockchain.

- the blog - docs - the code + documentation + community
@@ -123,7 +121,7 @@

Read our latest post:

- Check out our blog series! blog.statechannels.org + Check out our latest blog post: Virtual channels: creating a state channel network

diff --git a/public/team/index.html b/public/team/index.html index f91227a..29e4267 100755 --- a/public/team/index.html +++ b/public/team/index.html @@ -93,9 +93,8 @@

Community

State Channels is an Open Source project in pursuit of a unified state channel specification for EVM compatible blockchains. This project relies on the tireless support of individual contributors.

-

- If you'd like to contribute or just chat with us,
- join our slack community! +

+ If you'd like to contribute or just chat with us, join our slack community!

@@ -227,11 +226,6 @@

Backers

-
-

- Check out our blog series! blog.statechannels.org -

-
Hosted by Netlify
From 73055645ddccb8b2d43a27c8d0c4abf0f96703c8 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:37:12 -0400 Subject: [PATCH 04/24] Update index.html --- public/index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/index.html b/public/index.html index 22ba747..49e8f95 100755 --- a/public/index.html +++ b/public/index.html @@ -90,9 +90,8 @@
-

State channels scale peer-to-peer blockchain interactions.

-

State Channels consists of a decentralized, private offchain network which enables high frequency state exchanges with multiple peers - and an on chain arbitration mechanism, providing the security guarantees of the blockchain.

+

Scale peer-to-peer blockchain interactions.

+

State Channels enables secure, high frequency state exchanges between multiple peers for your EVM compatible application

documentation community From 4d398fb2ff3a2417c2a49b476d71de839e5f53f2 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:39:04 -0400 Subject: [PATCH 05/24] Update index.html --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 49e8f95..637a55b 100755 --- a/public/index.html +++ b/public/index.html @@ -120,7 +120,7 @@

State Channels enables secure, high fre

- Check out our latest blog post: Virtual channels: creating a state channel network + Check out our latest blog post: Virtual channels

From 89eb052403e907f7b3fd18253ab1462bbe570e57 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:40:42 -0400 Subject: [PATCH 06/24] Update index.html --- public/team/index.html | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/public/team/index.html b/public/team/index.html index 29e4267..843b92f 100755 --- a/public/team/index.html +++ b/public/team/index.html @@ -104,15 +104,6 @@

Core Team

-
- - - -
    -
  • Tom Close
    • -
-
-
@@ -172,6 +163,7 @@

Core Team

Alumni & Part-Time Contributors

    +
  • Tom Close
  • Jie Yuan
  • Connie Wong
  • Jeff Coleman
    • From 975ddbdaa1e99dd97bb98ed795bef567a9b4a69a Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 22:56:17 -0400 Subject: [PATCH 07/24] Update index.html --- public/index.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/index.html b/public/index.html index 637a55b..da080f5 100755 --- a/public/index.html +++ b/public/index.html @@ -58,6 +58,14 @@     From c0ca5e07d615f5a20fb23b4df32c617e45b8db2a Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 23:22:41 -0400 Subject: [PATCH 09/24] nav bar css update --- app/styles/components/navbar.scss | 34 +++++++++ public/index.html | 110 ++++++++++++++++++++++++------ 2 files changed, 124 insertions(+), 20 deletions(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index 66443a7..b68d3cd 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -57,6 +57,40 @@ } } } + + &__dropdown { + display: flex; + justify-content: flex-end; + flex-basis: calc(100% - 6.25rem); + + &__item { + margin-left: 0; + font-size: 1.125rem; + color: $c-black; + cursor: pointer; + transition: color $transition-speed; + + &:hover { + color: $c-blue; + } + + &.active { + position: relative; + color: $c-blue; + + &::before { + position: absolute; + left: 50%; + transform: translateX(-50%); + bottom: -0.5rem; + width: 65%; + height: 1px; + background-color: $c-blue; + content: ''; + } + } + } + } } diff --git a/public/index.html b/public/index.html index cda69c1..d78ea73 100755 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,6 @@ + @@ -11,9 +12,11 @@ - - - + + + @@ -21,9 +24,10 @@ - + - + @@ -32,7 +36,7 @@ - + + \ No newline at end of file From 684d1c3c669bb859e578adf85e6ec178f682ed18 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 23:43:22 -0400 Subject: [PATCH 10/24] Update navbar.scss --- app/styles/components/navbar.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index b68d3cd..bc41022 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -65,6 +65,8 @@ &__item { margin-left: 0; + line-height: 30px; + padding: 15px; font-size: 1.125rem; color: $c-black; cursor: pointer; @@ -91,6 +93,7 @@ } } } + } From 16b05d3e5aa302d0927081fbd56cf5edf8cdf331 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 23:45:24 -0400 Subject: [PATCH 11/24] Update navbar.scss --- app/styles/components/navbar.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index bc41022..93ff9f2 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -59,9 +59,7 @@ } &__dropdown { - display: flex; - justify-content: flex-end; - flex-basis: calc(100% - 6.25rem); + &__item { margin-left: 0; From 2087e430e08ff540a883705bf3f90ea2a8c3e719 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Sun, 31 Oct 2021 23:49:59 -0400 Subject: [PATCH 12/24] Update navbar.scss --- app/styles/components/navbar.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index 93ff9f2..096e644 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -59,10 +59,10 @@ } &__dropdown { - + float: right; &__item { - margin-left: 0; + line-height: 30px; padding: 15px; font-size: 1.125rem; From e7e352b4bbf116f28d3559d37f3797f1d4db2b38 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 00:28:48 -0400 Subject: [PATCH 13/24] Update navbar.scss --- app/styles/components/navbar.scss | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index 096e644..c747130 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -6,7 +6,7 @@ .nav { display: flex; justify-content: space-between; - align-items: center; + align-items: flex-start; &__left { margin: 0; @@ -59,12 +59,18 @@ } &__dropdown { - float: right; - &__item { + &__list { + margin-top:8px; + position:relative; + text-align:right; + list-style:none; + + } + &__item { + position:inherit; line-height: 30px; - padding: 15px; font-size: 1.125rem; color: $c-black; cursor: pointer; From 224228fe766ca324c0c54c541e3254dbd61eade4 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 00:36:02 -0400 Subject: [PATCH 14/24] Update navbar.scss --- app/styles/components/navbar.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index c747130..b9106e2 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -62,6 +62,7 @@ &__list { margin-top:8px; + margin-bottom:8px; position:relative; text-align:right; list-style:none; From 2e08806202314c0198721cb2d579226fd36bf685 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 21:02:02 -0400 Subject: [PATCH 15/24] Update navbar.scss --- app/styles/components/navbar.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index b9106e2..d488b65 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -66,9 +66,21 @@ position:relative; text-align:right; list-style:none; + display:none; } + &__list li{ + position: relative; + width: 100%; + text-align: center; + } + &__list li:hover &__item > li{ + display: block; + top: 0; + } + + &__item { position:inherit; line-height: 30px; From 62a2b1decf43d32821810af1502b858c05206fc2 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 21:15:48 -0400 Subject: [PATCH 16/24] Update navbar.scss --- app/styles/components/navbar.scss | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index d488b65..7200d98 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -67,20 +67,12 @@ text-align:right; list-style:none; display:none; - } - &__list li{ - position: relative; - width: 100%; - text-align: center; - } - &__list li:hover &__item > li{ - display: block; - top: 0; + &:hover &__list{ + display:block; } - &__item { position:inherit; line-height: 30px; From 86a726ca50e8f29f7e5d013463693eb51e5ceb07 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 23:08:04 -0400 Subject: [PATCH 17/24] css update --- app/styles/components/navbar.scss | 15 ++++++++++++--- public/index.html | 5 ++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index 7200d98..1426f5f 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -63,18 +63,27 @@ &__list { margin-top:8px; margin-bottom:8px; - position:relative; + position:absolute; text-align:right; list-style:none; + display:flex; + flex-direction: column; + } + + &__list li { + position:absolute; display:none; + top:0px } - &:hover &__list{ + &:hover &__list>li{ display:block; + flex-direction:column; + top:0px; } &__item { - position:inherit; + position:relative; line-height: 30px; font-size: 1.125rem; color: $c-black; diff --git a/public/index.html b/public/index.html index d78ea73..bb93d56 100755 --- a/public/index.html +++ b/public/index.html @@ -42,7 +42,7 @@ gtag('config', 'UA-114409337-6'); - + State Channels - Instant P2P Ethereum Transactions @@ -111,7 +111,6 @@ From 6963aa781632016d94c3988cbda7db0a4d3d3b74 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 23:11:14 -0400 Subject: [PATCH 18/24] Update index.html --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index bb93d56..ce83796 100755 --- a/public/index.html +++ b/public/index.html @@ -42,7 +42,7 @@ gtag('config', 'UA-114409337-6'); - + State Channels - Instant P2P Ethereum Transactions From 6fa9ac119531760baeea3257447a52e6052bd28f Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 23:14:20 -0400 Subject: [PATCH 19/24] Update index.html --- public/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/index.html b/public/index.html index ce83796..934d8cf 100755 --- a/public/index.html +++ b/public/index.html @@ -111,6 +111,8 @@ + From 14d1afd5144e3c2451b5313430d21877acdbfce6 Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 1 Nov 2021 23:20:03 -0400 Subject: [PATCH 21/24] Update navbar.scss --- app/styles/components/navbar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index 1426f5f..89e827a 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -71,7 +71,7 @@ } &__list li { - position:absolute; + display:none; top:0px } From 26536b276d523917d53d88bbeb7765bea44b47aa Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Tue, 2 Nov 2021 09:59:47 -0400 Subject: [PATCH 22/24] updated nav bar --- app/styles/components/navbar.scss | 1 + public/index.html | 14 +- public/index_chinese/index.html | 451 +++++++++++++++++++--------- public/standards/index.html | 474 +++++++++++++++++++++--------- public/team/index.html | 140 +++++++-- 5 files changed, 773 insertions(+), 307 deletions(-) diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index 89e827a..bb893c4 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -68,6 +68,7 @@ list-style:none; display:flex; flex-direction: column; + padding-left:4.121rem; } &__list li { diff --git a/public/index.html b/public/index.html index d7288ea..7697642 100755 --- a/public/index.html +++ b/public/index.html @@ -112,7 +112,7 @@
diff --git a/public/index_chinese/index.html b/public/index_chinese/index.html index 6d574a6..a6362a1 100755 --- a/public/index_chinese/index.html +++ b/public/index_chinese/index.html @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/public/standards/index.html b/public/standards/index.html index a6b081d..e5fdea2 100755 --- a/public/standards/index.html +++ b/public/standards/index.html @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/public/team/index.html b/public/team/index.html index 843b92f..56cfcde 100755 --- a/public/team/index.html +++ b/public/team/index.html @@ -1,5 +1,6 @@ + @@ -12,11 +13,13 @@ - + - + @@ -24,7 +27,8 @@ - + @@ -33,7 +37,7 @@ - + + \ No newline at end of file From 5c76ab98086ab19f0b946502a20a93a7c191995c Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:01:17 -0400 Subject: [PATCH 23/24] Create use-case.html --- public/use-case/use-case.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/use-case/use-case.html diff --git a/public/use-case/use-case.html b/public/use-case/use-case.html new file mode 100644 index 0000000..e69de29 From 85f98629e50367c940c61ea6f07fb93aa7fa704d Mon Sep 17 00:00:00 2001 From: Connie <75539955+wunnaii@users.noreply.github.com> Date: Mon, 22 Nov 2021 21:11:03 -0500 Subject: [PATCH 24/24] fixed dropdown menu --- .gitignore | 4 ++++ app/styles/components/navbar.scss | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index cc23b2c..f380ae0 100755 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ bower_components tmp dist .env +public/index.html.bak +public/index_chinese/index.html.bak +public/standards/index.html.bak +public/team/index.html.bak diff --git a/app/styles/components/navbar.scss b/app/styles/components/navbar.scss index bb893c4..39c0f98 100755 --- a/app/styles/components/navbar.scss +++ b/app/styles/components/navbar.scss @@ -1,5 +1,6 @@ .section--nav { padding: 1rem; + z-index:100; } @@ -61,26 +62,24 @@ &__dropdown { &__list { - margin-top:8px; - margin-bottom:8px; + padding-top:8px; + margin:0; + padding-bottom:8px; position:absolute; text-align:right; list-style:none; display:flex; flex-direction: column; padding-left:4.121rem; - } - &__list li { + } + &__list { display:none; - top:0px } - &:hover &__list>li{ + &:hover &__list, &__list:hover{ display:block; - flex-direction:column; - top:0px; } &__item { @@ -93,6 +92,7 @@ &:hover { color: $c-blue; + display: block; } &.active { @@ -119,6 +119,7 @@ @media screen and (max-width: $screen-tablet) { .section--nav { padding-right: 2rem; + //z-index:100; } } @@ -126,5 +127,6 @@ @media screen and (max-width: $screen-mobile) { .section--nav { padding-right: 1.25rem; + //z-index:100; } }