From 177e0747779a550dd317333e83982ac78a83ecc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:11:33 -0500 Subject: [PATCH 01/26] add html structure for home page --- docs/main.html | 64 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/docs/main.html b/docs/main.html index 92f93b1613a0..db4b4d0fef53 100644 --- a/docs/main.html +++ b/docs/main.html @@ -2,4 +2,66 @@ lhn_content: 'homepage' --- - +

+ Welcome to Expensify Community! +

+ +

+ Find all the answers to all your Expensify questions, as well as support for user and admin questions from the Expensify Community. +

+ +

+ Which best describes how you use Expensify? +

+ +
+ +
+
+ +
+
+
Send money
+
Brief description of who would fall under this category.
+
+
+ +
+
+ +
+
+
Request money
+
Brief description of who would fall under this category.
+
+
+ +
+ +

+ Our most popular guides and tutorials +

+ +
+ +
+
+ +
+
+
Send money
+
Brief description of who would fall under this category.
+
+
+ +
+
+ +
+
+
Request money
+
Brief description of who would fall under this category.
+
+
+ +
From a7c26ca94a10f984dc3730820dd2fe3ddbccb30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:13:36 -0500 Subject: [PATCH 02/26] add icons --- docs/assets/images/concierge-avatar.svg | 5 +++++ docs/assets/images/shield.svg | 4 ++++ docs/assets/images/users.svg | 14 ++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 docs/assets/images/concierge-avatar.svg create mode 100644 docs/assets/images/shield.svg create mode 100644 docs/assets/images/users.svg diff --git a/docs/assets/images/concierge-avatar.svg b/docs/assets/images/concierge-avatar.svg new file mode 100644 index 000000000000..2372f3ea9183 --- /dev/null +++ b/docs/assets/images/concierge-avatar.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/docs/assets/images/shield.svg b/docs/assets/images/shield.svg new file mode 100644 index 000000000000..cf0c301345b0 --- /dev/null +++ b/docs/assets/images/shield.svg @@ -0,0 +1,4 @@ + + + + diff --git a/docs/assets/images/users.svg b/docs/assets/images/users.svg new file mode 100644 index 000000000000..4263fec3cca6 --- /dev/null +++ b/docs/assets/images/users.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + From 3a966d2d9552daa01e2232fd4be7f50bae60b51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:18:38 -0500 Subject: [PATCH 03/26] add icons to home page and change color --- docs/assets/images/shield.svg | 6 +++--- docs/assets/images/users.svg | 12 ++++++------ docs/main.html | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/assets/images/shield.svg b/docs/assets/images/shield.svg index cf0c301345b0..9066e116c94c 100644 --- a/docs/assets/images/shield.svg +++ b/docs/assets/images/shield.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/docs/assets/images/users.svg b/docs/assets/images/users.svg index 4263fec3cca6..c7f34b284438 100644 --- a/docs/assets/images/users.svg +++ b/docs/assets/images/users.svg @@ -1,10 +1,10 @@ - + - - - - - + + + + + diff --git a/docs/main.html b/docs/main.html index db4b4d0fef53..48ae3b1032d7 100644 --- a/docs/main.html +++ b/docs/main.html @@ -18,7 +18,7 @@

- +
Send money
@@ -28,7 +28,7 @@

- +
Request money
From eea4fbf3324dd39d8875e6a196a8830491a8e98a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:31:18 -0500 Subject: [PATCH 04/26] add styles to homepage --- docs/_sass/_main.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 6b3e7d8ae696..aeaa15766c77 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -371,6 +371,22 @@ textarea { } } +.homepage { + h1 { + text-align: center; + padding-bottom: 20px; + } + h2 { + padding-bottom: 24px; + } + p { + margin-bottom: 40px; + } + .cards-group { + padding-bottom: 32px; + } +} + .coming-soon { overflow: hidden; From fa4f9e6876b4e9ec4fb6502f018c56bb68f8e51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 16 Jul 2022 13:34:12 -0500 Subject: [PATCH 05/26] restructure html in homepage --- docs/main.html | 104 +++++++++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 46 deletions(-) diff --git a/docs/main.html b/docs/main.html index 48ae3b1032d7..8147308e592a 100644 --- a/docs/main.html +++ b/docs/main.html @@ -2,66 +2,78 @@ lhn_content: 'homepage' --- -

- Welcome to Expensify Community! -

+
-

- Find all the answers to all your Expensify questions, as well as support for user and admin questions from the Expensify Community. -

+

+ Welcome to Expensify Community! +

-

- Which best describes how you use Expensify? -

+

+ Find all the answers to all your Expensify questions, as well as support for user and admin questions from the + Expensify Community. +

-
+

+ Which best describes how you use Expensify? +

-
-
- -
-
-
Send money
-
Brief description of who would fall under this category.
-
-
+
-
-
- +
+
+ +
+
+
Send money
+
Brief description of who would fall under this category.
+
-
-
Request money
-
Brief description of who would fall under this category.
+ +
+
+ +
+
+
Request money
+
Brief description of who would fall under this category.
+
-
-
+
-

- Our most popular guides and tutorials -

+

+ Our most popular guides and tutorials +

-
+
-
-
- +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
Send money
-
Brief description of who would fall under this category.
+ +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
-
- +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
Request money
-
Brief description of who would fall under this category.
+ +
+
+
Getting started
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
+
-
-
+
+
\ No newline at end of file From f935943b0f0bdb8e46b7de430ea7f7bd7a466060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 19 Jul 2022 14:58:22 -0500 Subject: [PATCH 06/26] set color and border styles to cards in main page --- docs/_sass/_colors.scss | 1 + docs/_sass/_main.scss | 25 ++++++++++++++++++++----- docs/main.html | 4 ++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/docs/_sass/_colors.scss b/docs/_sass/_colors.scss index d21afc515591..bf4e46b61e7b 100644 --- a/docs/_sass/_colors.scss +++ b/docs/_sass/_colors.scss @@ -5,3 +5,4 @@ $color-gray1: #FAFAFA; $color-gray2: #ECECEC; $color-gray3: #C6C9CA; $color-white: #FFFFFF; +$color-green: #07d973; diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index aeaa15766c77..7e366cf2189a 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -67,7 +67,7 @@ hr { display: inline-block; width: 24px; height: 2px; - margin: 0 0 15px; + margin: 0 0 16px; } strong { @@ -331,22 +331,36 @@ textarea { .card { display: flex; flex-wrap: nowrap; - border-radius: 15px; + border-radius: 16px; border: 1px solid $color-gray2; padding: 28px; font-weight: bold; cursor: pointer; + &.send-money { + border-color: $color-blue; + border-width: 1.5px; + } + + &.request-money { + border-color: $color-green; + border-width: 1.5px; + } + .left-icon { display: flex; align-items: center; - padding-right: 15px; + padding-right: 28px; + + img { + width: 32px; + } } .right-icon { display: flex; align-items: center; - padding-left: 15px; + padding-left: 16px; } .body { @@ -357,7 +371,8 @@ textarea { } .description { - margin-top: 15px; + margin-top: 16px; + font-weight: normal; } } diff --git a/docs/main.html b/docs/main.html index 8147308e592a..f05ca6238c4e 100644 --- a/docs/main.html +++ b/docs/main.html @@ -19,7 +19,7 @@

-
+
@@ -29,7 +29,7 @@

-
+
From 00e585551bd4f007dff84a19ca10c50fdbe2872e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 19 Jul 2022 16:22:37 -0500 Subject: [PATCH 07/26] center the content area for bigger screens --- docs/_sass/_main.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 7e366cf2189a..ef27432ed9c6 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -247,6 +247,13 @@ textarea { padding: 52px 68px; box-sizing: border-box; + @media screen and (min-width: 1600px) { + /* Center content area for bigger screens */ + margin-left: calc(420px + (100vw - 1000px - 420px)/2); + padding: 52px 0; + max-width: 1000px; + } + @media screen and (max-width: 1024px) { margin-left: 320px; } From 8a9d1d7098fde2afeb40152f0f3bf66260520ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 20 Jul 2022 15:17:25 -0500 Subject: [PATCH 08/26] fix title for main page --- docs/_sass/_main.scss | 8 ++++++-- docs/main.html | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index ef27432ed9c6..2d62fa522635 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -395,14 +395,18 @@ textarea { .homepage { h1 { - text-align: center; padding-bottom: 20px; + + @media screen and (max-width: 800px) { + margin-top: 0; + padding-top: 8px; + } } h2 { padding-bottom: 24px; } p { - margin-bottom: 40px; + margin-bottom: 20px; } .cards-group { padding-bottom: 32px; diff --git a/docs/main.html b/docs/main.html index f05ca6238c4e..91a1593e8d80 100644 --- a/docs/main.html +++ b/docs/main.html @@ -5,7 +5,7 @@

- Welcome to Expensify Community! + Welcome to Expensify Help!

From f4ddf53b120ff96cc9946ed1ba3c7af87b7223cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 20 Jul 2022 15:20:54 -0500 Subject: [PATCH 09/26] fix margin for title h1 --- docs/_sass/_main.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 2d62fa522635..6f3f2805f0af 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -98,6 +98,13 @@ h6 { font-family: "GTAmericaExp-Regular"; font-weight: bold; padding-bottom: 12px; +} + +h2, +h3, +h4, +h5, +h6 { margin-top: 20px; } From 3f20e81838ebbd118185c635120d0e5d6964150a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 14:36:42 -0500 Subject: [PATCH 10/26] fix selected home link --- docs/_includes/home-lhn.html | 2 +- docs/_sass/_main.scss | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index 4d165f97091e..7b131c1e5d9c 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -1,6 +1,6 @@

  • -
    Home
    +
    Home
  • diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 6f3f2805f0af..c0a6ce15e24d 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -230,15 +230,12 @@ textarea { display: grid; grid-template-columns: 40px auto; cursor: pointer; + } - &.selected { - cursor: auto; - - span { - font-weight: bold; - color: $color-dark; - } - } + .selected { + cursor: auto; + font-weight: bold; + color: $color-dark; } .hide { From df397389b67c00760a7ce3f32f16015a7ee3c08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 15:09:36 -0500 Subject: [PATCH 11/26] remove underling for hover --- docs/_sass/_main.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index c0a6ce15e24d..b766d4129ec1 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -84,7 +84,6 @@ a { &:hover { color: $color-blueHover; - text-decoration: underline; } } @@ -290,7 +289,6 @@ textarea { &:hover { color: $color-blueHover; - text-decoration: underline; } } From 99705d81b71f5da6f7d438d29bf3f42f20b4bd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 15:37:59 -0500 Subject: [PATCH 12/26] use default font for strong --- docs/_sass/_main.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index b766d4129ec1..67e5c2a8de5d 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -70,10 +70,6 @@ hr { margin: 0 0 16px; } -strong { - font-family: "GTAmericaExp-Bold", "Helvetica Neue", "Helvetica", Arial, sans-serif; -} - em { font-style: italic; } From b6a1d2b3619c5a17a2c571aed4f845d0063f125c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 26 Jul 2022 15:43:46 -0500 Subject: [PATCH 13/26] add onclick events to home page cards --- docs/main.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/main.html b/docs/main.html index 91a1593e8d80..1f6235e7dd7a 100644 --- a/docs/main.html +++ b/docs/main.html @@ -19,7 +19,7 @@

    -
    +
    @@ -29,7 +29,7 @@

    -
    +
    @@ -47,28 +47,28 @@

    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    From 2281ec1826243415adc8ad2a605afd3f32ebee7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 27 Jul 2022 12:38:18 -0500 Subject: [PATCH 14/26] change card border color for hover --- docs/_sass/_main.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 67e5c2a8de5d..80b2bd6b9aa4 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -341,15 +341,28 @@ textarea { padding: 28px; font-weight: bold; cursor: pointer; + $border-amount-darken: 15%; + + &:hover { + border-color: darken($color-gray2, $border-amount-darken); + } &.send-money { border-color: $color-blue; border-width: 1.5px; + + &:hover { + border-color: darken($color-blue, $border-amount-darken); + } } &.request-money { border-color: $color-green; border-width: 1.5px; + + &:hover { + border-color: darken($color-green, $border-amount-darken); + } } .left-icon { From c7c6328cb47961ba8403d8d5aefd195c8e68556c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 27 Jul 2022 12:50:51 -0500 Subject: [PATCH 15/26] use font-weight: bold for strong tag --- docs/_sass/_fonts.scss | 4 ---- docs/_sass/_main.scss | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/_sass/_fonts.scss b/docs/_sass/_fonts.scss index a43d35ed9d26..ad6eaf466609 100644 --- a/docs/_sass/_fonts.scss +++ b/docs/_sass/_fonts.scss @@ -93,7 +93,3 @@ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } - -strong { - font-weight: 600; -} diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 80b2bd6b9aa4..02f66aacbb12 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -70,6 +70,10 @@ hr { margin: 0 0 16px; } +strong { + font-weight: bold; +} + em { font-style: italic; } @@ -90,7 +94,6 @@ h4, h5, h6 { color: $color-dark; - font-family: "GTAmericaExp-Regular"; font-weight: bold; padding-bottom: 12px; } From 93a1a85785d8edaed1d69a4a9a65f60419f0750a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 2 Aug 2022 17:35:04 -0500 Subject: [PATCH 16/26] replace divs by a with href --- docs/main.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/main.html b/docs/main.html index 1f6235e7dd7a..18fbf1eb0e54 100644 --- a/docs/main.html +++ b/docs/main.html @@ -19,7 +19,7 @@

    -
    +
    @@ -27,9 +27,9 @@

    Send money
    Brief description of who would fall under this category.

    -
    + -
    +
    @@ -37,7 +37,7 @@

    Request money
    Brief description of who would fall under this category.

    -

    +
    @@ -47,28 +47,28 @@

    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    + -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    + -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    From 72a71b4b1a224d0f0b9bbb30863cc0d84a7cbf5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 2 Aug 2022 17:35:22 -0500 Subject: [PATCH 17/26] set original color for a tags with card class --- docs/_sass/_main.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 02f66aacbb12..950a07eee200 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -345,9 +345,11 @@ textarea { font-weight: bold; cursor: pointer; $border-amount-darken: 15%; + color: $color-dark; &:hover { border-color: darken($color-gray2, $border-amount-darken); + color: $color-dark; } &.send-money { From 8fa30a4d899c10e3bc94d6fefb993c34c35d840d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 2 Aug 2022 17:38:09 -0500 Subject: [PATCH 18/26] change remaining card divs to a tags --- docs/hubs/request-money.html | 4 ++-- docs/main.html | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html index e08699537aaf..b242268e8d13 100644 --- a/docs/hubs/request-money.html +++ b/docs/hubs/request-money.html @@ -24,14 +24,14 @@

    -
    +
    SmartScan
    -
    + diff --git a/docs/main.html b/docs/main.html index 18fbf1eb0e54..cc552844bfa1 100644 --- a/docs/main.html +++ b/docs/main.html @@ -61,19 +61,19 @@

    -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    + -
    +
    Getting started
    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui.
    -
    +
    \ No newline at end of file From 30de7bb660a16d93d352e5f0921cbb42621d3ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 2 Aug 2022 17:42:04 -0500 Subject: [PATCH 19/26] update instructions that use card div --- docs/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/README.md b/docs/README.md index fee70463178b..30b83dc6e406 100644 --- a/docs/README.md +++ b/docs/README.md @@ -68,23 +68,23 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt -
    +
    SmartScan
    -
    + -
    +
    Another Article
    -
    + @@ -119,14 +119,14 @@ A card button is the box that contains the article title and the caret right ico In order to add a new Card button in the respective hub page ([send-money/index.html](https://github.com/Expensify/App/blob/main/docs/hubs/send-money.html) or [request-money/index.html](https://github.com/Expensify/App/blob/main/docs/hubs/request-money.html)) just copy and pase the following Card element: ```html -
    +
    SmartScan
    -
    + ``` Then replace the article title accordingly (in this case replace the value `SmartScan` with the new article title) and add a link to the relative path of the article (in this case replace `./request-money/SmartScan` accordingly to the path of the new article file without the file extension). From 88aeb6f56f82f8c7ba6e15736882b71f7b55d643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 13:48:21 -0500 Subject: [PATCH 20/26] replace navigateTo with anchore with href --- docs/_includes/home-lhn.html | 8 ++++---- docs/_includes/request-money-lhn.html | 8 ++++---- docs/_includes/send-money-lhn.html | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index 7b131c1e5d9c..4622d7e0e1e9 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -3,15 +3,15 @@
    Home

  • -
    +
    Send money
    -
    +
  • -
    +
    Request money
    -
    +
diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html index b5f459b80bcc..ebe2d76722a7 100644 --- a/docs/_includes/request-money-lhn.html +++ b/docs/_includes/request-money-lhn.html @@ -3,10 +3,10 @@
Home
  • -
    + - Send money -
    + Send money +
  • @@ -23,7 +23,7 @@
  • Request money
    • diff --git a/docs/_includes/send-money-lhn.html b/docs/_includes/send-money-lhn.html index 4638c2ad8fb3..bf51dfd9d999 100644 --- a/docs/_includes/send-money-lhn.html +++ b/docs/_includes/send-money-lhn.html @@ -15,9 +15,9 @@
  • -
    + - Request money -
    + Request money +
    • From d89c7f6110542c7b55084810bf9e6256e4ea1a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 13:55:35 -0500 Subject: [PATCH 21/26] change navigateToHome with anchor with href --- docs/_includes/request-money-lhn.html | 2 +- docs/_includes/send-money-lhn.html | 2 +- docs/assets/js/main.js | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html index ebe2d76722a7..bed3e3c3f891 100644 --- a/docs/_includes/request-money-lhn.html +++ b/docs/_includes/request-money-lhn.html @@ -1,6 +1,6 @@
    • -
      Home
      + Home
    • diff --git a/docs/_includes/send-money-lhn.html b/docs/_includes/send-money-lhn.html index bf51dfd9d999..37c6262827ad 100644 --- a/docs/_includes/send-money-lhn.html +++ b/docs/_includes/send-money-lhn.html @@ -1,6 +1,6 @@
      • -
        Home
        +         Home
      • diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 2de6d84efb81..7d6b68e2de46 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -1,14 +1,5 @@ /* eslint-disable no-unused-vars */ -function navigateTo(path) { - window.location.href = path; -} - -function navigateToHome() { - // TODO: Change to '/index' when the site is live - navigateTo('/main'); -} - function toggleHeaderMenu() { const lhn = document.getElementById('lhn'); const lhnContent = document.getElementById('lhn-content'); From fcee8e6b88f42d47683b7ca2addb9a0f37c64c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 14:38:19 -0500 Subject: [PATCH 22/26] add click event to header-button --- docs/_layouts/default.html | 2 +- docs/_sass/_main.scss | 2 +- docs/assets/js/main.js | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index a7d905fcf2b4..567e47e24719 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -24,7 +24,7 @@
        -
        +
        diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 950a07eee200..83299926ef06 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -202,7 +202,7 @@ textarea { padding: 24px; } - .header-button { + #header-button { position: absolute; display: none; diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 7d6b68e2de46..225b44847e20 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -66,3 +66,5 @@ if (window.tocbot) { }, }); } + +document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); From 6757edc610d4dd97a4930783e422800a8158e339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 14:43:00 -0500 Subject: [PATCH 23/26] attach back button logic in js --- docs/_layouts/default.html | 2 +- docs/assets/js/main.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 567e47e24719..b263a75502b1 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -41,7 +41,7 @@ {% when "send-money" %} {% include send-money-lhn.html %} {% else %} -
        + diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 225b44847e20..59f618842193 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -68,3 +68,8 @@ if (window.tocbot) { } document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); + +const backButton = document.getElementById('back-button'); +if (backButton) { + backButton.addEventListener('click', navigateBack); +} From bf96ccdb668e24ca7ec39529477ffb48a5687570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 3 Aug 2022 14:57:46 -0500 Subject: [PATCH 24/26] remove unnecessary div in home lhn --- docs/_includes/home-lhn.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index 4622d7e0e1e9..6ff3a4462dcd 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -5,13 +5,13 @@
      • -
        Send money
        + Send money
      • -
        Request money
        + Request money
      From 57cc4a81b31921e1ea3ed6c723b1819ef9f36a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 9 Aug 2022 15:15:53 -0500 Subject: [PATCH 25/26] move event listeners and tocbot.init to DOMContentLoaded event --- docs/assets/js/main.js | 66 ++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 59f618842193..c7418d2dc0a5 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -31,45 +31,47 @@ function navigateBack() { setTimeout(toggleHeaderMenu, 250); } -if (window.tocbot) { - window.tocbot.init({ +window.addEventListener('DOMContentLoaded', () => { + if (window.tocbot) { + window.tocbot.init({ // Where to render the table of contents. - tocSelector: '.article-toc', + tocSelector: '.article-toc', - // Where to grab the headings to build the table of contents. - contentSelector: '.article-toc-content', + // Where to grab the headings to build the table of contents. + contentSelector: '.article-toc-content', - // Disable the collapsible functionality of the library by - // setting the maximum number of heading levels (6) - collapseDepth: 6, + // Disable the collapsible functionality of the library by + // setting the maximum number of heading levels (6) + collapseDepth: 6, - // Main class to add to lists. - listClass: 'lhn-items', + // Main class to add to lists. + listClass: 'lhn-items', - // Main class to add to links. - linkClass: 'link', + // Main class to add to links. + linkClass: 'link', - // Class to add to active links, - // the link corresponding to the top most heading on the page. - activeLinkClass: 'selected-article', + // Class to add to active links, + // the link corresponding to the top most heading on the page. + activeLinkClass: 'selected-article', - // Headings offset between the headings and the top of the document (requires scrollSmooth enabled) - headingsOffset: 80, - scrollSmoothOffset: -80, - scrollSmooth: true, + // Headings offset between the headings and the top of the document (requires scrollSmooth enabled) + headingsOffset: 80, + scrollSmoothOffset: -80, + scrollSmooth: true, - // onclick function to apply to all links in toc. will be called with - // the event as the first parameter, and this can be used to stop, - // propagation, prevent default or perform action - onClick() { - toggleHeaderMenu(); - }, - }); -} + // onclick function to apply to all links in toc. will be called with + // the event as the first parameter, and this can be used to stop, + // propagation, prevent default or perform action + onClick() { + toggleHeaderMenu(); + }, + }); + } -document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); + document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); -const backButton = document.getElementById('back-button'); -if (backButton) { - backButton.addEventListener('click', navigateBack); -} + const backButton = document.getElementById('back-button'); + if (backButton) { + backButton.addEventListener('click', navigateBack); + } +}); From 1a0f9bcd4654207549d1e5c1779440b6e852261c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 9 Aug 2022 15:19:34 -0500 Subject: [PATCH 26/26] add comment to back button --- docs/assets/js/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index c7418d2dc0a5..efa68a6b1e7f 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -70,6 +70,7 @@ window.addEventListener('DOMContentLoaded', () => { document.getElementById('header-button').addEventListener('click', toggleHeaderMenu); + // Back button doesn't exist on all the pages const backButton = document.getElementById('back-button'); if (backButton) { backButton.addEventListener('click', navigateBack);