From 3f54559706447420ca588f25a37758f83cc556fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Mon, 4 Jul 2022 20:38:58 -0500 Subject: [PATCH 01/39] fix conflicts --- docs/_sass/_main.scss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index fa153e7f2480..571a8f30f048 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -224,19 +224,19 @@ textarea { } .cards-row { - display: flex; - flex-wrap: wrap; - justify-content: space-between; - row-gap: 10px; - column-gap: 20px; + display: grid; + grid-template-columns: auto; + row-gap: 12px; + column-gap: 40px; + + @media screen and (min-width: 800px) { + grid-template-columns: auto auto; + } } .card { display: flex; flex-wrap: nowrap; - flex: 42%; - flex-grow: 0; - flex-shrink: 0; border-radius: 15px; border: 1px solid lightgray; padding: 20px; From 0291592daa5227b239b4674693c520912aeb5683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Mon, 4 Jul 2022 20:53:26 -0500 Subject: [PATCH 02/39] fix grids with one element --- docs/_sass/_main.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 571a8f30f048..75621236e6b0 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -227,10 +227,10 @@ textarea { display: grid; grid-template-columns: auto; row-gap: 12px; - column-gap: 40px; + column-gap: 4%; @media screen and (min-width: 800px) { - grid-template-columns: auto auto; + grid-template-columns: 48% 48%; } } From 6360cc001330c2e63d78619a96747ef2acb8e0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 5 Jul 2022 14:39:35 -0500 Subject: [PATCH 03/39] fix logo styles --- docs/_sass/_main.scss | 6 +- ...40b622142f1c98125abcfe89a76a661b0e8e343910 | 1 + ...0d98901ba7a7b661724e92811465fe20fe57f1f075 | 121 ++++++++++++ help/_site/404.html | 88 +++++++++ .../articles/request-money/SmartScan.html | 187 ++++++++++++++++++ help/_site/assets/css/styles.css | 1 + help/_site/assets/images/expensify-help.svg | 35 ++++ help/_site/assets/js/main.js | 34 ++++ help/_site/feed.xml | 1 + help/_site/hubs/request-money.html | 117 +++++++++++ help/_site/hubs/send-money.html | 83 ++++++++ help/_site/index.html | 71 +++++++ 12 files changed, 742 insertions(+), 3 deletions(-) create mode 100644 help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 create mode 100644 help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 create mode 100644 help/_site/404.html create mode 100644 help/_site/articles/request-money/SmartScan.html create mode 100644 help/_site/assets/css/styles.css create mode 100644 help/_site/assets/images/expensify-help.svg create mode 100644 help/_site/assets/js/main.js create mode 100644 help/_site/feed.xml create mode 100644 help/_site/hubs/request-money.html create mode 100644 help/_site/hubs/send-money.html create mode 100644 help/_site/index.html diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 75621236e6b0..d7aa91e42f9b 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -153,15 +153,15 @@ textarea { height: 100%; width: 375px; position: fixed; - background-color: $color-gray1; - padding: 36px; + background-color: colors.$gray1; + padding: 44px; box-sizing: border-box; border-right-color: $color-gray2; border-right-width: 1px; border-style: solid; .logo { - width: 150px; + width: 210px; } .lhn-content { diff --git a/help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 b/help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 new file mode 100644 index 000000000000..7b6a4593f182 --- /dev/null +++ b/help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 @@ -0,0 +1 @@ +I"8{"source"=>"/Users/marco/Expensidev/App/help", "destination"=>"/Users/marco/Expensidev/App/help/_site", "collections_dir"=>"", "cache_dir"=>".jekyll-cache", "plugins_dir"=>"_plugins", "layouts_dir"=>"_layouts", "data_dir"=>"_data", "includes_dir"=>"_includes", "collections"=>{"posts"=>{"output"=>true, "permalink"=>"/:categories/:year/:month/:day/:title:output_ext"}}, "safe"=>false, "include"=>[".htaccess"], "exclude"=>["README.md", "TEMPLATE.md", ".sass-cache", ".jekyll-cache", "gemfiles", "Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"], "keep_files"=>[".git", ".svn"], "encoding"=>"utf-8", "markdown_ext"=>"markdown,mkdown,mkdn,mkd,md", "strict_front_matter"=>false, "show_drafts"=>nil, "limit_posts"=>0, "future"=>false, "unpublished"=>false, "whitelist"=>[], "plugins"=>[], "markdown"=>"kramdown", "highlighter"=>"rouge", "lsi"=>false, "excerpt_separator"=>"\n\n", "incremental"=>false, "detach"=>false, "port"=>"4000", "host"=>"127.0.0.1", "baseurl"=>nil, "show_dir_listing"=>false, "permalink"=>"date", "paginate_path"=>"/page:num", "timezone"=>nil, "quiet"=>false, "verbose"=>false, "defaults"=>[{"scope"=>{"path"=>""}, "values"=>{"layout"=>"default"}}], "liquid"=>{"error_mode"=>"warn", "strict_filters"=>false, "strict_variables"=>false}, "kramdown"=>{"auto_ids"=>true, "toc_levels"=>[1, 2, 3, 4, 5, 6], "entity_output"=>"as_char", "smart_quotes"=>"lsquo,rsquo,ldquo,rdquo", "input"=>"GFM", "hard_wrap"=>false, "guess_lang"=>true, "footnote_nr"=>1, "show_warnings"=>false, "syntax_highlighter"=>"rouge", "syntax_highlighter_opts"=>{:default_lang=>"plaintext", :guess_lang=>true}, "coderay"=>{}}, "sass"=>{"implementation"=>"sass-embedded", "style"=>:compressed}, "livereload"=>true, "livereload_port"=>35729, "serving"=>true, "watch"=>true, "url"=>"http://localhost:4000"}:ET \ No newline at end of file diff --git a/help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 b/help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 new file mode 100644 index 000000000000..d4b25ea7925a --- /dev/null +++ b/help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 @@ -0,0 +1,121 @@ +I"�' +

About

+

SmartScan is the time-saving tool that every Expensify user needs. Using SmartScan, you can quickly upload receipts and walk away to take care of more important things. Behind the scenes, SmartScan will process the expense data from your receipt and create an expense or automatically attach the receipt to a matching imported credit card expense.

+ +

What is SmartScan?

+ +

SmartScan is simple on the outside and complex on the inside. When you SmartScan a receipt, we’ll read the Merchant, Date and Amount of the transaction, create an expense, and add it to your Expensify account automatically. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported expense instead!

+
    +
  • Expensify accounts come with 25 free SmartScans per month. If you’re an individual user and you need access to unlimited SmartScans, check out the Monthly Subscription!
    • +
  • If your organization is already using Expensify and you belong to a company policy, you’ll have access to unlimited SmartScans by default.
    • +
+ +

How SmartScan Works:

+ +

While you’re enjoying your coffee, thinking about what to pack or waiting for your package, we’ll scan the information from the receipt without any more input necessary from you.

+ +
    +
  1. First it uses “optical character recognition” (OCR) on receipt images to extract the text from the image.
    2. +
  2. Then it analyzes that text to determine what portions correspond to the merchant name, amount, currency, and date of the purchase. If it can’t detect a specific currency symbol, it will default to the currency based on your current location. You can also write one in by hand if it’s not noted!
    3. +
  3. Finally, SmartScan consults your list of existing expenses to see if the newly processed receipt image corresponds to a purchase that has already been imported via a credit card connection or CSV spreadsheet. We will then merge these transactions. Different currencies? No problem. We’ll still match ‘em.
    4. +
+ +

If our OCR technology can’t read the receipt, we will make sure it’s flagged for human review by one of our secure technicians. At the end of the day, nothing beats the human eye for ultimate quality.

+ +

How-to

+ +

Use Smartscan to create expenses

+ +

You can SmartScan receipts from a variety of sources to quickly and easily create expenses.

+ +

SmartScan physical receipts with the Expensify mobile app

+
    +
  • Open Expensify app and use the big green camera button to snap a photo. Use 3D touch to make it even faster!
    • +
  • Tap “Add details” to add a description if you want to, or select a custom category or tag.
    • +
  • Put your phone back in your pocket and forget about the receipt entirely.
    • +
  • Toss your receipt in the trash… Or burn it! We’ll take over from here!
    • +
+ +

SmartScan digital or emailed receipts by emailing them to receipts@expensify.com

+ +

SmartScan a web receipt with the Expensify Chrome Extension

+ +

SmartScan runs in the background, so there’s no need to keep the app open. Most SmartScans complete within one hour, but it can take a bit longer—so don’t worry! If we need more information from you, you’ll get a message from Concierge letting you know!

+ +

Email Receipts to Expensify

+ +

All receipts in your email inbox, such as airline, rental car, hotel confirmations, online purchases, etc… can be added to your Expensify account simply by forwarding them to receipts@expensify.com. These email receipts will be SmartScanned and an expense will be created for you automatically in Expensify.

+ +

How to create an expense from a receipt email in your Expensify account:

+ +
    +
  • Directly forward the email to receipts@expensify.com from the email address associated with your Expensify account.
    • +
  • Expensify will immediately SmartScan the receipt email.
    • +
  • You can then find the expense on the Expenses page, either listed under the date of the receipt (if the SmartScan has completed) or under the date that you forwarded the receipt (if the SmartScan has not completed extracting information from the receipt yet).
    • +
+ +

How to create an expense in Expensify with a receipt email from an email address that is different from your Expensify login:

+ +
    +
  • You’ll want to add this email address as a secondary login to your Expensify account. This way we associate any email receipts sent from this email to receipts@expensify.com and add them to the correct Expensify account.
    • +
  • Once the email address has been added as a secondary login, simply follow the steps above and forward these receipt emails to receipts@expensify.com.
    • +
+ +

Pro tip: Expensify offer receipt integrations with popular apps such as Uber and Lyft where receipts are automatically imported into your account.

+ +

How-to: Email Receipts as a Copilot

+ +

Because emailing receipts to receipts@expensify.com sends the receipts directly to the account tied to the senders email, there is an additional step you need to take when sending receipts as a copilot.

+ +
    +
  1. Click forward on the email and address it to receipts@expensify.com
    2. +
  2. Add the email address of the user whose account you want the receipts to go to in the subject line
    3. +
  3. Click Send
    4. +
+ +

As long as you are a Copilot for this user, the receipts will be placed in their account and can be found on the Expenses page.

+ +

Can the Copilot’s Secondary Logins be used to forward receipts?

+

Yes! A Copilot can use any of the email addresses tied to their account to forward receipts into the account of the person they’re assisting.

+ +

FAQ

+ +

How do I get unlimited SmartScans?

+ +

If you belong to your company’s policy, you have unlimited SmartScans automatically. However, if you’re an individual user, purchase the Monthly Subscription to gain access to limitless SmartScans.

+ +

How can I SmartScan multiple receipts as quickly as possible?

+ +

You can enable Rapid Fire of receipts by tapping the camera icon in the bottom right-hand corner of the screen when taking a picture of your receipts. With Rapid Fire enabled, you can snap away without ever being taken out of the camera to code your receipts.

+ +

SmartScanned receipts and credit card’s currency are different. Will they still match?

+ +

Yep! As long as the currency is clear, SmartScan is smart enough to convert to the proper currency (indicated by your policy or your account settings) and merge with the incoming credit card transaction.

+ +

Will an eReceipt merge with a SmartScan or emailed receipt?

+ +

Yes! SmartScanned receipts will still merge with and override their eReceipt counterparts.

+ +

Will Duplicate Detection flag the same receipt even if I accidentally SmartScan it much later?

+ +

Duplicate Detection will look at all expenses in a single user’s Expensify account regardless of the date it is uploaded. As long as the date and amount match, then we will show a duplicate.

+ +

Why did Concierge reach out about my SmartScan?

+ +

When Concierge reaches out it means that your receipt was most likely missing one or more of these: merchant name, purchase date, or total amount. SmartScan requires these three data points to be present because it’s the only way to ensure it’s a traceable, legitimate receipt.

+ +

Want to know more about Concierge? Meet our friendly AI bot here!

+ +

Can I disable SmartScan?

+ +

For users on Track, Submit and Collect policies, you can disable SmartScan in your account settings.

+ +
    +
  1. Disabling SmartScan
    2. +
  2. Log into your account using your preferred web browser,
    3. +
  3. Head to your Settings > Your Account > Preferences > SmartScanning page,
    4. +
  4. Click the green toggle to disable the feature.
    5. +
+ +

Please note: SmartScan is enabled for all Control plan policies to facilitate the Concierge Receipt Audit feature. You cannot disable SmartScan when defaulted to a Control policy.

+:ET \ No newline at end of file diff --git a/help/_site/404.html b/help/_site/404.html new file mode 100644 index 000000000000..c8e1eb9f77f0 --- /dev/null +++ b/help/_site/404.html @@ -0,0 +1,88 @@ + + + + + + Expensify Help + + + + + + + + + + + +
+ +
+ + +
+ + + +
+ +
+
+ Back +
+
+ In this article +
+ +
+ + + +
+ +
+
+ +
+ + + +

+ 404.html +

+ + +
+ + + +
+

404

+ +

Page not found :(

+

The requested page could not be found.

+
+ +
+ + +
+ +
+
+ + + diff --git a/help/_site/articles/request-money/SmartScan.html b/help/_site/articles/request-money/SmartScan.html new file mode 100644 index 000000000000..953dad29cd83 --- /dev/null +++ b/help/_site/articles/request-money/SmartScan.html @@ -0,0 +1,187 @@ + + + + + + Expensify Help + + + + + + + + + + + +
+ +
+ + +
+ + + +
+ +
+
+ Back +
+
+ In this article +
+ +
+ + + +
+ +
+
+ +
+ + + +

+ SmartScan +

+ + +
+ + +

About

+

SmartScan is the time-saving tool that every Expensify user needs. Using SmartScan, you can quickly upload receipts and walk away to take care of more important things. Behind the scenes, SmartScan will process the expense data from your receipt and create an expense or automatically attach the receipt to a matching imported credit card expense.

+ +

What is SmartScan?

+ +

SmartScan is simple on the outside and complex on the inside. When you SmartScan a receipt, we’ll read the Merchant, Date and Amount of the transaction, create an expense, and add it to your Expensify account automatically. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported expense instead!

+
    +
  • Expensify accounts come with 25 free SmartScans per month. If you’re an individual user and you need access to unlimited SmartScans, check out the Monthly Subscription!
    • +
  • If your organization is already using Expensify and you belong to a company policy, you’ll have access to unlimited SmartScans by default.
    • +
+ +

How SmartScan Works:

+ +

While you’re enjoying your coffee, thinking about what to pack or waiting for your package, we’ll scan the information from the receipt without any more input necessary from you.

+ +
    +
  1. First it uses “optical character recognition” (OCR) on receipt images to extract the text from the image.
    2. +
  2. Then it analyzes that text to determine what portions correspond to the merchant name, amount, currency, and date of the purchase. If it can’t detect a specific currency symbol, it will default to the currency based on your current location. You can also write one in by hand if it’s not noted!
    3. +
  3. Finally, SmartScan consults your list of existing expenses to see if the newly processed receipt image corresponds to a purchase that has already been imported via a credit card connection or CSV spreadsheet. We will then merge these transactions. Different currencies? No problem. We’ll still match ‘em.
    4. +
+ +

If our OCR technology can’t read the receipt, we will make sure it’s flagged for human review by one of our secure technicians. At the end of the day, nothing beats the human eye for ultimate quality.

+ +

How-to

+ +

Use Smartscan to create expenses

+ +

You can SmartScan receipts from a variety of sources to quickly and easily create expenses.

+ +

SmartScan physical receipts with the Expensify mobile app

+
    +
  • Open Expensify app and use the big green camera button to snap a photo. Use 3D touch to make it even faster!
    • +
  • Tap “Add details” to add a description if you want to, or select a custom category or tag.
    • +
  • Put your phone back in your pocket and forget about the receipt entirely.
    • +
  • Toss your receipt in the trash… Or burn it! We’ll take over from here!
    • +
+ +

SmartScan digital or emailed receipts by emailing them to receipts@expensify.com

+ +

SmartScan a web receipt with the Expensify Chrome Extension

+ +

SmartScan runs in the background, so there’s no need to keep the app open. Most SmartScans complete within one hour, but it can take a bit longer—so don’t worry! If we need more information from you, you’ll get a message from Concierge letting you know!

+ +

Email Receipts to Expensify

+ +

All receipts in your email inbox, such as airline, rental car, hotel confirmations, online purchases, etc… can be added to your Expensify account simply by forwarding them to receipts@expensify.com. These email receipts will be SmartScanned and an expense will be created for you automatically in Expensify.

+ +

How to create an expense from a receipt email in your Expensify account:

+ +
    +
  • Directly forward the email to receipts@expensify.com from the email address associated with your Expensify account.
    • +
  • Expensify will immediately SmartScan the receipt email.
    • +
  • You can then find the expense on the Expenses page, either listed under the date of the receipt (if the SmartScan has completed) or under the date that you forwarded the receipt (if the SmartScan has not completed extracting information from the receipt yet).
    • +
+ +

How to create an expense in Expensify with a receipt email from an email address that is different from your Expensify login:

+ +
    +
  • You’ll want to add this email address as a secondary login to your Expensify account. This way we associate any email receipts sent from this email to receipts@expensify.com and add them to the correct Expensify account.
    • +
  • Once the email address has been added as a secondary login, simply follow the steps above and forward these receipt emails to receipts@expensify.com.
    • +
+ +

Pro tip: Expensify offer receipt integrations with popular apps such as Uber and Lyft where receipts are automatically imported into your account.

+ +

How-to: Email Receipts as a Copilot

+ +

Because emailing receipts to receipts@expensify.com sends the receipts directly to the account tied to the senders email, there is an additional step you need to take when sending receipts as a copilot.

+ +
    +
  1. Click forward on the email and address it to receipts@expensify.com
    2. +
  2. Add the email address of the user whose account you want the receipts to go to in the subject line
    3. +
  3. Click Send
    4. +
+ +

As long as you are a Copilot for this user, the receipts will be placed in their account and can be found on the Expenses page.

+ +

Can the Copilot’s Secondary Logins be used to forward receipts?

+

Yes! A Copilot can use any of the email addresses tied to their account to forward receipts into the account of the person they’re assisting.

+ +

FAQ

+ +

How do I get unlimited SmartScans?

+ +

If you belong to your company’s policy, you have unlimited SmartScans automatically. However, if you’re an individual user, purchase the Monthly Subscription to gain access to limitless SmartScans.

+ +

How can I SmartScan multiple receipts as quickly as possible?

+ +

You can enable Rapid Fire of receipts by tapping the camera icon in the bottom right-hand corner of the screen when taking a picture of your receipts. With Rapid Fire enabled, you can snap away without ever being taken out of the camera to code your receipts.

+ +

SmartScanned receipts and credit card’s currency are different. Will they still match?

+ +

Yep! As long as the currency is clear, SmartScan is smart enough to convert to the proper currency (indicated by your policy or your account settings) and merge with the incoming credit card transaction.

+ +

Will an eReceipt merge with a SmartScan or emailed receipt?

+ +

Yes! SmartScanned receipts will still merge with and override their eReceipt counterparts.

+ +

Will Duplicate Detection flag the same receipt even if I accidentally SmartScan it much later?

+ +

Duplicate Detection will look at all expenses in a single user’s Expensify account regardless of the date it is uploaded. As long as the date and amount match, then we will show a duplicate.

+ +

Why did Concierge reach out about my SmartScan?

+ +

When Concierge reaches out it means that your receipt was most likely missing one or more of these: merchant name, purchase date, or total amount. SmartScan requires these three data points to be present because it’s the only way to ensure it’s a traceable, legitimate receipt.

+ +

Want to know more about Concierge? Meet our friendly AI bot here!

+ +

Can I disable SmartScan?

+ +

For users on Track, Submit and Collect policies, you can disable SmartScan in your account settings.

+ +
    +
  1. Disabling SmartScan
    2. +
  2. Log into your account using your preferred web browser,
    3. +
  3. Head to your Settings > Your Account > Preferences > SmartScanning page,
    4. +
  4. Click the green toggle to disable the feature.
    5. +
+ +

Please note: SmartScan is enabled for all Control plan policies to facilitate the Concierge Receipt Audit feature. You cannot disable SmartScan when defaulted to a Control policy.

+ +
+ + +
+ +
+
+ + + diff --git a/help/_site/assets/css/styles.css b/help/_site/assets/css/styles.css new file mode 100644 index 000000000000..c366079a8610 --- /dev/null +++ b/help/_site/assets/css/styles.css @@ -0,0 +1 @@ +@font-face{font-family:GTAmericaExp-Regular;font-weight:100;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Light.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Light.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Light.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:200;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Thin.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Thin.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Thin.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:400;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Regular.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Regular.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Regular.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:500;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:600;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:700;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Bold.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Bold.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Bold.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-RgIt;font-weight:400;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-MdIt;font-weight:500;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-BdIt;font-weight:700;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-Rg;font-weight:400;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-RgIt;font-weight:400;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-Bd;font-weight:700;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-BdIt;font-weight:700;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff2") format("woff2")}*{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}strong{font-weight:600}*{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}html{line-height:1}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:400;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}html,body{height:100%;min-height:100%;background:#fff}hr{background:#0185ff;border:none;display:inline-block;width:24px;height:2px;margin:0 0 15px}strong{font-weight:700;font-family:"GTAmericaExp-Bold","Helvetica Neue","Helvetica",Arial,sans-serif}em{font-style:italic}a{color:#0185ff;text-decoration:none}a:hover{color:#006fd6;text-decoration:underline}h1,h2,h3,h4,h5,h6{color:#0b1b34;font-family:"GTAmericaExp-Regular";font-weight:bold;padding-bottom:12px}h2,h3,h4,h5,h6{margin-top:20px}h1{font-size:larger}h2{font-size:large}p{padding-bottom:20px}body,button,input,select,textarea{line-height:1.4;font-weight:400;font-family:"GTAmericaExp-Regular","Helvetica Neue","Helvetica",Arial,sans-serif;font-size:16px;color:#0b1b34}#lhn{height:100%;width:420px;position:fixed;background-color:#fafafa;padding:44px;box-sizing:border-box;border-right-color:#ececec;border-right-width:1px;border-style:solid;overflow-y:scroll;-ms-overflow-style:none;scrollbar-width:none}#lhn ul,#lhn li{list-style:none}#lhn .lhn-header{padding-top:4px}#lhn .header-button{display:none}@media screen and (max-width: 800px){#lhn .header-button{display:block}}#lhn .logo{width:210px}@media screen and (max-width: 800px){#lhn .logo{width:160px;align-content:center;display:block;margin-left:auto;margin-right:auto}}#lhn .lhn-content{padding-top:36px;margin-left:32px}#lhn .caret-icon{left:52px;padding-top:1px;position:absolute;color:#c6c9ca;font-size:larger}@media screen and (max-width: 800px){#lhn .caret-icon{left:32px}}#lhn .caret-icon-vertical{left:48px}@media screen and (max-width: 800px){#lhn .caret-icon-vertical{left:28px}}#lhn .hide{display:none}#lhn::-webkit-scrollbar{display:none}@media screen and (max-width: 1024px){#lhn{width:320px}}@media screen and (max-width: 800px){#lhn{width:100%;padding:24px;height:76px}#lhn.expanded{height:auto}}#content-area{margin-left:420px;padding:52px 68px;box-sizing:border-box}#content-area ul,#content-area ol{margin-left:24px;padding-bottom:20px}#content-area h1.title{font-size:2.25em}@media screen and (max-width: 1024px){#content-area{margin-left:320px}}@media screen and (max-width: 800px){#content-area{margin-left:0;padding-top:80px;padding-left:24px;padding-right:24px;padding-bottom:24px}}.main-navigation-tree ul{padding-left:30px}.main-navigation-tree ul,.main-navigation-tree li{margin-bottom:20px}.main-navigation-tree ul ul,.main-navigation-tree ul li,.main-navigation-tree li ul,.main-navigation-tree li li{margin-top:20px;cursor:pointer}.main-navigation-tree .selected-hub{font-weight:bold}.main-navigation-tree .link{color:#0185ff;cursor:pointer}.main-navigation-tree .link:hover{color:#006fd6;text-decoration:underline}.cards-grid{display:grid;grid-template-columns:auto;row-gap:12px;column-gap:4%;padding-bottom:20px}@media screen and (min-width: 800px){.cards-grid{grid-template-columns:48% 48%}}.card{display:flex;flex-wrap:nowrap;border-radius:15px;border:1px solid #d3d3d3;padding:28px;font-weight:bold}.card .left-icon{display:flex;align-items:center;padding-right:15px}.card .right-icon{display:flex;align-items:center;padding-left:15px}.card .body{display:flex;flex-wrap:nowrap;flex-direction:column;flex-grow:2}.card .description{margin-top:15px} diff --git a/help/_site/assets/images/expensify-help.svg b/help/_site/assets/images/expensify-help.svg new file mode 100644 index 000000000000..f81c561eb17a --- /dev/null +++ b/help/_site/assets/images/expensify-help.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + diff --git a/help/_site/assets/js/main.js b/help/_site/assets/js/main.js new file mode 100644 index 000000000000..bb82328f5c0f --- /dev/null +++ b/help/_site/assets/js/main.js @@ -0,0 +1,34 @@ +if (window.tocbot) { + window.tocbot.init({ + // Where to render the table of contents. + tocSelector: '.article-toc', + + // 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, + }); +} + +function openArticle(path) { // eslint-disable-line no-unused-vars + window.location.href = path; +} + +function toggleHeaderMenu() { // eslint-disable-line no-unused-vars + const lhn = document.getElementById('lhn'); + const anguleUpIcon = document.getElementById('angle-up-icon'); + const barsIcon = document.getElementById('bars-icon'); + if (lhn.className === 'expanded') { + // Collapse the LHN in mobile + lhn.className = ''; + barsIcon.classList.remove('hide'); + anguleUpIcon.classList.add('hide'); + } else { + // Expand the LHN in mobile + lhn.className = 'expanded'; + barsIcon.classList.add('hide'); + anguleUpIcon.classList.remove('hide'); + } +} diff --git a/help/_site/feed.xml b/help/_site/feed.xml new file mode 100644 index 000000000000..409c10c78af5 --- /dev/null +++ b/help/_site/feed.xml @@ -0,0 +1 @@ +Jekyll2022-07-07T13:38:33-05:00http://localhost:4000/feed.xml \ No newline at end of file diff --git a/help/_site/hubs/request-money.html b/help/_site/hubs/request-money.html new file mode 100644 index 000000000000..7e1e69c63a71 --- /dev/null +++ b/help/_site/hubs/request-money.html @@ -0,0 +1,117 @@ + + + + + + Expensify Help + + + + + + + + + + + +
+ +
+ + +
+ + + +
+ + + +
+ + + +
+ +
+
+ +
+ + + + +
+ +

+ Request Money +

+ + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. Nullam sed vestibulum purus, in auctor libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas dolor metus, + + + + +

+ Request Money +

+ + +
+ + + +
+
+
SmartScan
+
+
+ +
+
+ + + +
+ +
+ + +
+ +
+
+ + + diff --git a/help/_site/hubs/send-money.html b/help/_site/hubs/send-money.html new file mode 100644 index 000000000000..4986e1a05c1c --- /dev/null +++ b/help/_site/hubs/send-money.html @@ -0,0 +1,83 @@ + + + + + + Expensify Help + + + + + + + + + + + +
+ +
+ + +
+ + + +
+ + + +
+ + + +
+ +
+
+ +
+ + + + +
+ +

+ Send Money page +

+ + +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. Nullam sed vestibulum purus, in auctor libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas dolor metus, + + + +
+ + +
+ +
+
+ + + diff --git a/help/_site/index.html b/help/_site/index.html new file mode 100644 index 000000000000..b0df590191e6 --- /dev/null +++ b/help/_site/index.html @@ -0,0 +1,71 @@ + + + + + + Expensify Help + + + + + + + + + + + +
+ +
+ + +
+ + + +
+ + + + +
+ + + +
+ +
+
+ +
+ + + + +
+ + + +
+ + +
+ +
+
+ + + From 44c5f4913beb53d45775dfa41e536484c76dab47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 5 Jul 2022 14:50:35 -0500 Subject: [PATCH 04/39] fix lhn styles --- docs/_sass/_main.scss | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index d7aa91e42f9b..fa87bd5cd146 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -165,7 +165,7 @@ textarea { } .lhn-content { - padding-top: 24px; + padding-top: 36px; margin-left: 32px; } @@ -186,18 +186,18 @@ textarea { ul, li { - margin-bottom: 12px; + margin-bottom: 20px; /* Apply recursive style to add a margin to the nested items */ ul, li { - margin-top: 12px; + margin-top: 20px; cursor: pointer; } } .caret-icon { - left: 48px; + left: 52px; padding-top: 1px; position: absolute; color: $color-gray3; @@ -205,7 +205,7 @@ textarea { } .caret-icon-down { - left: 44px; + left: 48px; } .selected-hub { @@ -221,6 +221,8 @@ textarea { text-decoration: underline; } } + + padding-left: 0; } .cards-row { From 46f5e1e48b8beb5ea678546581f54aff945be577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 5 Jul 2022 15:13:15 -0500 Subject: [PATCH 05/39] fix lhn styles for ul --- docs/_sass/_main.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index fa87bd5cd146..b8292ce60dec 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -7,6 +7,7 @@ * { margin: 0; + padding: 0; border: 0; font: inherit; font-size: 100%; @@ -184,6 +185,10 @@ textarea { .main-navigation-tree { + ul { + padding-left: 30px; + } + ul, li { margin-bottom: 20px; @@ -221,8 +226,6 @@ textarea { text-decoration: underline; } } - - padding-left: 0; } .cards-row { From 1d7402c8cf9106a69aef85a9bbe55a8025fd5e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 5 Jul 2022 15:37:18 -0500 Subject: [PATCH 06/39] fix h1 and content-area styles --- docs/_sass/_main.scss | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index b8292ce60dec..a96795e71e48 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -102,14 +102,12 @@ h5, h6 { color: $color-dark; font-family: "GTAmericaExp-Regular"; - font-weight: 400; + font-weight: bold; margin-bottom: 12px; - line-height: 1.33; } h1 { font-size: 36px; - line-height: 1.2; } h2 { @@ -152,7 +150,7 @@ textarea { .lhn { height: 100%; - width: 375px; + width: 420px; position: fixed; background-color: colors.$gray1; padding: 44px; @@ -178,8 +176,8 @@ textarea { .content-area { /* Same as the width of the lhn */ - margin-left: 375px; - padding: 48px; + margin-left: 420px; + padding: 52px 68px; box-sizing: border-box; } From 9a83c5563ca569f7bcd7a64a0c80d4ff9b62380d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 5 Jul 2022 15:46:22 -0500 Subject: [PATCH 07/39] fix heading styles --- docs/_sass/_main.scss | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index a96795e71e48..b6717e7f58d0 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -1,15 +1,10 @@ @import 'colors'; @import 'fonts'; -:root { - --spacing-default: 24px; -} - * { margin: 0; padding: 0; border: 0; - font: inherit; font-size: 100%; vertical-align: baseline; -webkit-font-smoothing: antialiased; @@ -111,7 +106,7 @@ h1 { } h2 { - font-size: 26px; + font-size: 20px; } h3 { @@ -133,7 +128,7 @@ h6 { } p { - margin: 0 0 var(--spacing-default); + margin-bottom: 44px; } body, @@ -231,6 +226,7 @@ textarea { grid-template-columns: auto; row-gap: 12px; column-gap: 4%; + margin-bottom: 40px; @media screen and (min-width: 800px) { grid-template-columns: 48% 48%; @@ -242,7 +238,8 @@ textarea { flex-wrap: nowrap; border-radius: 15px; border: 1px solid lightgray; - padding: 20px; + padding: 28px; + font-weight: bold; .left-icon { display: flex; From 781add5360b3f05c43ef44dd876a857fd6642929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 5 Jul 2022 17:49:12 -0500 Subject: [PATCH 08/39] add scrollbar funcitonality to LHN --- docs/_sass/_main.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index b6717e7f58d0..99057d8b2cb0 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -153,6 +153,13 @@ textarea { border-right-color: $color-gray2; border-right-width: 1px; border-style: solid; + overflow-y:scroll; + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ + + &::-webkit-scrollbar { + display: none; + } .logo { width: 210px; @@ -221,7 +228,7 @@ textarea { } } -.cards-row { +.cards-grid { display: grid; grid-template-columns: auto; row-gap: 12px; From df82acff7d32603c52bcca51889e9dc6ade1d8ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 5 Jul 2022 18:03:03 -0500 Subject: [PATCH 09/39] update lhn width for different sizes --- docs/_sass/_main.scss | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 99057d8b2cb0..e836ab458bfd 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -157,8 +157,9 @@ textarea { -ms-overflow-style: none; /* IE and Edge */ scrollbar-width: none; /* Firefox */ - &::-webkit-scrollbar { - display: none; + ul, + li { + list-style: none; } .logo { @@ -170,9 +171,12 @@ textarea { margin-left: 32px; } - ul, - li { - list-style: none; + &::-webkit-scrollbar { + display: none; + } + + @media screen and (max-width: 1024px) { + width: 320px; } } @@ -181,6 +185,10 @@ textarea { margin-left: 420px; padding: 52px 68px; box-sizing: border-box; + + @media screen and (max-width: 1024px) { + margin-left: 320px; + } } .main-navigation-tree { From eff24eb202753f88194f3db007198e2a7215f79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Wed, 6 Jul 2022 11:35:38 -0500 Subject: [PATCH 10/39] add reponsiveness to the LHN --- .../_includes/send-money-navigation-tree.html | 2 +- docs/_layouts/default.html | 9 ++- docs/_sass/_main.scss | 72 +++++++++++++++---- docs/assets/js/main.js | 17 +++++ 4 files changed, 83 insertions(+), 17 deletions(-) diff --git a/docs/_includes/send-money-navigation-tree.html b/docs/_includes/send-money-navigation-tree.html index 9b42705d6282..e9a0be2f6da6 100644 --- a/docs/_includes/send-money-navigation-tree.html +++ b/docs/_includes/send-money-navigation-tree.html @@ -3,7 +3,7 @@ Home
  • - + Send Money
      diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 8cb6b378ef52..61e23b699d65 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -15,7 +15,12 @@ -
      +
      + +
      + + +
      @@ -45,7 +50,7 @@
      -
      +
      {% if page.lhn_content == nil %} diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index e836ab458bfd..21ceb60cee4c 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -143,7 +143,7 @@ textarea { color: $color-dark; } -.lhn { +#lhn { height: 100%; width: 420px; position: fixed; @@ -162,8 +162,24 @@ textarea { list-style: none; } + .header-button { + display: none; + + @media screen and (max-width: 800px) { + display: block; + } + } + .logo { width: 210px; + + @media screen and (max-width: 800px) { + width: 160px; + align-content: center; + display: block; + margin-left: auto; + margin-right: auto; + } } .lhn-content { @@ -171,6 +187,30 @@ textarea { margin-left: 32px; } + .caret-icon { + left: 52px; + padding-top: 1px; + position: absolute; + color: colors.$gray3; + font-size: larger; + + @media screen and (max-width: 800px) { + left: 32px; + } + } + + .caret-icon-vertical { + left: 48px; + + @media screen and (max-width: 800px) { + left: 28px; + } + } + + .hide { + display: none; + } + &::-webkit-scrollbar { display: none; } @@ -178,9 +218,18 @@ textarea { @media screen and (max-width: 1024px) { width: 320px; } + @media screen and (max-width: 800px) { + width: 100%; + padding: 24px; + height: 76px; + + &.expanded { + height: auto; + } + } } -.content-area { +#content-area { /* Same as the width of the lhn */ margin-left: 420px; padding: 52px 68px; @@ -189,6 +238,13 @@ textarea { @media screen and (max-width: 1024px) { margin-left: 320px; } + @media screen and (max-width: 800px) { + margin-left: 0; + padding-top: 80px; + padding-left: 24px; + padding-right: 24px; + padding-bottom: 24px; + } } .main-navigation-tree { @@ -209,18 +265,6 @@ textarea { } } - .caret-icon { - left: 52px; - padding-top: 1px; - position: absolute; - color: $color-gray3; - font-size: larger; - } - - .caret-icon-down { - left: 48px; - } - .selected-hub { font-weight: bold; } diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 43aae4741908..bb82328f5c0f 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -15,3 +15,20 @@ if (window.tocbot) { function openArticle(path) { // eslint-disable-line no-unused-vars window.location.href = path; } + +function toggleHeaderMenu() { // eslint-disable-line no-unused-vars + const lhn = document.getElementById('lhn'); + const anguleUpIcon = document.getElementById('angle-up-icon'); + const barsIcon = document.getElementById('bars-icon'); + if (lhn.className === 'expanded') { + // Collapse the LHN in mobile + lhn.className = ''; + barsIcon.classList.remove('hide'); + anguleUpIcon.classList.add('hide'); + } else { + // Expand the LHN in mobile + lhn.className = 'expanded'; + barsIcon.classList.add('hide'); + anguleUpIcon.classList.remove('hide'); + } +} From 166791562cf221fc825eda2d5b01eedd86a55222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 12:16:31 -0500 Subject: [PATCH 11/39] fix style for lhn header --- docs/_sass/_main.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 21ceb60cee4c..4cf972089767 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -162,6 +162,10 @@ textarea { list-style: none; } + .lhn-header { + padding-top: 4px; + } + .header-button { display: none; From 69f9adb94ddc777ddcccbbd58f15ec4389070b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 12:59:09 -0500 Subject: [PATCH 12/39] fix styles for article content page --- docs/_sass/_main.scss | 48 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 4cf972089767..7bedce06674e 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -98,37 +98,27 @@ h6 { color: $color-dark; font-family: "GTAmericaExp-Regular"; font-weight: bold; - margin-bottom: 12px; + padding-bottom: 12px; } -h1 { - font-size: 36px; -} - -h2 { - font-size: 20px; -} - -h3 { - font-size: 20px; +h2, +h3, +h4, +h5, +h6 { + margin-top: 20px; } -h5 { - font-size: 12px; - font-weight: 500; - text-transform: uppercase; - color: $color-blue; - margin-bottom: 6px; +h1 { + font-size: larger; } -h6 { - font-size: 11px; - text-transform: uppercase; - margin-bottom: 6px; +h2 { + font-size: large; } p { - margin-bottom: 44px; + padding-bottom: 20px; } body, @@ -234,6 +224,18 @@ textarea { } #content-area { + ul, + ol { + margin-left: 24px; + padding-bottom: 20px; + } + + h1 { + &.title { + font-size: 2.25em; + } + } + /* Same as the width of the lhn */ margin-left: 420px; padding: 52px 68px; @@ -289,7 +291,7 @@ textarea { grid-template-columns: auto; row-gap: 12px; column-gap: 4%; - margin-bottom: 40px; + padding-bottom: 20px; @media screen and (min-width: 800px) { grid-template-columns: 48% 48%; From 8c88e1c9b1470d828471df19c27cd79393619540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 14:18:50 -0500 Subject: [PATCH 13/39] remove help site --- ...40b622142f1c98125abcfe89a76a661b0e8e343910 | 1 - ...0d98901ba7a7b661724e92811465fe20fe57f1f075 | 121 ------------ help/_site/404.html | 88 --------- .../articles/request-money/SmartScan.html | 187 ------------------ help/_site/assets/css/styles.css | 1 - help/_site/assets/images/expensify-help.svg | 35 ---- help/_site/assets/js/main.js | 34 ---- help/_site/feed.xml | 1 - help/_site/hubs/request-money.html | 117 ----------- help/_site/hubs/send-money.html | 83 -------- help/_site/index.html | 71 ------- 11 files changed, 739 deletions(-) delete mode 100644 help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 delete mode 100644 help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 delete mode 100644 help/_site/404.html delete mode 100644 help/_site/articles/request-money/SmartScan.html delete mode 100644 help/_site/assets/css/styles.css delete mode 100644 help/_site/assets/images/expensify-help.svg delete mode 100644 help/_site/assets/js/main.js delete mode 100644 help/_site/feed.xml delete mode 100644 help/_site/hubs/request-money.html delete mode 100644 help/_site/hubs/send-money.html delete mode 100644 help/_site/index.html diff --git a/help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 b/help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 deleted file mode 100644 index 7b6a4593f182..000000000000 --- a/help/.jekyll-cache/Jekyll/Cache/Jekyll--Cache/b7/9606fb3afea5bd1609ed40b622142f1c98125abcfe89a76a661b0e8e343910 +++ /dev/null @@ -1 +0,0 @@ -I"8{"source"=>"/Users/marco/Expensidev/App/help", "destination"=>"/Users/marco/Expensidev/App/help/_site", "collections_dir"=>"", "cache_dir"=>".jekyll-cache", "plugins_dir"=>"_plugins", "layouts_dir"=>"_layouts", "data_dir"=>"_data", "includes_dir"=>"_includes", "collections"=>{"posts"=>{"output"=>true, "permalink"=>"/:categories/:year/:month/:day/:title:output_ext"}}, "safe"=>false, "include"=>[".htaccess"], "exclude"=>["README.md", "TEMPLATE.md", ".sass-cache", ".jekyll-cache", "gemfiles", "Gemfile", "Gemfile.lock", "node_modules", "vendor/bundle/", "vendor/cache/", "vendor/gems/", "vendor/ruby/"], "keep_files"=>[".git", ".svn"], "encoding"=>"utf-8", "markdown_ext"=>"markdown,mkdown,mkdn,mkd,md", "strict_front_matter"=>false, "show_drafts"=>nil, "limit_posts"=>0, "future"=>false, "unpublished"=>false, "whitelist"=>[], "plugins"=>[], "markdown"=>"kramdown", "highlighter"=>"rouge", "lsi"=>false, "excerpt_separator"=>"\n\n", "incremental"=>false, "detach"=>false, "port"=>"4000", "host"=>"127.0.0.1", "baseurl"=>nil, "show_dir_listing"=>false, "permalink"=>"date", "paginate_path"=>"/page:num", "timezone"=>nil, "quiet"=>false, "verbose"=>false, "defaults"=>[{"scope"=>{"path"=>""}, "values"=>{"layout"=>"default"}}], "liquid"=>{"error_mode"=>"warn", "strict_filters"=>false, "strict_variables"=>false}, "kramdown"=>{"auto_ids"=>true, "toc_levels"=>[1, 2, 3, 4, 5, 6], "entity_output"=>"as_char", "smart_quotes"=>"lsquo,rsquo,ldquo,rdquo", "input"=>"GFM", "hard_wrap"=>false, "guess_lang"=>true, "footnote_nr"=>1, "show_warnings"=>false, "syntax_highlighter"=>"rouge", "syntax_highlighter_opts"=>{:default_lang=>"plaintext", :guess_lang=>true}, "coderay"=>{}}, "sass"=>{"implementation"=>"sass-embedded", "style"=>:compressed}, "livereload"=>true, "livereload_port"=>35729, "serving"=>true, "watch"=>true, "url"=>"http://localhost:4000"}:ET \ No newline at end of file diff --git a/help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 b/help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 deleted file mode 100644 index d4b25ea7925a..000000000000 --- a/help/.jekyll-cache/Jekyll/Cache/Jekyll--Converters--Markdown/f4/0a3e9c506b88921c7cf90d98901ba7a7b661724e92811465fe20fe57f1f075 +++ /dev/null @@ -1,121 +0,0 @@ -I"�' -

      About

      -

      SmartScan is the time-saving tool that every Expensify user needs. Using SmartScan, you can quickly upload receipts and walk away to take care of more important things. Behind the scenes, SmartScan will process the expense data from your receipt and create an expense or automatically attach the receipt to a matching imported credit card expense.

      - -

      What is SmartScan?

      - -

      SmartScan is simple on the outside and complex on the inside. When you SmartScan a receipt, we’ll read the Merchant, Date and Amount of the transaction, create an expense, and add it to your Expensify account automatically. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported expense instead!

      -
        -
      • Expensify accounts come with 25 free SmartScans per month. If you’re an individual user and you need access to unlimited SmartScans, check out the Monthly Subscription!
        • -
      • If your organization is already using Expensify and you belong to a company policy, you’ll have access to unlimited SmartScans by default.
        • -
      - -

      How SmartScan Works:

      - -

      While you’re enjoying your coffee, thinking about what to pack or waiting for your package, we’ll scan the information from the receipt without any more input necessary from you.

      - -
        -
      1. First it uses “optical character recognition” (OCR) on receipt images to extract the text from the image.
        2. -
      2. Then it analyzes that text to determine what portions correspond to the merchant name, amount, currency, and date of the purchase. If it can’t detect a specific currency symbol, it will default to the currency based on your current location. You can also write one in by hand if it’s not noted!
        3. -
      3. Finally, SmartScan consults your list of existing expenses to see if the newly processed receipt image corresponds to a purchase that has already been imported via a credit card connection or CSV spreadsheet. We will then merge these transactions. Different currencies? No problem. We’ll still match ‘em.
        4. -
      - -

      If our OCR technology can’t read the receipt, we will make sure it’s flagged for human review by one of our secure technicians. At the end of the day, nothing beats the human eye for ultimate quality.

      - -

      How-to

      - -

      Use Smartscan to create expenses

      - -

      You can SmartScan receipts from a variety of sources to quickly and easily create expenses.

      - -

      SmartScan physical receipts with the Expensify mobile app

      -
        -
      • Open Expensify app and use the big green camera button to snap a photo. Use 3D touch to make it even faster!
        • -
      • Tap “Add details” to add a description if you want to, or select a custom category or tag.
        • -
      • Put your phone back in your pocket and forget about the receipt entirely.
        • -
      • Toss your receipt in the trash… Or burn it! We’ll take over from here!
        • -
      - -

      SmartScan digital or emailed receipts by emailing them to receipts@expensify.com

      - -

      SmartScan a web receipt with the Expensify Chrome Extension

      - -

      SmartScan runs in the background, so there’s no need to keep the app open. Most SmartScans complete within one hour, but it can take a bit longer—so don’t worry! If we need more information from you, you’ll get a message from Concierge letting you know!

      - -

      Email Receipts to Expensify

      - -

      All receipts in your email inbox, such as airline, rental car, hotel confirmations, online purchases, etc… can be added to your Expensify account simply by forwarding them to receipts@expensify.com. These email receipts will be SmartScanned and an expense will be created for you automatically in Expensify.

      - -

      How to create an expense from a receipt email in your Expensify account:

      - -
        -
      • Directly forward the email to receipts@expensify.com from the email address associated with your Expensify account.
        • -
      • Expensify will immediately SmartScan the receipt email.
        • -
      • You can then find the expense on the Expenses page, either listed under the date of the receipt (if the SmartScan has completed) or under the date that you forwarded the receipt (if the SmartScan has not completed extracting information from the receipt yet).
        • -
      - -

      How to create an expense in Expensify with a receipt email from an email address that is different from your Expensify login:

      - -
        -
      • You’ll want to add this email address as a secondary login to your Expensify account. This way we associate any email receipts sent from this email to receipts@expensify.com and add them to the correct Expensify account.
        • -
      • Once the email address has been added as a secondary login, simply follow the steps above and forward these receipt emails to receipts@expensify.com.
        • -
      - -

      Pro tip: Expensify offer receipt integrations with popular apps such as Uber and Lyft where receipts are automatically imported into your account.

      - -

      How-to: Email Receipts as a Copilot

      - -

      Because emailing receipts to receipts@expensify.com sends the receipts directly to the account tied to the senders email, there is an additional step you need to take when sending receipts as a copilot.

      - -
        -
      1. Click forward on the email and address it to receipts@expensify.com
        2. -
      2. Add the email address of the user whose account you want the receipts to go to in the subject line
        3. -
      3. Click Send
        4. -
      - -

      As long as you are a Copilot for this user, the receipts will be placed in their account and can be found on the Expenses page.

      - -

      Can the Copilot’s Secondary Logins be used to forward receipts?

      -

      Yes! A Copilot can use any of the email addresses tied to their account to forward receipts into the account of the person they’re assisting.

      - -

      FAQ

      - -

      How do I get unlimited SmartScans?

      - -

      If you belong to your company’s policy, you have unlimited SmartScans automatically. However, if you’re an individual user, purchase the Monthly Subscription to gain access to limitless SmartScans.

      - -

      How can I SmartScan multiple receipts as quickly as possible?

      - -

      You can enable Rapid Fire of receipts by tapping the camera icon in the bottom right-hand corner of the screen when taking a picture of your receipts. With Rapid Fire enabled, you can snap away without ever being taken out of the camera to code your receipts.

      - -

      SmartScanned receipts and credit card’s currency are different. Will they still match?

      - -

      Yep! As long as the currency is clear, SmartScan is smart enough to convert to the proper currency (indicated by your policy or your account settings) and merge with the incoming credit card transaction.

      - -

      Will an eReceipt merge with a SmartScan or emailed receipt?

      - -

      Yes! SmartScanned receipts will still merge with and override their eReceipt counterparts.

      - -

      Will Duplicate Detection flag the same receipt even if I accidentally SmartScan it much later?

      - -

      Duplicate Detection will look at all expenses in a single user’s Expensify account regardless of the date it is uploaded. As long as the date and amount match, then we will show a duplicate.

      - -

      Why did Concierge reach out about my SmartScan?

      - -

      When Concierge reaches out it means that your receipt was most likely missing one or more of these: merchant name, purchase date, or total amount. SmartScan requires these three data points to be present because it’s the only way to ensure it’s a traceable, legitimate receipt.

      - -

      Want to know more about Concierge? Meet our friendly AI bot here!

      - -

      Can I disable SmartScan?

      - -

      For users on Track, Submit and Collect policies, you can disable SmartScan in your account settings.

      - -
        -
      1. Disabling SmartScan
        2. -
      2. Log into your account using your preferred web browser,
        3. -
      3. Head to your Settings > Your Account > Preferences > SmartScanning page,
        4. -
      4. Click the green toggle to disable the feature.
        5. -
      - -

      Please note: SmartScan is enabled for all Control plan policies to facilitate the Concierge Receipt Audit feature. You cannot disable SmartScan when defaulted to a Control policy.

      -:ET \ No newline at end of file diff --git a/help/_site/404.html b/help/_site/404.html deleted file mode 100644 index c8e1eb9f77f0..000000000000 --- a/help/_site/404.html +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - Expensify Help - - - - - - - - - - - -
      - -
      - - -
      - - - -
      - -
      -
      - Back -
      -
      - In this article -
      - -
      - - - -
      - -
      -
      - -
      - - - -

      - 404.html -

      - - -
      - - - -
      -

      404

      - -

      Page not found :(

      -

      The requested page could not be found.

      -
      - -
      - - -
      - -
      -
      - - - diff --git a/help/_site/articles/request-money/SmartScan.html b/help/_site/articles/request-money/SmartScan.html deleted file mode 100644 index 953dad29cd83..000000000000 --- a/help/_site/articles/request-money/SmartScan.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - Expensify Help - - - - - - - - - - - -
      - -
      - - -
      - - - -
      - -
      -
      - Back -
      -
      - In this article -
      - -
      - - - -
      - -
      -
      - -
      - - - -

      - SmartScan -

      - - -
      - - -

      About

      -

      SmartScan is the time-saving tool that every Expensify user needs. Using SmartScan, you can quickly upload receipts and walk away to take care of more important things. Behind the scenes, SmartScan will process the expense data from your receipt and create an expense or automatically attach the receipt to a matching imported credit card expense.

      - -

      What is SmartScan?

      - -

      SmartScan is simple on the outside and complex on the inside. When you SmartScan a receipt, we’ll read the Merchant, Date and Amount of the transaction, create an expense, and add it to your Expensify account automatically. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported expense instead!

      -
        -
      • Expensify accounts come with 25 free SmartScans per month. If you’re an individual user and you need access to unlimited SmartScans, check out the Monthly Subscription!
        • -
      • If your organization is already using Expensify and you belong to a company policy, you’ll have access to unlimited SmartScans by default.
        • -
      - -

      How SmartScan Works:

      - -

      While you’re enjoying your coffee, thinking about what to pack or waiting for your package, we’ll scan the information from the receipt without any more input necessary from you.

      - -
        -
      1. First it uses “optical character recognition” (OCR) on receipt images to extract the text from the image.
        2. -
      2. Then it analyzes that text to determine what portions correspond to the merchant name, amount, currency, and date of the purchase. If it can’t detect a specific currency symbol, it will default to the currency based on your current location. You can also write one in by hand if it’s not noted!
        3. -
      3. Finally, SmartScan consults your list of existing expenses to see if the newly processed receipt image corresponds to a purchase that has already been imported via a credit card connection or CSV spreadsheet. We will then merge these transactions. Different currencies? No problem. We’ll still match ‘em.
        4. -
      - -

      If our OCR technology can’t read the receipt, we will make sure it’s flagged for human review by one of our secure technicians. At the end of the day, nothing beats the human eye for ultimate quality.

      - -

      How-to

      - -

      Use Smartscan to create expenses

      - -

      You can SmartScan receipts from a variety of sources to quickly and easily create expenses.

      - -

      SmartScan physical receipts with the Expensify mobile app

      -
        -
      • Open Expensify app and use the big green camera button to snap a photo. Use 3D touch to make it even faster!
        • -
      • Tap “Add details” to add a description if you want to, or select a custom category or tag.
        • -
      • Put your phone back in your pocket and forget about the receipt entirely.
        • -
      • Toss your receipt in the trash… Or burn it! We’ll take over from here!
        • -
      - -

      SmartScan digital or emailed receipts by emailing them to receipts@expensify.com

      - -

      SmartScan a web receipt with the Expensify Chrome Extension

      - -

      SmartScan runs in the background, so there’s no need to keep the app open. Most SmartScans complete within one hour, but it can take a bit longer—so don’t worry! If we need more information from you, you’ll get a message from Concierge letting you know!

      - -

      Email Receipts to Expensify

      - -

      All receipts in your email inbox, such as airline, rental car, hotel confirmations, online purchases, etc… can be added to your Expensify account simply by forwarding them to receipts@expensify.com. These email receipts will be SmartScanned and an expense will be created for you automatically in Expensify.

      - -

      How to create an expense from a receipt email in your Expensify account:

      - -
        -
      • Directly forward the email to receipts@expensify.com from the email address associated with your Expensify account.
        • -
      • Expensify will immediately SmartScan the receipt email.
        • -
      • You can then find the expense on the Expenses page, either listed under the date of the receipt (if the SmartScan has completed) or under the date that you forwarded the receipt (if the SmartScan has not completed extracting information from the receipt yet).
        • -
      - -

      How to create an expense in Expensify with a receipt email from an email address that is different from your Expensify login:

      - -
        -
      • You’ll want to add this email address as a secondary login to your Expensify account. This way we associate any email receipts sent from this email to receipts@expensify.com and add them to the correct Expensify account.
        • -
      • Once the email address has been added as a secondary login, simply follow the steps above and forward these receipt emails to receipts@expensify.com.
        • -
      - -

      Pro tip: Expensify offer receipt integrations with popular apps such as Uber and Lyft where receipts are automatically imported into your account.

      - -

      How-to: Email Receipts as a Copilot

      - -

      Because emailing receipts to receipts@expensify.com sends the receipts directly to the account tied to the senders email, there is an additional step you need to take when sending receipts as a copilot.

      - -
        -
      1. Click forward on the email and address it to receipts@expensify.com
        2. -
      2. Add the email address of the user whose account you want the receipts to go to in the subject line
        3. -
      3. Click Send
        4. -
      - -

      As long as you are a Copilot for this user, the receipts will be placed in their account and can be found on the Expenses page.

      - -

      Can the Copilot’s Secondary Logins be used to forward receipts?

      -

      Yes! A Copilot can use any of the email addresses tied to their account to forward receipts into the account of the person they’re assisting.

      - -

      FAQ

      - -

      How do I get unlimited SmartScans?

      - -

      If you belong to your company’s policy, you have unlimited SmartScans automatically. However, if you’re an individual user, purchase the Monthly Subscription to gain access to limitless SmartScans.

      - -

      How can I SmartScan multiple receipts as quickly as possible?

      - -

      You can enable Rapid Fire of receipts by tapping the camera icon in the bottom right-hand corner of the screen when taking a picture of your receipts. With Rapid Fire enabled, you can snap away without ever being taken out of the camera to code your receipts.

      - -

      SmartScanned receipts and credit card’s currency are different. Will they still match?

      - -

      Yep! As long as the currency is clear, SmartScan is smart enough to convert to the proper currency (indicated by your policy or your account settings) and merge with the incoming credit card transaction.

      - -

      Will an eReceipt merge with a SmartScan or emailed receipt?

      - -

      Yes! SmartScanned receipts will still merge with and override their eReceipt counterparts.

      - -

      Will Duplicate Detection flag the same receipt even if I accidentally SmartScan it much later?

      - -

      Duplicate Detection will look at all expenses in a single user’s Expensify account regardless of the date it is uploaded. As long as the date and amount match, then we will show a duplicate.

      - -

      Why did Concierge reach out about my SmartScan?

      - -

      When Concierge reaches out it means that your receipt was most likely missing one or more of these: merchant name, purchase date, or total amount. SmartScan requires these three data points to be present because it’s the only way to ensure it’s a traceable, legitimate receipt.

      - -

      Want to know more about Concierge? Meet our friendly AI bot here!

      - -

      Can I disable SmartScan?

      - -

      For users on Track, Submit and Collect policies, you can disable SmartScan in your account settings.

      - -
        -
      1. Disabling SmartScan
        2. -
      2. Log into your account using your preferred web browser,
        3. -
      3. Head to your Settings > Your Account > Preferences > SmartScanning page,
        4. -
      4. Click the green toggle to disable the feature.
        5. -
      - -

      Please note: SmartScan is enabled for all Control plan policies to facilitate the Concierge Receipt Audit feature. You cannot disable SmartScan when defaulted to a Control policy.

      - -
      - - -
      - -
      -
      - - - diff --git a/help/_site/assets/css/styles.css b/help/_site/assets/css/styles.css deleted file mode 100644 index c366079a8610..000000000000 --- a/help/_site/assets/css/styles.css +++ /dev/null @@ -1 +0,0 @@ -@font-face{font-family:GTAmericaExp-Regular;font-weight:100;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Light.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Light.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Light.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:200;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Thin.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Thin.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Thin.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:400;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Regular.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Regular.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Regular.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:500;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:600;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Medium.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Medium.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-Regular;font-weight:700;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Standard-Bold.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Bold.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Bold.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-RgIt;font-weight:400;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Regular-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-MdIt;font-weight:500;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Medium-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExp-BdIt;font-weight:700;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Standard-Bold-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-Rg;font-weight:400;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-RgIt;font-weight:400;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Regular-Italic.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-Bd;font-weight:700;font-style:normal;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold.woff2") format("woff2")}@font-face{font-family:GTAmericaExpMono-BdIt;font-weight:700;font-style:italic;src:url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.eot") format("embedded-opentype"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff") format("woff"),url("https://www.expensify.com/font/GT-America-Exp-Mono-Bold-Italic.woff2") format("woff2")}*{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}strong{font-weight:600}*{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}html{line-height:1}table{border-collapse:collapse;border-spacing:0}caption,th,td{text-align:left;font-weight:400;vertical-align:middle}q,blockquote{quotes:none}q:before,q:after,blockquote:before,blockquote:after{content:none}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}html,body{height:100%;min-height:100%;background:#fff}hr{background:#0185ff;border:none;display:inline-block;width:24px;height:2px;margin:0 0 15px}strong{font-weight:700;font-family:"GTAmericaExp-Bold","Helvetica Neue","Helvetica",Arial,sans-serif}em{font-style:italic}a{color:#0185ff;text-decoration:none}a:hover{color:#006fd6;text-decoration:underline}h1,h2,h3,h4,h5,h6{color:#0b1b34;font-family:"GTAmericaExp-Regular";font-weight:bold;padding-bottom:12px}h2,h3,h4,h5,h6{margin-top:20px}h1{font-size:larger}h2{font-size:large}p{padding-bottom:20px}body,button,input,select,textarea{line-height:1.4;font-weight:400;font-family:"GTAmericaExp-Regular","Helvetica Neue","Helvetica",Arial,sans-serif;font-size:16px;color:#0b1b34}#lhn{height:100%;width:420px;position:fixed;background-color:#fafafa;padding:44px;box-sizing:border-box;border-right-color:#ececec;border-right-width:1px;border-style:solid;overflow-y:scroll;-ms-overflow-style:none;scrollbar-width:none}#lhn ul,#lhn li{list-style:none}#lhn .lhn-header{padding-top:4px}#lhn .header-button{display:none}@media screen and (max-width: 800px){#lhn .header-button{display:block}}#lhn .logo{width:210px}@media screen and (max-width: 800px){#lhn .logo{width:160px;align-content:center;display:block;margin-left:auto;margin-right:auto}}#lhn .lhn-content{padding-top:36px;margin-left:32px}#lhn .caret-icon{left:52px;padding-top:1px;position:absolute;color:#c6c9ca;font-size:larger}@media screen and (max-width: 800px){#lhn .caret-icon{left:32px}}#lhn .caret-icon-vertical{left:48px}@media screen and (max-width: 800px){#lhn .caret-icon-vertical{left:28px}}#lhn .hide{display:none}#lhn::-webkit-scrollbar{display:none}@media screen and (max-width: 1024px){#lhn{width:320px}}@media screen and (max-width: 800px){#lhn{width:100%;padding:24px;height:76px}#lhn.expanded{height:auto}}#content-area{margin-left:420px;padding:52px 68px;box-sizing:border-box}#content-area ul,#content-area ol{margin-left:24px;padding-bottom:20px}#content-area h1.title{font-size:2.25em}@media screen and (max-width: 1024px){#content-area{margin-left:320px}}@media screen and (max-width: 800px){#content-area{margin-left:0;padding-top:80px;padding-left:24px;padding-right:24px;padding-bottom:24px}}.main-navigation-tree ul{padding-left:30px}.main-navigation-tree ul,.main-navigation-tree li{margin-bottom:20px}.main-navigation-tree ul ul,.main-navigation-tree ul li,.main-navigation-tree li ul,.main-navigation-tree li li{margin-top:20px;cursor:pointer}.main-navigation-tree .selected-hub{font-weight:bold}.main-navigation-tree .link{color:#0185ff;cursor:pointer}.main-navigation-tree .link:hover{color:#006fd6;text-decoration:underline}.cards-grid{display:grid;grid-template-columns:auto;row-gap:12px;column-gap:4%;padding-bottom:20px}@media screen and (min-width: 800px){.cards-grid{grid-template-columns:48% 48%}}.card{display:flex;flex-wrap:nowrap;border-radius:15px;border:1px solid #d3d3d3;padding:28px;font-weight:bold}.card .left-icon{display:flex;align-items:center;padding-right:15px}.card .right-icon{display:flex;align-items:center;padding-left:15px}.card .body{display:flex;flex-wrap:nowrap;flex-direction:column;flex-grow:2}.card .description{margin-top:15px} diff --git a/help/_site/assets/images/expensify-help.svg b/help/_site/assets/images/expensify-help.svg deleted file mode 100644 index f81c561eb17a..000000000000 --- a/help/_site/assets/images/expensify-help.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/help/_site/assets/js/main.js b/help/_site/assets/js/main.js deleted file mode 100644 index bb82328f5c0f..000000000000 --- a/help/_site/assets/js/main.js +++ /dev/null @@ -1,34 +0,0 @@ -if (window.tocbot) { - window.tocbot.init({ - // Where to render the table of contents. - tocSelector: '.article-toc', - - // 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, - }); -} - -function openArticle(path) { // eslint-disable-line no-unused-vars - window.location.href = path; -} - -function toggleHeaderMenu() { // eslint-disable-line no-unused-vars - const lhn = document.getElementById('lhn'); - const anguleUpIcon = document.getElementById('angle-up-icon'); - const barsIcon = document.getElementById('bars-icon'); - if (lhn.className === 'expanded') { - // Collapse the LHN in mobile - lhn.className = ''; - barsIcon.classList.remove('hide'); - anguleUpIcon.classList.add('hide'); - } else { - // Expand the LHN in mobile - lhn.className = 'expanded'; - barsIcon.classList.add('hide'); - anguleUpIcon.classList.remove('hide'); - } -} diff --git a/help/_site/feed.xml b/help/_site/feed.xml deleted file mode 100644 index 409c10c78af5..000000000000 --- a/help/_site/feed.xml +++ /dev/null @@ -1 +0,0 @@ -Jekyll2022-07-07T13:38:33-05:00http://localhost:4000/feed.xml \ No newline at end of file diff --git a/help/_site/hubs/request-money.html b/help/_site/hubs/request-money.html deleted file mode 100644 index 7e1e69c63a71..000000000000 --- a/help/_site/hubs/request-money.html +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - Expensify Help - - - - - - - - - - - -
      - -
      - - -
      - - - -
      - - - -
      - - - -
      - -
      -
      - -
      - - - - -
      - -

      - Request Money -

      - - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. Nullam sed vestibulum purus, in auctor libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas dolor metus, - - - - -

      - Request Money -

      - - -
      - - - -
      -
      -
      SmartScan
      -
      -
      - -
      -
      - - - -
      - -
      - - -
      - -
      -
      - - - diff --git a/help/_site/hubs/send-money.html b/help/_site/hubs/send-money.html deleted file mode 100644 index 4986e1a05c1c..000000000000 --- a/help/_site/hubs/send-money.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - Expensify Help - - - - - - - - - - - -
      - -
      - - -
      - - - -
      - - - -
      - - - -
      - -
      -
      - -
      - - - - -
      - -

      - Send Money page -

      - - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. Nullam sed vestibulum purus, in auctor libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas dolor metus, - - - -
      - - -
      - -
      -
      - - - diff --git a/help/_site/index.html b/help/_site/index.html deleted file mode 100644 index b0df590191e6..000000000000 --- a/help/_site/index.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - Expensify Help - - - - - - - - - - - -
      - -
      - - -
      - - - -
      - - - - -
      - - - -
      - -
      -
      - -
      - - - - -
      - - - -
      - - -
      - -
      -
      - - - From c497a8646cd010987d124659b7b0838918bba677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 14:21:41 -0500 Subject: [PATCH 14/39] fix color variables --- docs/_sass/_main.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 7bedce06674e..8cf817f814d3 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -137,7 +137,7 @@ textarea { height: 100%; width: 420px; position: fixed; - background-color: colors.$gray1; + background-color: $color-gray1; padding: 44px; box-sizing: border-box; border-right-color: $color-gray2; @@ -185,7 +185,7 @@ textarea { left: 52px; padding-top: 1px; position: absolute; - color: colors.$gray3; + color: $color-gray3; font-size: larger; @media screen and (max-width: 800px) { From 956e06f7429985d2b2b8706178d399c5f90fa172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 14:33:13 -0500 Subject: [PATCH 15/39] fix back button for article lhn --- docs/_layouts/default.html | 14 ++++++++------ docs/_sass/_main.scss | 4 +++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 61e23b699d65..39e4aab63632 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -17,11 +17,13 @@
      -
      - - +
      +
      + + +
      +
      -
      @@ -35,7 +37,7 @@ {% else %}
      - Back + Back
      In this article @@ -54,7 +56,7 @@ {% if page.lhn_content == nil %} -

      +

      {{ page.name | remove: '.md' | split: "-" | join: " " }}

      {% endif %} diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 8cf817f814d3..70843b863f92 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -178,7 +178,6 @@ textarea { .lhn-content { padding-top: 36px; - margin-left: 32px; } .caret-icon { @@ -284,6 +283,9 @@ textarea { text-decoration: underline; } } + + margin-left: 32px; + margin-bottom: 40px; } .cards-grid { From 4d3adfe9d5c40f7559ce8ba5b95dff37e75164e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 14:50:55 -0500 Subject: [PATCH 16/39] fix spaces for main.scss --- docs/_sass/_main.scss | 417 +++++++++++++++++++++--------------------- 1 file changed, 211 insertions(+), 206 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 70843b863f92..64c4de555474 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -2,40 +2,40 @@ @import 'fonts'; * { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - vertical-align: baseline; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + vertical-align: baseline; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } html { - line-height: 1; + line-height: 1; } table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } caption, th, td { - text-align: left; - font-weight: 400; - vertical-align: middle; + text-align: left; + font-weight: 400; + vertical-align: middle; } q, blockquote { - quotes: none; + quotes: none; - &:before, - &:after { - content: none; - } + &:before, + &:after { + content: none; + } } article, @@ -51,42 +51,42 @@ menu, nav, section, summary { - display: block; + display: block; } html, body { - height: 100%; - min-height: 100%; - background: $color-white; + height: 100%; + min-height: 100%; + background: $color-white; } hr { - background: $color-blue; - border: none; - display: inline-block; - width: 24px; - height: 2px; - margin: 0 0 15px; + background: $color-blue; + border: none; + display: inline-block; + width: 24px; + height: 2px; + margin: 0 0 15px; } strong { - font-weight: 700; - font-family: "GTAmericaExp-Bold", "Helvetica Neue", "Helvetica", Arial, sans-serif; + font-weight: 700; + font-family: "GTAmericaExp-Bold", "Helvetica Neue", "Helvetica", Arial, sans-serif; } em { - font-style: italic; + font-style: italic; } a { - color: $color-blue; - text-decoration: none; + color: $color-blue; + text-decoration: none; - &:hover { - color: $color-blueHover; - text-decoration: underline; - } + &:hover { + color: $color-blueHover; + text-decoration: underline; + } } h1, @@ -95,10 +95,10 @@ h3, h4, h5, h6 { - color: $color-dark; - font-family: "GTAmericaExp-Regular"; - font-weight: bold; - padding-bottom: 12px; + color: $color-dark; + font-family: "GTAmericaExp-Regular"; + font-weight: bold; + padding-bottom: 12px; } h2, @@ -106,19 +106,19 @@ h3, h4, h5, h6 { - margin-top: 20px; + margin-top: 20px; } h1 { - font-size: larger; + font-size: larger; } h2 { - font-size: large; + font-size: large; } p { - padding-bottom: 20px; + padding-bottom: 20px; } body, @@ -126,208 +126,213 @@ button, input, select, textarea { - line-height: 1.4; - font-weight: 400; - font-family: "GTAmericaExp-Regular", "Helvetica Neue", "Helvetica", Arial, sans-serif; - font-size: 16px; - color: $color-dark; + line-height: 1.4; + font-weight: 400; + font-family: "GTAmericaExp-Regular", "Helvetica Neue", "Helvetica", Arial, sans-serif; + font-size: 16px; + color: $color-dark; } #lhn { - height: 100%; - width: 420px; - position: fixed; - background-color: $color-gray1; - padding: 44px; - box-sizing: border-box; - border-right-color: $color-gray2; - border-right-width: 1px; - border-style: solid; - overflow-y:scroll; - -ms-overflow-style: none; /* IE and Edge */ - scrollbar-width: none; /* Firefox */ - - ul, - li { - list-style: none; - } - - .lhn-header { - padding-top: 4px; - } - - .header-button { - display: none; + height: 100%; + width: 420px; + position: fixed; + background-color: $color-gray1; + padding: 44px; + box-sizing: border-box; + border-right-color: $color-gray2; + border-right-width: 1px; + border-style: solid; + overflow-y: scroll; + -ms-overflow-style: none; + /* IE and Edge */ + scrollbar-width: none; + /* Firefox */ - @media screen and (max-width: 800px) { - display: block; + ul, + li { + list-style: none; } - } - .logo { - width: 210px; + .lhn-header { + padding-top: 4px; + } - @media screen and (max-width: 800px) { - width: 160px; - align-content: center; - display: block; - margin-left: auto; - margin-right: auto; + .header-button { + display: none; + + @media screen and (max-width: 800px) { + display: block; + } } - } - .lhn-content { - padding-top: 36px; - } + .logo { + width: 210px; - .caret-icon { - left: 52px; - padding-top: 1px; - position: absolute; - color: $color-gray3; - font-size: larger; + @media screen and (max-width: 800px) { + width: 160px; + align-content: center; + display: block; + margin-left: auto; + margin-right: auto; + } + } - @media screen and (max-width: 800px) { - left: 32px; + .lhn-content { + padding-top: 36px; } - } - .caret-icon-vertical { - left: 48px; + .caret-icon { + left: 52px; + padding-top: 1px; + position: absolute; + color: $color-gray3; + font-size: larger; - @media screen and (max-width: 800px) { - left: 28px; + @media screen and (max-width: 800px) { + left: 32px; + } + } + + .caret-icon-vertical { + left: 48px; + + @media screen and (max-width: 800px) { + left: 28px; + } + } + + .hide { + display: none; } - } - - .hide { - display: none; - } - - &::-webkit-scrollbar { - display: none; - } - - @media screen and (max-width: 1024px) { - width: 320px; - } - @media screen and (max-width: 800px) { - width: 100%; - padding: 24px; - height: 76px; - - &.expanded { - height: auto; + + &::-webkit-scrollbar { + display: none; + } + + @media screen and (max-width: 1024px) { + width: 320px; + } + + @media screen and (max-width: 800px) { + width: 100%; + padding: 24px; + height: 76px; + + &.expanded { + height: auto; + } } - } } #content-area { - ul, - ol { - margin-left: 24px; - padding-bottom: 20px; - } - h1 { - &.title { - font-size: 2.25em; + ul, + ol { + margin-left: 24px; + padding-bottom: 20px; + } + + h1 { + &.title { + font-size: 2.25em; + } + } + + /* Same as the width of the lhn */ + margin-left: 420px; + padding: 52px 68px; + box-sizing: border-box; + + @media screen and (max-width: 1024px) { + margin-left: 320px; + } + + @media screen and (max-width: 800px) { + margin-left: 0; + padding-top: 80px; + padding-left: 24px; + padding-right: 24px; + padding-bottom: 24px; } - } - - /* Same as the width of the lhn */ - margin-left: 420px; - padding: 52px 68px; - box-sizing: border-box; - - @media screen and (max-width: 1024px) { - margin-left: 320px; - } - @media screen and (max-width: 800px) { - margin-left: 0; - padding-top: 80px; - padding-left: 24px; - padding-right: 24px; - padding-bottom: 24px; - } } .main-navigation-tree { - ul { - padding-left: 30px; - } - - ul, - li { - margin-bottom: 20px; + ul { + padding-left: 30px; + } - /* Apply recursive style to add a margin to the nested items */ ul, li { - margin-top: 20px; - cursor: pointer; + margin-bottom: 20px; + + /* Apply recursive style to add a margin to the nested items */ + ul, + li { + margin-top: 20px; + cursor: pointer; + } } - } - .selected-hub { - font-weight: bold; - } + .selected-hub { + font-weight: bold; + } - .link { - color: $color-blue; - cursor: pointer; + .link { + color: $color-blue; + cursor: pointer; - &:hover { - color: $color-blueHover; - text-decoration: underline; + &:hover { + color: $color-blueHover; + text-decoration: underline; + } } - } - margin-left: 32px; - margin-bottom: 40px; + margin-left: 32px; + margin-bottom: 40px; } .cards-grid { - display: grid; - grid-template-columns: auto; - row-gap: 12px; - column-gap: 4%; - padding-bottom: 20px; - - @media screen and (min-width: 800px) { - grid-template-columns: 48% 48%; - } + display: grid; + grid-template-columns: auto; + row-gap: 12px; + column-gap: 4%; + padding-bottom: 20px; + + @media screen and (min-width: 800px) { + grid-template-columns: 48% 48%; + } } .card { - display: flex; - flex-wrap: nowrap; - border-radius: 15px; - border: 1px solid lightgray; - padding: 28px; - font-weight: bold; - - .left-icon { display: flex; - align-items: center; - padding-right: 15px; - } + flex-wrap: nowrap; + border-radius: 15px; + border: 1px solid lightgray; + padding: 28px; + font-weight: bold; - .right-icon { - display: flex; - align-items: center; - padding-left: 15px; - } + .left-icon { + display: flex; + align-items: center; + padding-right: 15px; + } - .body { - display: flex; - flex-wrap: nowrap; - flex-direction: column; - flex-grow: 2; - } + .right-icon { + display: flex; + align-items: center; + padding-left: 15px; + } - .description { - margin-top: 15px; - } -} + .body { + display: flex; + flex-wrap: nowrap; + flex-direction: column; + flex-grow: 2; + } + + .description { + margin-top: 15px; + } +} \ No newline at end of file From d2bdf78c3939f9a397eb6f8fc13711b7238e8907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 15:09:21 -0500 Subject: [PATCH 17/39] fix toc in lhn styles --- docs/_includes/home-navigation-tree.html | 2 +- .../_includes/send-money-navigation-tree.html | 2 +- docs/_sass/_main.scss | 39 +++++++++---------- docs/assets/js/main.js | 10 +++++ 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/docs/_includes/home-navigation-tree.html b/docs/_includes/home-navigation-tree.html index 969f93abfacc..4fce611a1561 100644 --- a/docs/_includes/home-navigation-tree.html +++ b/docs/_includes/home-navigation-tree.html @@ -1,4 +1,4 @@ -
        +
        • Home
          • diff --git a/docs/_includes/send-money-navigation-tree.html b/docs/_includes/send-money-navigation-tree.html index e9a0be2f6da6..4abf3a06a5e8 100644 --- a/docs/_includes/send-money-navigation-tree.html +++ b/docs/_includes/send-money-navigation-tree.html @@ -1,4 +1,4 @@ -
            +
            • Home
              • diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 64c4de555474..b7c8f964fe90 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -99,13 +99,6 @@ h6 { font-family: "GTAmericaExp-Regular"; font-weight: bold; padding-bottom: 12px; -} - -h2, -h3, -h4, -h5, -h6 { margin-top: 20px; } @@ -226,7 +219,6 @@ textarea { } #content-area { - ul, ol { margin-left: 24px; @@ -258,7 +250,22 @@ textarea { } .main-navigation-tree { + .link { + color: $color-blue; + cursor: pointer; + &:hover { + color: $color-blueHover; + text-decoration: underline; + } + } + + margin-left: 32px; + margin-bottom: 40px; +} + +.lhn-items { + ol, ul { padding-left: 30px; } @@ -277,20 +284,12 @@ textarea { .selected-hub { font-weight: bold; + color: $color-dark; } +} - .link { - color: $color-blue; - cursor: pointer; - - &:hover { - color: $color-blueHover; - text-decoration: underline; - } - } - - margin-left: 32px; - margin-bottom: 40px; +.article-toc { + margin-top: 20px; } .cards-grid { diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index bb82328f5c0f..8f414700388f 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -9,6 +9,16 @@ if (window.tocbot) { // 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 links. + linkClass: 'link', + + // Class to add to active links, + // the link corresponding to the top most heading on the page. + activeLinkClass: 'selected-hub', }); } From b062b1e21cb164702b0469591d5ddf6b1f0595f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 15:15:53 -0500 Subject: [PATCH 18/39] update html files with latest changes --- docs/Gemfile.lock | 1 + docs/README.md | 4 ++-- .../_includes/request-money-navigation-tree.html | 6 +++--- docs/hubs/request-money.html | 16 +++++++++------- docs/hubs/send-money.html | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index a5067a1e8b1a..276ffcdc3367 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -254,6 +254,7 @@ GEM PLATFORMS x86_64-darwin-20 + x86_64-darwin-21 DEPENDENCIES github-pages diff --git a/docs/README.md b/docs/README.md index b9b234ae74e8..11342d98ae3c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -58,7 +58,7 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt -
              +
              @@ -101,7 +101,7 @@ Where `id` is an arbitrary value that will help us to anchor this title to the L If it's required, you can add a new row of Card buttons with the following HTML block: ```html -
              +
              ``` diff --git a/docs/_includes/request-money-navigation-tree.html b/docs/_includes/request-money-navigation-tree.html index 297dcaa3b6dd..28f6f57d9182 100644 --- a/docs/_includes/request-money-navigation-tree.html +++ b/docs/_includes/request-money-navigation-tree.html @@ -1,4 +1,4 @@ -
                +
                • Home
                  • @@ -7,7 +7,7 @@ Send Money
                • - + Request Money
                    @@ -16,7 +16,7 @@ --> -
                  • Request Money +
                  • Set up and invite
                    • SmartScan
                      • diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html index 41f9163ab0b3..de433af02e5b 100644 --- a/docs/hubs/request-money.html +++ b/docs/hubs/request-money.html @@ -3,22 +3,24 @@ lhn_content: 'request-money' --- -

                      - Request Money +

                      + Request money

                      - -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. Nullam sed vestibulum purus, in auctor libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas dolor metus, +

                      + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. +

                      -

                      - Request Money +

                      + Set up and invite

                      -
                      +
                      diff --git a/docs/hubs/send-money.html b/docs/hubs/send-money.html index 94079fe3b8ca..63adef3ccf77 100644 --- a/docs/hubs/send-money.html +++ b/docs/hubs/send-money.html @@ -3,7 +3,7 @@ lhn_content: 'send-money' --- -

                      +

                      Send Money page

                      From f239e14817477aa44df34f9d21e859f38a8194da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Thu, 7 Jul 2022 15:18:45 -0500 Subject: [PATCH 19/39] update titles --- docs/_includes/home-navigation-tree.html | 4 ++-- docs/_includes/request-money-navigation-tree.html | 4 ++-- docs/_includes/send-money-navigation-tree.html | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/_includes/home-navigation-tree.html b/docs/_includes/home-navigation-tree.html index 4fce611a1561..029c83cc9740 100644 --- a/docs/_includes/home-navigation-tree.html +++ b/docs/_includes/home-navigation-tree.html @@ -4,10 +4,10 @@
                    • - Send Money + Send money
                    • - Request Money + Request money
                    diff --git a/docs/_includes/request-money-navigation-tree.html b/docs/_includes/request-money-navigation-tree.html index 28f6f57d9182..a5ac210deb89 100644 --- a/docs/_includes/request-money-navigation-tree.html +++ b/docs/_includes/request-money-navigation-tree.html @@ -4,11 +4,11 @@
                  • - Send Money + Send money
                  • - Request Money + Request money
                      -
                      +
                      {% case page.lhn_content %} {% when "homepage" %} {% include home-navigation-tree.html %} diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index f3b4d300ad6b..254ce9746411 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -13,6 +13,11 @@ html { line-height: 1; + overflow: hidden; +} + +body { + overflow: auto; } table { @@ -127,8 +132,6 @@ textarea { } #lhn { - height: 100%; - width: 420px; position: fixed; background-color: $color-gray1; padding: 44px; @@ -136,11 +139,16 @@ textarea { border-right-color: $color-gray2; border-right-width: 1px; border-style: solid; + width: 420px; + height: 100%; overflow-y: scroll; -ms-overflow-style: none; /* IE and Edge */ scrollbar-width: none; /* Firefox */ + &::-webkit-scrollbar { + display: none; + } ul, li { @@ -149,30 +157,48 @@ textarea { .lhn-header { padding-top: 4px; - } - .header-button { - display: none; + .header-button { + display: none; - @media screen and (max-width: 800px) { - display: block; + @media screen and (max-width: 800px) { + display: block; + } } - } - .logo { - width: 210px; + .logo { + width: 210px; - @media screen and (max-width: 800px) { - width: 160px; - align-content: center; - display: block; - margin-left: auto; - margin-right: auto; + @media screen and (max-width: 800px) { + width: 160px; + align-content: center; + display: block; + margin-left: auto; + margin-right: auto; + } } } - .lhn-content { + #lhn-content { + height: 100%; padding-top: 36px; + height: 100%; + overflow-y: scroll; + -ms-overflow-style: none; + /* IE and Edge */ + scrollbar-width: none; + /* Firefox */ + &::-webkit-scrollbar { + display: none; + } + + @media screen and (max-width: 800px) { + display: none; + + &.expanded { + display: block; + } + } } .caret-icon { @@ -197,10 +223,7 @@ textarea { .hide { display: none; - } - - &::-webkit-scrollbar { - display: none; + position: fixed; } @media screen and (max-width: 1024px) { @@ -210,7 +233,8 @@ textarea { @media screen and (max-width: 800px) { width: 100%; padding: 24px; - height: 76px; + height: auto; + overflow-y: unset; &.expanded { height: 100%; @@ -219,6 +243,12 @@ textarea { } #content-area { + + /* Same as the width of the lhn */ + margin-left: 420px; + padding: 52px 68px; + box-sizing: border-box; + ul, ol { margin-left: 24px; @@ -231,11 +261,6 @@ textarea { } } - /* Same as the width of the lhn */ - margin-left: 420px; - padding: 52px 68px; - box-sizing: border-box; - @media screen and (max-width: 1024px) { margin-left: 320px; } @@ -250,6 +275,9 @@ textarea { } .main-navigation-tree { + margin-left: 32px; + margin-bottom: 40px; + .link { color: $color-blue; cursor: pointer; @@ -259,12 +287,10 @@ textarea { text-decoration: underline; } } - - margin-left: 32px; - margin-bottom: 40px; } .lhn-items { + ol, ul { padding-left: 30px; diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index f6e12e438bba..e89082ddfd82 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -5,16 +5,19 @@ function openArticle(path) { // eslint-disable-line no-unused-vars function toggleHeaderMenu() { // eslint-disable-line no-unused-vars const lhn = document.getElementById('lhn'); + const lhnContent = document.getElementById('lhn-content'); const anguleUpIcon = document.getElementById('angle-up-icon'); const barsIcon = document.getElementById('bars-icon'); - if (lhn.className === 'expanded') { + if (lhnContent.className === 'expanded') { // Collapse the LHN in mobile lhn.className = ''; + lhnContent.className = ''; barsIcon.classList.remove('hide'); anguleUpIcon.classList.add('hide'); } else { // Expand the LHN in mobile lhn.className = 'expanded'; + lhnContent.className = 'expanded'; barsIcon.classList.add('hide'); anguleUpIcon.classList.remove('hide'); } From 4434aac9f5b6169f0754bc8c37af802864b1fcf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Fri, 8 Jul 2022 12:26:39 -0500 Subject: [PATCH 22/39] clean scroll logic for lhn --- docs/_sass/_main.scss | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 254ce9746411..e10812ff044f 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -132,23 +132,14 @@ textarea { } #lhn { + width: 420px; + height: 100%; position: fixed; background-color: $color-gray1; - padding: 44px; box-sizing: border-box; border-right-color: $color-gray2; border-right-width: 1px; border-style: solid; - width: 420px; - height: 100%; - overflow-y: scroll; - -ms-overflow-style: none; - /* IE and Edge */ - scrollbar-width: none; - /* Firefox */ - &::-webkit-scrollbar { - display: none; - } ul, li { @@ -156,7 +147,7 @@ textarea { } .lhn-header { - padding-top: 4px; + padding: 44px; .header-button { display: none; @@ -180,10 +171,9 @@ textarea { } #lhn-content { - height: 100%; - padding-top: 36px; - height: 100%; - overflow-y: scroll; + height: 80%; + padding: 44px; + overflow: auto; -ms-overflow-style: none; /* IE and Edge */ scrollbar-width: none; @@ -202,9 +192,9 @@ textarea { } .caret-icon { - left: 52px; + left: -24px; padding-top: 1px; - position: absolute; + position: relative; color: $color-gray3; font-size: larger; @@ -214,11 +204,7 @@ textarea { } .caret-icon-vertical { - left: 48px; - - @media screen and (max-width: 800px) { - left: 28px; - } + left: -28px; } .hide { @@ -232,13 +218,6 @@ textarea { @media screen and (max-width: 800px) { width: 100%; - padding: 24px; - height: auto; - overflow-y: unset; - - &.expanded { - height: 100%; - } } } From 98b4c02d4398d94ad9e2fb6c717f172d9447a05e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Fri, 8 Jul 2022 13:08:19 -0500 Subject: [PATCH 23/39] fix position of back button --- docs/_includes/home-navigation-tree.html | 2 +- .../_includes/send-money-navigation-tree.html | 2 +- docs/_layouts/default.html | 6 +-- docs/_sass/_main.scss | 38 ++++++++++--------- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/docs/_includes/home-navigation-tree.html b/docs/_includes/home-navigation-tree.html index 029c83cc9740..af0416f1f323 100644 --- a/docs/_includes/home-navigation-tree.html +++ b/docs/_includes/home-navigation-tree.html @@ -1,4 +1,4 @@ -
                        +
                        • Home
                          • diff --git a/docs/_includes/send-money-navigation-tree.html b/docs/_includes/send-money-navigation-tree.html index 7268e59c5f51..d9e9f7490916 100644 --- a/docs/_includes/send-money-navigation-tree.html +++ b/docs/_includes/send-money-navigation-tree.html @@ -1,4 +1,4 @@ -
                            +
                            • Home
                              • diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index e54caaf80c85..835e831154eb 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -35,9 +35,10 @@ {% when "send-money" %} {% include send-money-navigation-tree.html %} {% else %} -
                              +
                              +
                              - Back + Back
                              In this article @@ -62,7 +63,6 @@

                              {% endif %}
                              - {{ content }}
                              diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index e10812ff044f..c74cc6bf17e8 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -134,7 +134,7 @@ textarea { #lhn { width: 420px; height: 100%; - position: fixed; + position: absolute; background-color: $color-gray1; box-sizing: border-box; border-right-color: $color-gray2; @@ -171,8 +171,10 @@ textarea { } #lhn-content { - height: 80%; - padding: 44px; + height: calc(100% - 150px); + padding-right: 24px; + padding-bottom: 44px; + padding-left: 44px; overflow: auto; -ms-overflow-style: none; /* IE and Edge */ @@ -182,6 +184,10 @@ textarea { display: none; } + .back-button { + margin-bottom: 44px; + } + @media screen and (max-width: 800px) { display: none; @@ -192,14 +198,14 @@ textarea { } .caret-icon { - left: -24px; - padding-top: 1px; - position: relative; color: $color-gray3; font-size: larger; + display: inline; + padding-left: 8px; + padding-right: 12px; @media screen and (max-width: 800px) { - left: 32px; + // left: 32px; } } @@ -253,18 +259,14 @@ textarea { } } -.main-navigation-tree { - margin-left: 32px; - margin-bottom: 40px; - - .link { - color: $color-blue; - cursor: pointer; +.link { + display: inline; + color: $color-blue; + cursor: pointer; - &:hover { - color: $color-blueHover; - text-decoration: underline; - } + &:hover { + color: $color-blueHover; + text-decoration: underline; } } From 61a9adfe21b540df2f14c8b3d1bb30cffcef45dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Fri, 8 Jul 2022 13:35:14 -0500 Subject: [PATCH 24/39] fix logo in hub content --- docs/_sass/_main.scss | 72 ++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index c74cc6bf17e8..ebf1c286352e 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -141,6 +141,19 @@ textarea { border-right-width: 1px; border-style: solid; + @media screen and (max-width: 1024px) { + width: 320px; + } + + @media screen and (max-width: 800px) { + width: 100%; + height: auto; + + &.expanded { + height: 100%; + } + } + ul, li { list-style: none; @@ -149,7 +162,12 @@ textarea { .lhn-header { padding: 44px; + @media screen and (max-width: 800px) { + padding: 24px; + } + .header-button { + position: absolute; display: none; @media screen and (max-width: 800px) { @@ -184,24 +202,32 @@ textarea { display: none; } - .back-button { - margin-bottom: 44px; - } - @media screen and (max-width: 800px) { + padding-right: 24px; + padding-bottom: 24px; + padding-left: 24px; display: none; &.expanded { display: block; } } + + .back-button { + margin-bottom: 44px; + padding-left: 8px; + + @media screen and (max-width: 800px) { + padding-left: 0; + padding-top: 20px; + } + } } .caret-icon { color: $color-gray3; font-size: larger; display: inline; - padding-left: 8px; padding-right: 12px; @media screen and (max-width: 800px) { @@ -209,22 +235,10 @@ textarea { } } - .caret-icon-vertical { - left: -28px; - } - .hide { display: none; position: fixed; } - - @media screen and (max-width: 1024px) { - width: 320px; - } - - @media screen and (max-width: 800px) { - width: 100%; - } } #content-area { @@ -234,18 +248,6 @@ textarea { padding: 52px 68px; box-sizing: border-box; - ul, - ol { - margin-left: 24px; - padding-bottom: 20px; - } - - h1 { - &.title { - font-size: 2.25em; - } - } - @media screen and (max-width: 1024px) { margin-left: 320px; } @@ -257,6 +259,18 @@ textarea { padding-right: 24px; padding-bottom: 24px; } + + ul, + ol { + margin-left: 24px; + padding-bottom: 20px; + } + + h1 { + &.title { + font-size: 2.25em; + } + } } .link { From b791176f673838939e7abb670f63d484aa46d316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Fri, 8 Jul 2022 17:11:33 -0500 Subject: [PATCH 25/39] fix icons in lhn --- docs/_includes/home-navigation-tree.html | 2 +- .../request-money-navigation-tree.html | 36 +++++++++++++++++-- .../_includes/send-money-navigation-tree.html | 2 +- docs/_layouts/default.html | 2 +- docs/_sass/_main.scss | 28 +++++++++++---- 5 files changed, 59 insertions(+), 11 deletions(-) diff --git a/docs/_includes/home-navigation-tree.html b/docs/_includes/home-navigation-tree.html index af0416f1f323..c8104e72d996 100644 --- a/docs/_includes/home-navigation-tree.html +++ b/docs/_includes/home-navigation-tree.html @@ -1,5 +1,5 @@
                                -
                              • +
                              • Home
                              • diff --git a/docs/_includes/request-money-navigation-tree.html b/docs/_includes/request-money-navigation-tree.html index a5ac210deb89..ad7859899f5b 100644 --- a/docs/_includes/request-money-navigation-tree.html +++ b/docs/_includes/request-money-navigation-tree.html @@ -1,5 +1,5 @@ -
                                  -
                                • +
                                    +
                                  • Home
                                  • @@ -19,6 +19,38 @@
                                  • Set up and invite +
                                    • +
                                  • Request Money1 + +
                                    • +
                                  • Request Money2 + diff --git a/docs/_includes/send-money-navigation-tree.html b/docs/_includes/send-money-navigation-tree.html index d9e9f7490916..540b1f6c4217 100644 --- a/docs/_includes/send-money-navigation-tree.html +++ b/docs/_includes/send-money-navigation-tree.html @@ -1,5 +1,5 @@
                                      -
                                    • +
                                    • Home
                                    • diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 835e831154eb..f1253afd9f58 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -36,7 +36,7 @@ {% include send-money-navigation-tree.html %} {% else %}
                                      - +
                                      Back
                                      diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index ebf1c286352e..cc82ba16f839 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -221,6 +221,14 @@ textarea { padding-left: 0; padding-top: 20px; } + + i { + padding-right: 12px; + } + } + + .home-link { + padding-left: 38px; } } @@ -228,11 +236,6 @@ textarea { color: $color-gray3; font-size: larger; display: inline; - padding-right: 12px; - - @media screen and (max-width: 800px) { - // left: 32px; - } } .hide { @@ -288,7 +291,7 @@ textarea { ol, ul { - padding-left: 30px; + padding-left: 32px; } ul, @@ -303,6 +306,19 @@ textarea { } } + i { + padding-right: 12px; + padding-left: 12px; + } + + .nested-treeview { + margin-left: 40px; + } + + .caret-icon-vertical { + padding-left: 8px; + } + .selected-hub { font-weight: bold; color: $color-dark; From 92189a2b23c194e1f4facfd7d426cd1c4c58e398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 9 Jul 2022 09:38:02 -0500 Subject: [PATCH 26/39] fix scroll for toc library --- docs/_layouts/default.html | 5 +++-- docs/_sass/_main.scss | 7 +------ docs/assets/js/main.js | 7 ++++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index f1253afd9f58..758ba390bdbb 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -7,9 +7,10 @@ - + + - + diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index cc82ba16f839..be26184b741d 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -13,11 +13,6 @@ html { line-height: 1; - overflow: hidden; -} - -body { - overflow: auto; } table { @@ -134,7 +129,7 @@ textarea { #lhn { width: 420px; height: 100%; - position: absolute; + position: fixed; background-color: $color-gray1; box-sizing: border-box; border-right-color: $color-gray2; diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index e89082ddfd82..ef60e8c8eed3 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -45,9 +45,10 @@ if (window.tocbot) { // the link corresponding to the top most heading on the page. activeLinkClass: 'selected-hub', - // Only takes affect when `tocSelector` is scrolling, - // keep the toc scroll position in sync with the content. - disableTocScrollSync: 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, From 1703ab2c379441815663bc179af13021afc16837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 9 Jul 2022 09:41:15 -0500 Subject: [PATCH 27/39] fix navigate back in mobile --- 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 758ba390bdbb..01e7dfa6ec6c 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -36,7 +36,7 @@ {% when "send-money" %} {% include send-money-navigation-tree.html %} {% else %} -
                                      +
                                      Back diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index ef60e8c8eed3..590a77bc9223 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -23,6 +23,11 @@ function toggleHeaderMenu() { // eslint-disable-line no-unused-vars } } +function navigateBack() { // eslint-disable-line no-unused-vars + window.history.back(); + toggleHeaderMenu(); +} + if (window.tocbot) { window.tocbot.init({ // Where to render the table of contents. From 70eca6981f88646f18a4a75b72903895bb6a072e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 9 Jul 2022 09:58:01 -0500 Subject: [PATCH 28/39] reorganize lhn files --- .../{home-navigation-tree.html => home-lhn.html} | 0 ...-money-navigation-tree.html => request-money-lhn.html} | 0 ...end-money-navigation-tree.html => send-money-lhn.html} | 0 docs/_layouts/default.html | 6 +++--- docs/_sass/_main.scss | 8 ++++---- 5 files changed, 7 insertions(+), 7 deletions(-) rename docs/_includes/{home-navigation-tree.html => home-lhn.html} (100%) rename docs/_includes/{request-money-navigation-tree.html => request-money-lhn.html} (100%) rename docs/_includes/{send-money-navigation-tree.html => send-money-lhn.html} (100%) diff --git a/docs/_includes/home-navigation-tree.html b/docs/_includes/home-lhn.html similarity index 100% rename from docs/_includes/home-navigation-tree.html rename to docs/_includes/home-lhn.html diff --git a/docs/_includes/request-money-navigation-tree.html b/docs/_includes/request-money-lhn.html similarity index 100% rename from docs/_includes/request-money-navigation-tree.html rename to docs/_includes/request-money-lhn.html diff --git a/docs/_includes/send-money-navigation-tree.html b/docs/_includes/send-money-lhn.html similarity index 100% rename from docs/_includes/send-money-navigation-tree.html rename to docs/_includes/send-money-lhn.html diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 01e7dfa6ec6c..58ee51b04502 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -30,11 +30,11 @@
                                      {% case page.lhn_content %} {% when "homepage" %} - {% include home-navigation-tree.html %} + {% include home-lhn.html %} {% when "request-money" %} - {% include request-money-navigation-tree.html %} + {% include request-money-lhn.html %} {% when "send-money" %} - {% include send-money-navigation-tree.html %} + {% include send-money-lhn.html %} {% else %}
                                      diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index be26184b741d..6c31013a0a3b 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -225,6 +225,10 @@ textarea { .home-link { padding-left: 38px; } + + .article-toc { + margin-top: 20px; + } } .caret-icon { @@ -320,10 +324,6 @@ textarea { } } -.article-toc { - margin-top: 20px; -} - .cards-grid { display: grid; grid-template-columns: auto; From 663448f8e454984022b10fd7a1dcc6b143b483c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 9 Jul 2022 16:03:04 -0500 Subject: [PATCH 29/39] clean css code and fix caret icons glitch --- docs/_includes/home-lhn.html | 4 +- docs/_includes/request-money-lhn.html | 12 ++-- docs/_includes/send-money-lhn.html | 12 ++-- docs/_layouts/default.html | 8 +-- docs/_sass/_main.scss | 81 +++++++++++++-------------- 5 files changed, 60 insertions(+), 57 deletions(-) diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index c8104e72d996..098bf58a32d7 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -2,11 +2,11 @@
                                    • Home
                                      • -
                                    • +
                                    • Send money
                                      • -
                                    • +
                                    • Request money
                                      • diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html index ad7859899f5b..e60fdd0932de 100644 --- a/docs/_includes/request-money-lhn.html +++ b/docs/_includes/request-money-lhn.html @@ -3,12 +3,16 @@ Home
                                    • - - Send money +
                                      + + Send money +
                                    • - - Request money +
                                      + + Request money +
                                        -
                                        +
                                        @@ -101,7 +101,7 @@ Where `id` is an arbitrary value that will help us to anchor this title to the L If it's required, you can add a new row of Card buttons with the following HTML block: ```html -
                                        +
                                        ``` @@ -110,7 +110,7 @@ If it's required, you can add a new row of Card buttons with the following HTML A card button is the box that contains the article title and the caret right icon `>`. It navigates to the article when it's pressed. -In order to add a new Card button in the respective hub page ([send-money/index.html](https://github.com/Expensify/App/blob/e6cea38ef22f83ae4730a34a9281d8962388dff8/docs/articles/send-money/index.html) or [request-money/index.html](https://github.com/Expensify/App/blob/e6cea38ef22f83ae4730a34a9281d8962388dff8/docs/articles/request-money/index.html)) just copy and pase the following Card element: +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
                                        @@ -147,7 +147,7 @@ There are 2 main components in the LHN page associated with the hub you're addin ### Add a new Stage title anchor (optional) -Just add copy and paste the following HTML block in the corresponding navigation tree file (either for [Request Money](https://github.com/Expensify/App/blob/e6cea38ef22f83ae4730a34a9281d8962388dff8/docs/_includes/request-money-navigation-tree.html) or [Send Money](https://github.com/Expensify/App/blob/e6cea38ef22f83ae4730a34a9281d8962388dff8/docs/_includes/send-money-navigation-tree.html)): +Just add copy and paste the following HTML block in the corresponding navigation tree file (either for [Request Money](https://github.com/Expensify/App/blob/main/docs/_includes/request-money-lhn.html) or [Send Money](https://github.com/Expensify/App/blob/main/docs/_includes/send-money-lhn.html)): ```
                                      • Request Money diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html index 81fc7dd7fd2f..d1b2e79e79ad 100644 --- a/docs/_includes/request-money-lhn.html +++ b/docs/_includes/request-money-lhn.html @@ -16,45 +16,13 @@
                                          -
                                        • Set up and invite +
                                        • Request money -
                                          • -
                                        • Request Money1 - -
                                          • -
                                        • Request Money2 - diff --git a/docs/_includes/send-money-lhn.html b/docs/_includes/send-money-lhn.html index 26aa4076307a..da24a9fe66e1 100644 --- a/docs/_includes/send-money-lhn.html +++ b/docs/_includes/send-money-lhn.html @@ -10,7 +10,7 @@
                                          • diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 743aae999c99..4ecda4d73156 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -316,7 +316,7 @@ textarea { } } -.cards-grid { +.cards-group { display: grid; grid-template-columns: auto; row-gap: 12px; diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html index f4944ea9a0ee..8a809e964a0f 100644 --- a/docs/hubs/request-money.html +++ b/docs/hubs/request-money.html @@ -12,15 +12,15 @@

                                          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices.

                                          - + -

                                          - Set up and invite +

                                          + Request Money

                                          - -
                                          + +
                                          diff --git a/docs/hubs/send-money.html b/docs/hubs/send-money.html index 63adef3ccf77..859cdd242fe1 100644 --- a/docs/hubs/send-money.html +++ b/docs/hubs/send-money.html @@ -10,4 +10,4 @@

                                          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur hendrerit euismod dui, nec fermentum urna porta ultrices. Nullam sed vestibulum purus, in auctor libero. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas dolor metus, - + From 47b5ba6a91e290cbad701963b98d6bafbf9ce419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 9 Jul 2022 17:14:03 -0500 Subject: [PATCH 33/39] fix lhn height for mobile web --- docs/_sass/_main.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 4ecda4d73156..9912c9a82c1f 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -175,6 +175,7 @@ textarea { } @media screen and (max-width: 800px) { + height: 100%; padding-right: 24px; padding-bottom: 24px; padding-left: 24px; From 4f58a1fb1e459b1a98fe6a189eaca85b81d8d0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Sat, 9 Jul 2022 17:15:37 -0500 Subject: [PATCH 34/39] last minor fix to lhn --- docs/_sass/_main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 9912c9a82c1f..e2ea97374b25 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -175,7 +175,7 @@ textarea { } @media screen and (max-width: 800px) { - height: 100%; + height: calc(100% - 100px); padding-right: 24px; padding-bottom: 24px; padding-left: 24px; From c0c7703e559de71c32ed589fb65efe284088a67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Mon, 11 Jul 2022 14:17:58 -0500 Subject: [PATCH 35/39] change cursor to a pointer so that it indicates the card is clickable --- docs/_sass/_main.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index e2ea97374b25..b6d83ebb402a 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -336,6 +336,7 @@ textarea { border: 1px solid lightgray; padding: 28px; font-weight: bold; + cursor: pointer; .left-icon { display: flex; From 5ec2ca45b2ff6efecebeafc1bc7c78e61c630a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Mon, 11 Jul 2022 14:47:14 -0500 Subject: [PATCH 36/39] make caret icon also clickable --- docs/README.md | 6 +++--- docs/_includes/home-lhn.html | 16 ++++++++++------ docs/_includes/request-money-lhn.html | 10 +++++----- docs/_includes/send-money-lhn.html | 6 +++--- docs/_sass/_main.scss | 15 ++++++++++----- docs/assets/js/main.js | 2 +- docs/hubs/request-money.html | 2 +- 7 files changed, 33 insertions(+), 24 deletions(-) diff --git a/docs/README.md b/docs/README.md index babd8743be39..c50c8234aae7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -62,7 +62,7 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt -
                                          +
                                          SmartScan
                                          @@ -71,7 +71,7 @@ There are 3 main components in the hub page: 1. Stage title, 2. Row of Card butt
                                          -
                                          +
                                          Another Article
                                          @@ -113,7 +113,7 @@ 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
                                          diff --git a/docs/_includes/home-lhn.html b/docs/_includes/home-lhn.html index 2bba687ad2fd..18da808f77be 100644 --- a/docs/_includes/home-lhn.html +++ b/docs/_includes/home-lhn.html @@ -2,12 +2,16 @@
                                        • Home
                                          • -
                                        • - - Send money +
                                        • +
                                          + +
                                          Send money
                                          +
                                          • -
                                        • - - Request money +
                                        • +
                                          + +
                                          Request money
                                          +

                                        diff --git a/docs/_includes/request-money-lhn.html b/docs/_includes/request-money-lhn.html index d1b2e79e79ad..aa5694af0df0 100644 --- a/docs/_includes/request-money-lhn.html +++ b/docs/_includes/request-money-lhn.html @@ -3,15 +3,15 @@ Home
                                      • -
                                        +
                                        - Send money + Send money
                                      • -
                                        +
                                        - Request money + Request money
                                          @@ -23,7 +23,7 @@
                                        • Request money
                                          • diff --git a/docs/_includes/send-money-lhn.html b/docs/_includes/send-money-lhn.html index da24a9fe66e1..706ae25a31d2 100644 --- a/docs/_includes/send-money-lhn.html +++ b/docs/_includes/send-money-lhn.html @@ -3,9 +3,9 @@ Home
                                        • -
                                          +
                                          - Send money + Send money
                                            @@ -15,7 +15,7 @@
                                        • -
                                          +
                                          Request money
                                          diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index b6d83ebb402a..709790289b29 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -223,6 +223,16 @@ textarea { .icon-with-link { display: grid; grid-template-columns: 40px auto; + cursor: pointer; + + &.selected { + cursor: auto; + + span { + font-weight: bold; + color: $color-dark; + } + } } .icon { @@ -307,11 +317,6 @@ textarea { margin-left: 40px; } - .selected-hub { - font-weight: bold; - color: $color-dark; - } - .home-link { padding-left: 40px; } diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index ba83cb778206..634ebbc5dcee 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -1,5 +1,5 @@ -function openArticle(path) { // eslint-disable-line no-unused-vars +function navigateTo(path) { // eslint-disable-line no-unused-vars window.location.href = path; } diff --git a/docs/hubs/request-money.html b/docs/hubs/request-money.html index 8a809e964a0f..e08699537aaf 100644 --- a/docs/hubs/request-money.html +++ b/docs/hubs/request-money.html @@ -24,7 +24,7 @@

                                          -
                                          +
                                          SmartScan
                                          From b369ec2c044d47b5d7947d1628e0e7c957c8a59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Mon, 11 Jul 2022 14:57:19 -0500 Subject: [PATCH 37/39] fix styles for card button in hub pages --- docs/_sass/_main.scss | 37 +++++++++++++++++++++---------------- docs/assets/js/main.js | 2 +- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index 709790289b29..f923d792c6c3 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -234,21 +234,6 @@ textarea { } } } - - .icon { - color: $color-gray3; - font-size: larger; - display: inline; - - &.fa-angle-right { - padding-left: 4px; - } - } - - .hide { - display: none; - position: fixed; - } } #content-area { @@ -317,6 +302,11 @@ textarea { margin-left: 40px; } + .selected-article { + font-weight: bold; + color: $color-dark; + } + .home-link { padding-left: 40px; } @@ -338,7 +328,7 @@ textarea { display: flex; flex-wrap: nowrap; border-radius: 15px; - border: 1px solid lightgray; + border: 1px solid $color-gray2; padding: 28px; font-weight: bold; cursor: pointer; @@ -365,4 +355,19 @@ textarea { .description { margin-top: 15px; } +} + +.icon { + color: $color-gray3; + font-size: larger; + display: inline; + + &.fa-angle-right { + padding-left: 4px; + } +} + +.hide { + display: none; + position: fixed; } \ No newline at end of file diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 634ebbc5dcee..acf7fa92a9f1 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -54,7 +54,7 @@ if (window.tocbot) { // Class to add to active links, // the link corresponding to the top most heading on the page. - activeLinkClass: 'selected-hub', + activeLinkClass: 'selected-article', // Headings offset between the headings and the top of the document (requires scrollSmooth enabled) headingsOffset: 80, From 1f082526703d2bd8ef5db4613fe8ef33bfe61d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Mon, 11 Jul 2022 15:05:33 -0500 Subject: [PATCH 38/39] fix mobile header buttons --- docs/_sass/_main.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index f923d792c6c3..d3ffe73dae76 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -234,6 +234,11 @@ textarea { } } } + + .hide { + display: none; + position: fixed; + } } #content-area { @@ -365,9 +370,4 @@ textarea { &.fa-angle-right { padding-left: 4px; } -} - -.hide { - display: none; - position: fixed; } \ No newline at end of file From 17259bcb7b3230aac0c6b6a1e738164990003441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= Date: Tue, 12 Jul 2022 14:42:44 -0500 Subject: [PATCH 39/39] remove bold to link tags --- docs/_sass/_main.scss | 1 - docs/articles/request-money/SmartScan.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss index d3ffe73dae76..7a74ad38f688 100644 --- a/docs/_sass/_main.scss +++ b/docs/_sass/_main.scss @@ -71,7 +71,6 @@ hr { } strong { - font-weight: 700; font-family: "GTAmericaExp-Bold", "Helvetica Neue", "Helvetica", Arial, sans-serif; } diff --git a/docs/articles/request-money/SmartScan.md b/docs/articles/request-money/SmartScan.md index 685ab27eb9bb..542704cc62f3 100644 --- a/docs/articles/request-money/SmartScan.md +++ b/docs/articles/request-money/SmartScan.md @@ -7,7 +7,7 @@ SmartScan is the time-saving tool that every Expensify user needs. Using SmartSc ## What is SmartScan? SmartScan is simple on the outside and complex on the inside. When you SmartScan a receipt, we’ll read the **Merchant**, **Date** and **Amount** of the transaction, create an expense, and add it to your Expensify account automatically. If you have a credit card connected and you upload a receipt that matches a card expense, the SmartScanned receipt will automatically merge with the imported expense instead! -- Expensify accounts come with 25 free SmartScans per month. If you’re an individual user and you need access to unlimited SmartScans, check out the **[Monthly Subscription](https://community.expensify.com/discussion/5535/deep-dive-the-monthly-subscription-is-it-right-for-me)**! +- Expensify accounts come with 25 free SmartScans per month. If you’re an individual user and you need access to unlimited SmartScans, check out the [Monthly Subscription](https://community.expensify.com/discussion/5535/deep-dive-the-monthly-subscription-is-it-right-for-me)! - If your organization is already using Expensify and you belong to a company policy, you’ll have access to unlimited SmartScans by default. ### How SmartScan Works: