From b8a0442dec72a928926ee54bfc0059eb3b754d33 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Thu, 22 Feb 2024 14:53:12 -0600 Subject: [PATCH 01/54] :sparkles: Planning scaffolding --- .../Commercial license.md | 14 ++++++++---- en/Teams/Introduction to Teams.md | 22 +++++++++++++++++++ en/Teams/Manage Obsidian.md | 0 en/Teams/Obsidian Publish in a team.md | 0 en/Teams/Obsidian Sync in a team.md | 0 en/Teams/Security for teams.md | 0 6 files changed, 32 insertions(+), 4 deletions(-) rename en/{Licenses and payment => Teams}/Commercial license.md (92%) create mode 100644 en/Teams/Introduction to Teams.md create mode 100644 en/Teams/Manage Obsidian.md create mode 100644 en/Teams/Obsidian Publish in a team.md create mode 100644 en/Teams/Obsidian Sync in a team.md create mode 100644 en/Teams/Security for teams.md diff --git a/en/Licenses and payment/Commercial license.md b/en/Teams/Commercial license.md similarity index 92% rename from en/Licenses and payment/Commercial license.md rename to en/Teams/Commercial license.md index 69531737c..0b4f0e701 100644 --- a/en/Licenses and payment/Commercial license.md +++ b/en/Teams/Commercial license.md @@ -2,9 +2,12 @@ aliases: - Licenses & Payment/Commercial license --- -If you use Obsidian for work in a company with two or more employees, you must purchase a Commercial license. -You and your team may use Obsidian commercially for free for 14 days to evaluate the app before purchase. For bulk discounts, [[Help and support|contact Obsidian support]]. +If you use Obsidian for work in a company with two or more employees, you must purchase a Commercial license. + +You and your team may use Obsidian commercially for free for 14 days to evaluate the app before purchase. + +For questions about bulk discounts for seat licenses, [[Help and support|contact Obsidian support]]. ## What is considered commercial use? @@ -13,12 +16,13 @@ Commercial use includes, but isn't limited to, work-related activities such as: - Meeting notes - Project notes for teams - Organizational wikis +- Tasks lists You don't need a Commercial license if you work in any of the following settings: - Schools and recognized educational institutions - Non-commercial research -- Non-profit organizations +- Registered Non-profit organizations - Freelancing or companies with a single person Government departments and agencies are considered commercial use, unless registered as a non-profit organization. @@ -40,7 +44,9 @@ To activate a commercial license: 3. Click **Activate** and enter your license key. 4. You're done! The app is now licensed for commercial use. -## FAQ +> [!info] A purchase of a commercial license does not grant a [Obsidian Sync](https://obsidian.md/sync) or [Obsidian Publish](https://obsidian.md/publish) subscription. + +## Frequently asked questions ### Purchasing process diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md new file mode 100644 index 000000000..19a890294 --- /dev/null +++ b/en/Teams/Introduction to Teams.md @@ -0,0 +1,22 @@ +--- +aliases: + - Teams +cssclasses: + - list-cards + - list-cards-mobile-full +permalink: teams +--- +Obsidian is not only a great notetaking application for the individual, it is a tool for collaboration for your team. This section details the + +## Use Obsidian for your team + +- [[Commercial license]] + - Who needs a commercial license? +- [[Manage Obsidian]] + - Install, update, and customize Obsidian +- [[Obsidian Sync in a team]] + - Using Obsidian Sync with your team +- [[Obsidian Publish in a team]] + - Using Obsidian Publish with your team +- [[Security for teams]] + - Control access to Obsidian \ No newline at end of file diff --git a/en/Teams/Manage Obsidian.md b/en/Teams/Manage Obsidian.md new file mode 100644 index 000000000..e69de29bb diff --git a/en/Teams/Obsidian Publish in a team.md b/en/Teams/Obsidian Publish in a team.md new file mode 100644 index 000000000..e69de29bb diff --git a/en/Teams/Obsidian Sync in a team.md b/en/Teams/Obsidian Sync in a team.md new file mode 100644 index 000000000..e69de29bb diff --git a/en/Teams/Security for teams.md b/en/Teams/Security for teams.md new file mode 100644 index 000000000..e69de29bb From 9be933668a3dbb8b6543d938d71da694de6827f0 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:53:34 -0500 Subject: [PATCH 02/54] :memo: Expanded Update language Signed-off-by: Sigrunixia --- en/Getting started/Update Obsidian.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/Getting started/Update Obsidian.md b/en/Getting started/Update Obsidian.md index f9477481a..c08661e02 100644 --- a/en/Getting started/Update Obsidian.md +++ b/en/Getting started/Update Obsidian.md @@ -4,7 +4,7 @@ aliases: - Installer version update --- -Obsidian checks for new updates regularly. When a new update is available, Obsidian applies it when you restart the application. +Obsidian regularly checks for new updates. If automatic updates are enabled, the application will apply any available updates when you restart it. ## Check for an update and the current version @@ -14,7 +14,7 @@ You can find the current Obsidian version and installer version in the upper-lef ![[application-installer-current-version.png#interface]] -To apply any available updates, click **Relaunch**. +To check for updates, select **Check for updates**. If there are new updates, this button will change to **Relaunch**. select **Relaunch** to apply any available updates. ## Disable automatic updates From 0f26a2f1a8d9cb7a743a5ef6ef49efbfc7ceabfc Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:54:04 -0500 Subject: [PATCH 03/54] :fire: Moved system installer language Signed-off-by: Sigrunixia --- en/Getting started/Download and install Obsidian.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/en/Getting started/Download and install Obsidian.md b/en/Getting started/Download and install Obsidian.md index bbe43ef10..5e28d9732 100644 --- a/en/Getting started/Download and install Obsidian.md +++ b/en/Getting started/Download and install Obsidian.md @@ -7,9 +7,6 @@ This page lists all supported ways to download and install Obsidian. 3. Open the installation file and follow the instructions. 4. Open Obsidian the same way you would open any other application. -> [!tip] System installer available -> For those who require a system installer for Windows, you can find the `-allusers.exe` download on the [Releases](https://github.com/obsidianmd/obsidian-releases/releases) page. - ## Install Obsidian on macOS 1. Open your browser and go to [Download Obsidian](https://obsidian.md/download). From 95888b51fbd108e41f0d86ffcc741ea5a636bec2 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:55:36 -0500 Subject: [PATCH 04/54] Added alias and clarified FAQ Adjusted return question to conform to our return policy. Signed-off-by: Sigrunixia --- .../Education and non-profit discount.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/en/Licenses and payment/Education and non-profit discount.md b/en/Licenses and payment/Education and non-profit discount.md index 8fefdd77f..50ccdc8ea 100644 --- a/en/Licenses and payment/Education and non-profit discount.md +++ b/en/Licenses and payment/Education and non-profit discount.md @@ -1,7 +1,8 @@ --- aliases: -- Student and non-profit discount -- Licenses & Payment/Education and non-profit discount + - Student and non-profit discount + - Licenses & Payment/Education and non-profit discount + - Discounts --- Obsidian currently offers two types of discounts: education and non-profit. They both give you 40% off our add-on services, including [[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]]. @@ -40,7 +41,4 @@ If you’re already an early bird, there’s generally no point in applying for **What if my educational or non-profit organization doesn't provide an email address?** In that case, you can send other forms of verification such as student ID card, transcript, or employee ID card to the [[Help and support#Contact Obsidian support|Obsidian support]]. Be sure to include your Obsidian account email address too. Our team will review your application and get back to you. Thank you for your patience! -**I qualify for a discount, but I already paid. Can I get a refund?** -We understand that some people have purchased Sync or Publish without discounts either because discounts were not offered back then, or that you didn't know about the discount. - -Unfortunately, we don't offer refunds in cases like this. Sorry! Thank you for understanding. The good news is that future renewals will automatically have the discount applied, as long as you have a valid discount. +**If I qualify for a discount but have recently paid for my subscription, what should I do?** Please contact [[Help and support#Contact Obsidian support|Obsidian support]] so we can assess your options. \ No newline at end of file From 88b1436315b931a9e61611d4136065731aed7f3a Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:56:02 -0500 Subject: [PATCH 05/54] Adjusted file structure Signed-off-by: Sigrunixia --- en/Teams/Manage Obsidian in your workplace.md | 44 +++++++++++++++++++ en/Teams/Manage Obsidian.md | 0 en/Teams/Security for teams.md | 0 3 files changed, 44 insertions(+) create mode 100644 en/Teams/Manage Obsidian in your workplace.md delete mode 100644 en/Teams/Manage Obsidian.md delete mode 100644 en/Teams/Security for teams.md diff --git a/en/Teams/Manage Obsidian in your workplace.md b/en/Teams/Manage Obsidian in your workplace.md new file mode 100644 index 000000000..ed2f20200 --- /dev/null +++ b/en/Teams/Manage Obsidian in your workplace.md @@ -0,0 +1,44 @@ +--- +cssClasses: soft-embed +--- + +This page details how to install and manage the Obsidian installation in your workplace. + +## Installing and updating Obsidian + +Download your preferred version of Obsidian from our [GitHub releases page](https://github.com/obsidianmd/obsidian-releases/releases). Each release includes a link to our changelog, detailing the changes. + +For Windows users who need a system installer, use the `-allusers.exe` file on the releases page. + +## Network and access + +Obsidian is designed to function primarily as an offline application. However, it does make network calls based on the services and features you use. These network connections can be disabled via a domain firewall or application lockdown. + +The following is a list of network connections Obsidian makes. + +### Obsidian-sourced connections + +- **Early access updates**: Uses `releases.obsidian.md`. +- **Account and license management**: When accessing your Obsidian account in Settings and applying a Commercial License, we call `api.obsidian.md`. +- **Obsidian Sync**: Used for syncing your notes across devices. +- **Obsidian Publish**: + 1. Backend: `publish-main.obsidian.md` and `publish-xx.obsidian.md`, where `xx` is a number. + 2. Frontend: `publish.obsidian.md`. + + +### GitHub-sourced connections + +- **Public releases**: If automatic updates are enabled, Obsidian checks GitHub for public releases. +- **Third-party themes and plugins**: + - A check is performed once every 12 hours from the app's startup time to fetch a file hosted on GitHub used for "plugin deprecations." This file helps remotely disable specific versions of plugins known to malfunction, cause data loss, or potentially be vulnerable or malicious. + - Enabled plugins may generate network traffic outside Obsidian and GitHub's control. + +### Other connections + +- **Embedded online content**: When opening notes that embed online content, such as an image (`![cat](https://upload.wikimedia.org/wikipedia/commons/0/0b/Cat_poster_1.jpg)`). +- **DNS requests**: If a hostname needs to be resolved before establishing a connection, including DNS over HTTPS. Refer to [Chromium's documentation](https://source.chromium.org/chromium/chromium/src/+/main:net/dns/public/doh_provider_entry.cc;l=120?q=chrome.cloudflare-dns.com&ss=chromium) for more information. + +## Frequently asked questions + +**How do I deploy licenses across multiple installations?** +Currently, we do not support the ability to deploy licenses via a deployment script, such as in a `.json` file. \ No newline at end of file diff --git a/en/Teams/Manage Obsidian.md b/en/Teams/Manage Obsidian.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/en/Teams/Security for teams.md b/en/Teams/Security for teams.md deleted file mode 100644 index e69de29bb..000000000 From 4455f5de08cf46296c6634f430a96e57132749cb Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:56:20 -0500 Subject: [PATCH 06/54] Created introduction page to teams Signed-off-by: Sigrunixia --- en/Teams/Introduction to Teams.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md index 19a890294..5ebdf9942 100644 --- a/en/Teams/Introduction to Teams.md +++ b/en/Teams/Introduction to Teams.md @@ -4,19 +4,17 @@ aliases: cssclasses: - list-cards - list-cards-mobile-full -permalink: teams --- -Obsidian is not only a great notetaking application for the individual, it is a tool for collaboration for your team. This section details the + +Obsidian serves as an excellent note-taking application for individuals, and a collaboration tool for your team. This section provides essential information for those considering Obsidian for their organization, large and small. ## Use Obsidian for your team - [[Commercial license]] - Who needs a commercial license? -- [[Manage Obsidian]] +- [[Manage Obsidian in your workplace]] - Install, update, and customize Obsidian - [[Obsidian Sync in a team]] - Using Obsidian Sync with your team - [[Obsidian Publish in a team]] - Using Obsidian Publish with your team -- [[Security for teams]] - - Control access to Obsidian \ No newline at end of file From 26fb365c3f93dcbea182d4f79f51d9c344a4c48a Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:56:35 -0500 Subject: [PATCH 07/54] Created introduction to licenses and payment Signed-off-by: Sigrunixia --- .../Introduction to licenses and payment.md | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 en/Licenses and payment/Introduction to licenses and payment.md diff --git a/en/Licenses and payment/Introduction to licenses and payment.md b/en/Licenses and payment/Introduction to licenses and payment.md new file mode 100644 index 000000000..5fbdcc746 --- /dev/null +++ b/en/Licenses and payment/Introduction to licenses and payment.md @@ -0,0 +1,24 @@ +--- +cssclasses: + - list-cards + - list-cards-mobile-full +--- +Obsidian currently offers five items available for purchase to augment your Obsidian experience. + +- [[Introduction to Obsidian Sync|Obsidian Sync]] + - Sync notes across devices +- [[Introduction to Obsidian Publish|Obsidian Publish]] + - Publish notes to the web +- [[Commercial license]] + - Legally use Obsidian in your workplace +- [[Obsidian Credit]] + - Purchase and gift Obsidian services +- [[Catalyst license]] + - Support development and gain early access to releases + + +[[Education and non-profit discount|Discounts]] are available for Obsidian Sync and Publish for educational and non-profit organizations, as well as bulk discounts for [[commercial license|commercial licenses]]. + +You can view our return policy for these purchases in our refund policy. + +## \ No newline at end of file From f1e76cdbe8f889c098927fc5af1902a65600d434 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:56:49 -0500 Subject: [PATCH 08/54] Moved and expanded Commercial license.md Signed-off-by: Sigrunixia --- en/Teams/Commercial license.md | 88 +++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 28 deletions(-) diff --git a/en/Teams/Commercial license.md b/en/Teams/Commercial license.md index 0b4f0e701..da9238c37 100644 --- a/en/Teams/Commercial license.md +++ b/en/Teams/Commercial license.md @@ -3,9 +3,9 @@ aliases: - Licenses & Payment/Commercial license --- -If you use Obsidian for work in a company with two or more employees, you must purchase a Commercial license. +If you use Obsidian for work in a company with **two or more** employees, you must purchase a Commercial license. -You and your team may use Obsidian commercially for free for 14 days to evaluate the app before purchase. +You and your team may use Obsidian commercially for free for **14 days** to evaluate the app before purchase. For questions about bulk discounts for seat licenses, [[Help and support|contact Obsidian support]]. @@ -18,6 +18,8 @@ Commercial use includes, but isn't limited to, work-related activities such as: - Organizational wikis - Tasks lists +> [!tip] A rule of thumb for determining commercial use is: if the contents of a note would be placed in a shredder box if they were on paper, then that note is considered commercial use. + You don't need a Commercial license if you work in any of the following settings: - Schools and recognized educational institutions @@ -25,46 +27,50 @@ You don't need a Commercial license if you work in any of the following settings - Registered Non-profit organizations - Freelancing or companies with a single person -Government departments and agencies are considered commercial use, unless registered as a non-profit organization. +Government departments and agencies are classified as commercial use unless registered as a non-profit organization. + +## Purchase a commercial license -## Purchase and activate a commercial license +Obsidian offers two methods for purchasing a commercial license. Check the [pricing page](https://obsidian.md/pricing) for pricing details. -To purchase a commercial license, follow the steps below. You can find pricing information on the [pricing page](https://obsidian.md/pricing). +**Purchasing using an Obsidian account** -1. Create or login to [your Obsidian account](https://obsidian.md/account). -2. Scroll down to the **Commercial license** section. -3. Click **Buy license** and choose the number of seats you want to purchase. +1. Log in or create [your Obsidian account](https://obsidian.md/account). +2. Go to the **Commercial License** section. +3. Click **Buy License** and select the number of seats to purchase. 4. Complete the payment process. -5. The license key will be displayed and can be activated using the steps below. +5. Your license key will be displayed and can be activated using the steps below. -To activate a commercial license: -1. Open the Obsidian app. -2. Go to **Settings → General → Commercial license**. -3. Click **Activate** and enter your license key. -4. You're done! The app is now licensed for commercial use. -> [!info] A purchase of a commercial license does not grant a [Obsidian Sync](https://obsidian.md/sync) or [Obsidian Publish](https://obsidian.md/publish) subscription. +**Purchasing using a Purchase order** -## Frequently asked questions +For purchases using a purchase order (PO), [[Help and support#Contact Obsidian support|contact Obsidian support]]. -### Purchasing process +Your PO must include: -**Can I try Obsidian for commercial use before paying?** -Yes. You and your team may evaluate Obsidian for commercial use for 14 days. You don't need to pay before evaluating. +- Legal Name of Your Company ("bill to" name) +- Billing Address +- VAT Number (optional) +- Payment Terms (default is NET 30 days) +- PO/Reference Number +- Delivery Email for Licenses +- Invoice Email for POs +- **Preferred Payment Method**: Wire/ACH, Credit Card, or PayPal -**Are there bulk discounts?** -Yes. If you are purchasing more than 20 seats you may be eligible for bulk pricing. Please [[Help and support#Contact Obsidian support|contact Obsidian support]]. +> [!info] Purchasing a commercial license does not include an [Obsidian Sync](https://obsidian.md/sync) or [Obsidian Publish](https://obsidian.md/publish) subscription. -**Can I buy a license for myself, or do I have to ask my company to buy it for me?** -Yes. You can buy a license for yourself by going to your [Account dashboard](https://obsidian.md/account). Most companies allow you to submit an expense report for the purchase. -Some companies may have a different procurement process. Ask your IT department to [[Help and support#Contact Obsidian support|contact Obsidian support]] if they have questions or require specific paperwork. +### Activate a commercial license -**Can I purchase a commercial license for multiple employees?** -Yes. You can purchase multiple commercial license seats through your [Account dashboard](https://obsidian.md/account). There is no need for each employee to have their own Obsidian account, you can use a single admin account to purchase all the seats. +To activate a commercial license -After purchasing the license, you will receive a license key which you can send to employees to activate their license — see instructions above to activate the license. +1. Open the Obsidian app. +2. Go to **Settings → General → Commercial license**. +3. Click **Activate** and enter your license key. +4. You're done! The app is now licensed for commercial use. + +## Frequently asked questions ### Do I need a commercial license? @@ -81,7 +87,9 @@ No. As long as you are the sole employee of your freelance/consulting business, No. Obsidian usage for education-related activities within schools and other recognized educational institutions doesn't require a commercial license. **I'm an academic researcher and I use Obsidian for my research work. Do I need a commercial license?** -If your research involves producing a commercial product — for example if your research contributes to revenue-generating commercial activities — you need a commercial license for your usage. If your research doesn't contribute to a commercial product, or if your research has not yet led to commercial activities, you don't need a license. +If your research involves producing a commercial product — for example if your research contributes to revenue-generating commercial activities — you need a commercial license for your usage. + +If your research doesn't contribute to a commercial product, or if your research has not yet led to commercial activities, you don't need a license. **I work for a government or an arm's length body or agency. Do I need a commercial license?** Yes. Government agencies and departments need a commercial license. Registered charitable and non-profit organizations are exempted. @@ -94,3 +102,27 @@ If your notes contain content directly related to work projects or processes for **I’m still not sure if I need a commercial license. What should I do?** If you still have questions regarding the commercial license requirements, [[Help and support#Contact Obsidian support|contact Obsidian support]] and describe your situation in detail. + +### Purchasing process + +**Can I try Obsidian for commercial use before paying?** +Yes. You and your team may evaluate Obsidian for commercial use for **14** days. You don't need to pay before evaluating. + +**Are there bulk discounts?** +Yes. If you are purchasing more than 20 seats you may be eligible for bulk pricing. Please [[Help and support#Contact Obsidian support|contact Obsidian support]]. + +**Can I buy a license for myself, or do I have to ask my company to buy it for me?** +Yes. You can buy a license for yourself by going to your [Account dashboard](https://obsidian.md/account). Most companies allow you to submit an expense report for the purchase. + +Some companies may have a different procurement process. Ask your IT department to [[Help and support#Contact Obsidian support|contact Obsidian support]] if they have questions or require specific paperwork. + +**Can I purchase a commercial license for multiple employees?** +Yes. You can purchase multiple commercial license seats through your [Account dashboard](https://obsidian.md/account). There is no need for each employee to have their own Obsidian account, you can use a single admin account to purchase all the seats. + +After purchasing the license, you will receive a license key which you can send to employees to activate their license — see instructions above to activate the license. + +### Applying the license + +**I work in a highly secure environment, in an air-gapped network. How do I apply my commercial license?** +In such specialized environments, you don't need to apply the commercial license directly to your installation. However, you must monitor license usage and retain relevant records to ensure compliance with our End User License Agreement (EULA). + From c52b2bb5607bec09a63a44348bc5496675067150 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 22:59:38 -0500 Subject: [PATCH 09/54] Pluralized Commercial licenses.md Signed-off-by: Sigrunixia --- .../Financial contributions.md | 2 +- en/Help and support.md | 2 +- en/Licenses and payment/Catalyst license.md | 2 +- en/Licenses and payment/Gifting.md | 2 +- .../Introduction to licenses and payment.md | 4 ++-- en/Licenses and payment/Refund policy.md | 2 +- en/Obsidian/Official website.md | 2 +- ...Commercial license.md => Commercial licenses.md} | 13 +++++++------ en/Teams/Introduction to Teams.md | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) rename en/Teams/{Commercial license.md => Commercial licenses.md} (91%) diff --git a/en/Contributing to Obsidian/Financial contributions.md b/en/Contributing to Obsidian/Financial contributions.md index 910088e52..0191c1ef9 100644 --- a/en/Contributing to Obsidian/Financial contributions.md +++ b/en/Contributing to Obsidian/Financial contributions.md @@ -4,6 +4,6 @@ One of the best ways to support the team is through one or more of our paid prod - If you need to sync notes across your devices, consider a subscription for [[Introduction to Obsidian Sync|Obsidian Sync]]. - If you want to publish your notes to the world, consider a subscription for [[Introduction to Obsidian Publish|Obsidian Publish]]. -- If you use Obsidian for work, we ask you to purchase a [[Commercial license]]. +- If you use Obsidian for work, we ask you to purchase a [[Commercial licenses]]. We understand that you might not be interested in any of our paid products right now, though we'd love to know how we can change that! If you still want to support Obsidian and you only use Obsidian for personal purposes, consider getting a [[Catalyst license]]. diff --git a/en/Help and support.md b/en/Help and support.md index e518b58bf..d9ec088cf 100644 --- a/en/Help and support.md +++ b/en/Help and support.md @@ -17,7 +17,7 @@ If you want to report a bug, head over to [Bug reports](https://forum.obsidian.m ### Contact Obsidian support -Obsidian offers email support only for inquiries about [[Commercial license|commercial licenses]], your account, payment, and add-on services ([[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]]). If you need help with any of those topics, [email the Obsidian team](mailto:support@obsidian.md). +Obsidian offers email support only for inquiries about [[Commercial licenses|commercial licenses]], your account, payment, and add-on services ([[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]]). If you need help with any of those topics, [email the Obsidian team](mailto:support@obsidian.md). ### Collect debug information diff --git a/en/Licenses and payment/Catalyst license.md b/en/Licenses and payment/Catalyst license.md index 807375857..5d4ec8336 100644 --- a/en/Licenses and payment/Catalyst license.md +++ b/en/Licenses and payment/Catalyst license.md @@ -11,7 +11,7 @@ Catalyst license gives you exclusive benefits including: - Exclusive [[#Get your forum badge|forum badges]] and [[#Get your Discord badge|Discord badges]]. > [!Note] Commercial use -> If you use Obsidian for work in a company with two or more employees, you must purchase a [[Commercial license]]. +> If you use Obsidian for work in a company with two or more employees, you must purchase a [[Commercial licenses]]. ## Catalyst tiers diff --git a/en/Licenses and payment/Gifting.md b/en/Licenses and payment/Gifting.md index 81d25c327..1ff0b86f8 100644 --- a/en/Licenses and payment/Gifting.md +++ b/en/Licenses and payment/Gifting.md @@ -3,7 +3,7 @@ aliases: - Licenses & Payment/Gifting --- -Although using Obsidian for personal use is completely free of charge, you can give the gift of Obsidian to someone to help them get an add-on service like [[Introduction to Obsidian Sync|Obsidian Sync]], or to get a [[Commercial license]] so they can use Obsidian for work. +Although using Obsidian for personal use is completely free of charge, you can give the gift of Obsidian to someone to help them get an add-on service like [[Introduction to Obsidian Sync|Obsidian Sync]], or to get a [[Commercial licenses]] so they can use Obsidian for work. ## Give gift credits diff --git a/en/Licenses and payment/Introduction to licenses and payment.md b/en/Licenses and payment/Introduction to licenses and payment.md index 5fbdcc746..b57f6825a 100644 --- a/en/Licenses and payment/Introduction to licenses and payment.md +++ b/en/Licenses and payment/Introduction to licenses and payment.md @@ -9,7 +9,7 @@ Obsidian currently offers five items available for purchase to augment your Obsi - Sync notes across devices - [[Introduction to Obsidian Publish|Obsidian Publish]] - Publish notes to the web -- [[Commercial license]] +- [[Commercial licenses]] - Legally use Obsidian in your workplace - [[Obsidian Credit]] - Purchase and gift Obsidian services @@ -17,7 +17,7 @@ Obsidian currently offers five items available for purchase to augment your Obsi - Support development and gain early access to releases -[[Education and non-profit discount|Discounts]] are available for Obsidian Sync and Publish for educational and non-profit organizations, as well as bulk discounts for [[commercial license|commercial licenses]]. +[[Education and non-profit discount|Discounts]] are available for Obsidian Sync and Publish for educational and non-profit organizations, as well as bulk discounts for [[Commercial licenses|commercial licenses]]. You can view our return policy for these purchases in our refund policy. diff --git a/en/Licenses and payment/Refund policy.md b/en/Licenses and payment/Refund policy.md index 8e0240bf5..e748a7c1d 100644 --- a/en/Licenses and payment/Refund policy.md +++ b/en/Licenses and payment/Refund policy.md @@ -9,7 +9,7 @@ We offer full refunds within 7 days of purchase with no questions asked for the - [[Introduction to Obsidian Publish|Obsidian Publish]] - [[Introduction to Obsidian Sync|Obsidian Sync]] -- [[Commercial license]] +- [[Commercial licenses]] > [!Warning] No refunds for Catalyst or Obsidian Credit diff --git a/en/Obsidian/Official website.md b/en/Obsidian/Official website.md index 08d961142..5954a3747 100644 --- a/en/Obsidian/Official website.md +++ b/en/Obsidian/Official website.md @@ -3,4 +3,4 @@ Obsidian’s official website is at https://obsidian.md There you can: - [Download](https://obsidian.md/download) the latest installer if your installer version is old. -- Register an account, and access your [account dashboard](https://obsidian.md/account), if you want to purchase [[Catalyst license]], [[Commercial license]], [[Introduction to Obsidian Sync|Obsidian Sync]], or [[Introduction to Obsidian Publish|Obsidian Publish]]. +- Register an account, and access your [account dashboard](https://obsidian.md/account), if you want to purchase [[Catalyst license]], [[Commercial licenses]], [[Introduction to Obsidian Sync|Obsidian Sync]], or [[Introduction to Obsidian Publish|Obsidian Publish]]. diff --git a/en/Teams/Commercial license.md b/en/Teams/Commercial licenses.md similarity index 91% rename from en/Teams/Commercial license.md rename to en/Teams/Commercial licenses.md index da9238c37..4560ba245 100644 --- a/en/Teams/Commercial license.md +++ b/en/Teams/Commercial licenses.md @@ -1,13 +1,14 @@ --- aliases: -- Licenses & Payment/Commercial license + - Licenses & Payment/Commercial license + - Commercial license --- If you use Obsidian for work in a company with **two or more** employees, you must purchase a Commercial license. You and your team may use Obsidian commercially for free for **14 days** to evaluate the app before purchase. -For questions about bulk discounts for seat licenses, [[Help and support|contact Obsidian support]]. +For questions about bulk discounts for seat licenses, contact [[Help and support#Contact Obsidian support|Obsidian support]]. ## What is considered commercial use? @@ -45,7 +46,7 @@ Obsidian offers two methods for purchasing a commercial license. Check the [pric **Purchasing using a Purchase order** -For purchases using a purchase order (PO), [[Help and support#Contact Obsidian support|contact Obsidian support]]. +For purchases using a purchase order (PO), contact [[Help and support#Contact Obsidian support|Obsidian support]]. Your PO must include: @@ -101,7 +102,7 @@ If you are a single-person company, then you don't require a commercial license. If your notes contain content directly related to work projects or processes for a company with more than one employee, then yes, you need a commercial license. **I’m still not sure if I need a commercial license. What should I do?** -If you still have questions regarding the commercial license requirements, [[Help and support#Contact Obsidian support|contact Obsidian support]] and describe your situation in detail. +If you still have questions regarding the commercial license requirements, contact [[Help and support#Contact Obsidian support|Obsidian support]] and describe your situation in detail. ### Purchasing process @@ -109,12 +110,12 @@ If you still have questions regarding the commercial license requirements, [[Hel Yes. You and your team may evaluate Obsidian for commercial use for **14** days. You don't need to pay before evaluating. **Are there bulk discounts?** -Yes. If you are purchasing more than 20 seats you may be eligible for bulk pricing. Please [[Help and support#Contact Obsidian support|contact Obsidian support]]. +Yes. If you are purchasing more than 20 seats you may be eligible for bulk pricing. Please contact [[Help and support#Contact Obsidian support|Obsidian support]]. **Can I buy a license for myself, or do I have to ask my company to buy it for me?** Yes. You can buy a license for yourself by going to your [Account dashboard](https://obsidian.md/account). Most companies allow you to submit an expense report for the purchase. -Some companies may have a different procurement process. Ask your IT department to [[Help and support#Contact Obsidian support|contact Obsidian support]] if they have questions or require specific paperwork. +Some companies may have a different procurement process. Ask your IT department to contact [[Help and support#Contact Obsidian support|Obsidian support]] if they have questions or require specific paperwork. **Can I purchase a commercial license for multiple employees?** Yes. You can purchase multiple commercial license seats through your [Account dashboard](https://obsidian.md/account). There is no need for each employee to have their own Obsidian account, you can use a single admin account to purchase all the seats. diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md index 5ebdf9942..0a1e256dc 100644 --- a/en/Teams/Introduction to Teams.md +++ b/en/Teams/Introduction to Teams.md @@ -10,7 +10,7 @@ Obsidian serves as an excellent note-taking application for individuals, and a c ## Use Obsidian for your team -- [[Commercial license]] +- [[Commercial licenses]] - Who needs a commercial license? - [[Manage Obsidian in your workplace]] - Install, update, and customize Obsidian From b488c673723c563e141233764112baadfc02ab21 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:27:52 -0500 Subject: [PATCH 10/54] Added purchasing and invoice section Signed-off-by: Sigrunixia --- .../Introduction to licenses and payment.md | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/en/Licenses and payment/Introduction to licenses and payment.md b/en/Licenses and payment/Introduction to licenses and payment.md index b57f6825a..5bc63080f 100644 --- a/en/Licenses and payment/Introduction to licenses and payment.md +++ b/en/Licenses and payment/Introduction to licenses and payment.md @@ -12,13 +12,47 @@ Obsidian currently offers five items available for purchase to augment your Obsi - [[Commercial licenses]] - Legally use Obsidian in your workplace - [[Obsidian Credit]] - - Purchase and gift Obsidian services + - Purchase and [[Gifting|gift]] Obsidian services - [[Catalyst license]] - Support development and gain early access to releases [[Education and non-profit discount|Discounts]] are available for Obsidian Sync and Publish for educational and non-profit organizations, as well as bulk discounts for [[Commercial licenses|commercial licenses]]. -You can view our return policy for these purchases in our refund policy. +You can view our return policy for these purchases in our [[Refund policy|refund policy]]. + +## Purchasing services + +1. Log in or create [your Obsidian account](https://obsidian.md/account). +2. Navigate to the section corresponding to the item you wish to purchase: + 1. **Obsidian Credit** can be found in the **Billing** section. + 2. **Commercial Licenses** can be found in the **Commercial License** section. + 3. **Obsidian Sync** can be found in the **Sync** section. + 4. **Obsidian Publish** can be found in the **Publish** section. + 5. **Catalyst Licenses** can be found in the **Catalyst License** section. +3. Click the purple **Buy** button to proceed with your purchase. + +We accept the following payment methods: Stripe, PayPal, WeChat, and AliPay. + +After completing your payment, you will receive a receipt from the service through which you made the purchase. + +## Generate an invoice + +Obsidian generates an invoice for all purchases within your account. To retrieve your invoice: + +1. Log in to [your Obsidian account](https://obsidian.md/account). +2. Navigate to the **Billing** section. +3. Next to **Invoices and Refunds**, select **View**. + 1. If multiple invoices are available, select the invoice you want to review and click **View** or **Download**. + +### Editing an invoice + +If you need to edit information on the invoice, such as the billing address or VAT number, follow these steps: + +1. Log in to [your Obsidian account](https://obsidian.md/account). +2. Navigate to the **Billing** section. +3. Next to **Invoices and Refunds**, select **View**. + 1. If multiple invoices are available, select the invoice you want to review and click **View**. +4. In the **Bill To:** section, the text box will be editable. +5. Make your edits, and then you can download your updated invoice. -## \ No newline at end of file From c6b8b99e261071c823fc6a9d1054fa29dc3295d2 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:39:28 -0500 Subject: [PATCH 11/54] Linked to invoice section Signed-off-by: Sigrunixia --- en/Teams/Commercial licenses.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/Teams/Commercial licenses.md b/en/Teams/Commercial licenses.md index 4560ba245..96382c73f 100644 --- a/en/Teams/Commercial licenses.md +++ b/en/Teams/Commercial licenses.md @@ -42,7 +42,7 @@ Obsidian offers two methods for purchasing a commercial license. Check the [pric 4. Complete the payment process. 5. Your license key will be displayed and can be activated using the steps below. - +If you need an invoice for this transaction, you can [[Introduction to licenses and payment#Generate an invoice|generate an invoice]]. **Purchasing using a Purchase order** From f200b5e8b4d1fc42e91c3165adba313fd4962eca Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:39:50 -0500 Subject: [PATCH 12/54] FAQ uniformity pass Signed-off-by: Sigrunixia --- en/Licenses and payment/Education and non-profit discount.md | 2 +- en/Licenses and payment/Refund policy.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/Licenses and payment/Education and non-profit discount.md b/en/Licenses and payment/Education and non-profit discount.md index 50ccdc8ea..56cd0c744 100644 --- a/en/Licenses and payment/Education and non-profit discount.md +++ b/en/Licenses and payment/Education and non-profit discount.md @@ -25,7 +25,7 @@ Once you have an active discount, you can see how it will expire under **Payment A week before your discount expires, you will get an email reminder to renew it. You can follow the same steps in "[[#How to apply]]" to renew the discount, if you still qualify for it. -## FAQ +## Frequently asked questions **Who is eligible?** If you are a student or faculty member of an education organization like a university or a high school, you generally qualify for education discount. If you run or work at a non-profit organization, you generally qualify for non-profit discount. diff --git a/en/Licenses and payment/Refund policy.md b/en/Licenses and payment/Refund policy.md index e748a7c1d..9bda476bd 100644 --- a/en/Licenses and payment/Refund policy.md +++ b/en/Licenses and payment/Refund policy.md @@ -31,7 +31,7 @@ We offer full refunds within 7 days of purchase with no questions asked for the 3. Next to the payments you want a refund for, if you’re qualified for a refund, you’ll see a link to **Get refund**. Click on the click. 4. Your service will be removed and any auto-renewals will be cancelled as well. If you confirm to proceed, click **Request refund**. -## FAQ +## Frequently asked questions **What happens if I refund my service?** If you are refunding an Obsidian Sync or Obsidian Publish subscription, any remote vaults or publish sites are deleted, and can not be retrieved even if you subscribe again. From e0b23b20cdf13dc5f8a1cfbcbd82ab5386be16b4 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:39:59 -0500 Subject: [PATCH 13/54] Sync Standard pass Signed-off-by: Sigrunixia --- en/Obsidian Sync/Collaborate on a shared vault.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/en/Obsidian Sync/Collaborate on a shared vault.md b/en/Obsidian Sync/Collaborate on a shared vault.md index 85b20b484..ad648f99d 100644 --- a/en/Obsidian Sync/Collaborate on a shared vault.md +++ b/en/Obsidian Sync/Collaborate on a shared vault.md @@ -2,7 +2,6 @@ aliases: - Share remote vaults - Collaboration - - Teams - Collaborating - Obsidian Sync/Share remote vaults --- @@ -47,9 +46,9 @@ If multiple users are editing the same file at the same time, [[Troubleshoot Obs ![[version-history-collaboration.png]]^version-history-image -### Limitations +## Limitations Be aware that Obsidian Sync has [[Sync limitations|Limitations]] that may affect your team: - The maximum number of collaborators on a shared vault is 10 users. -- The maximum file size for attachments is 200 MB. \ No newline at end of file +- The maximum file size for attachments depends on the [[Plans and storage limits|plan]] of your remote vault host, with 5MB for the Standard Plan and 200MB for the Plus Plan. \ No newline at end of file From 3c61c22e21c6a7c86d9fa689e7616056360c3da1 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:42:55 -0500 Subject: [PATCH 14/54] Added Sync Standard Downgrade Caveat Closes #704 Signed-off-by: Sigrunixia --- en/Obsidian Sync/Plans and storage limits.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/en/Obsidian Sync/Plans and storage limits.md b/en/Obsidian Sync/Plans and storage limits.md index 3ab2e3334..053688f6d 100644 --- a/en/Obsidian Sync/Plans and storage limits.md +++ b/en/Obsidian Sync/Plans and storage limits.md @@ -60,10 +60,14 @@ The new remote vault should be smaller than the previous vault, because of the a ## Downgrade your plan -If you want to downgrade your Sync plan but your storage use exceeds the new plan's limit, you will need to free up space in your remote vault. However, there is no way to quickly remove specific files from an existing remote vault, because attachments are held in version history for up to two weeks and version history counts towards your storage limit. +If you want to downgrade your Sync plan but your storage use exceeds the new plan's limit, you'll need to free up space in your remote vault. Currently, there's no direct method to remove specific files from an existing remote vault quickly. This is because attachments are retained in version history for up to two weeks, and version history counts towards your storage limit. -The fastest way to reduce the amount of Sync storage you use is to [[#create a new remote vault]] with attachments disabled, then delete the old remote vault that exceeds the storage limits. Note that you will lose version history by doing so. +The quickest way to reduce your Sync storage usage is to create a new remote vault with attachments disabled, then delete the old remote vault that exceeds the storage limits. Be aware that you will lose version history by doing this. + +If you're downgrading from Sync Plus to Sync Standard, you'll also need to reduce the number of vaults present to one before the downgrade will be permitted. ### Preserve version history -Attachments are held in your [[version history]] for up to two weeks. If you plan to downgrade in the near future, you can start by removing attachments from your local vault. After two weeks these will be purged from the remote vault and will no longer count towards your storage limit. At this point you will be able to downgrade your plan while preserving the version history for other file types, such as Markdown files. \ No newline at end of file +Attachments are held in your [[version history]] for up to two weeks. If you plan to downgrade in the near future, you can start by removing attachments from your local vault. + +After two weeks these will be purged from the remote vault and will no longer count towards your storage limit. At this point you will be able to downgrade your plan while preserving the version history for other file types, such as Markdown files. \ No newline at end of file From f54cb574b883e68bcb4f8ded968eaf48a7ad797f Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:52:52 -0500 Subject: [PATCH 15/54] Update wording Signed-off-by: Sigrunixia --- en/Teams/Introduction to Teams.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md index 0a1e256dc..16b6e7ef8 100644 --- a/en/Teams/Introduction to Teams.md +++ b/en/Teams/Introduction to Teams.md @@ -11,10 +11,10 @@ Obsidian serves as an excellent note-taking application for individuals, and a c ## Use Obsidian for your team - [[Commercial licenses]] - - Who needs a commercial license? + - Determine if you need a license and find purchase information - [[Manage Obsidian in your workplace]] - Install, update, and customize Obsidian - [[Obsidian Sync in a team]] - - Using Obsidian Sync with your team + - Use Obsidian Sync with your team - [[Obsidian Publish in a team]] - - Using Obsidian Publish with your team + - Use Obsidian Publish with your team From bd74dedb09a4c1d4613c44ac2f6587ad2bf6079c Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:53:12 -0500 Subject: [PATCH 16/54] Add auto installer and some FAQS Signed-off-by: Sigrunixia --- en/Teams/Manage Obsidian in your workplace.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/en/Teams/Manage Obsidian in your workplace.md b/en/Teams/Manage Obsidian in your workplace.md index ed2f20200..ac14326c3 100644 --- a/en/Teams/Manage Obsidian in your workplace.md +++ b/en/Teams/Manage Obsidian in your workplace.md @@ -10,6 +10,8 @@ Download your preferred version of Obsidian from our [GitHub releases page](http For Windows users who need a system installer, use the `-allusers.exe` file on the releases page. +If automatic updates are enabled, future updates will install as allowed. We recommend periodically completing [[Update Obsidian#Installer updates|installer updates]] to gain the latest electron updates. + ## Network and access Obsidian is designed to function primarily as an offline application. However, it does make network calls based on the services and features you use. These network connections can be disabled via a domain firewall or application lockdown. @@ -25,7 +27,6 @@ The following is a list of network connections Obsidian makes. 1. Backend: `publish-main.obsidian.md` and `publish-xx.obsidian.md`, where `xx` is a number. 2. Frontend: `publish.obsidian.md`. - ### GitHub-sourced connections - **Public releases**: If automatic updates are enabled, Obsidian checks GitHub for public releases. @@ -40,5 +41,11 @@ The following is a list of network connections Obsidian makes. ## Frequently asked questions -**How do I deploy licenses across multiple installations?** -Currently, we do not support the ability to deploy licenses via a deployment script, such as in a `.json` file. \ No newline at end of file +**How can I deploy licenses across multiple installations?** +Currently, we do not support deploying licenses via a deployment script, such as in a `.json` file. + +**Does Obsidian support Single Sign-On (SSO)?** +Obsidian does not support SSO. In most use cases, Obsidian does not require an account or sign-on in your workplace, unless you are using [[Introduction to Obsidian Publish|Obsidian Publish]] or [[Introduction to Obsidian Sync|Obsidian Sync]]. + +**Does Obsidian support Multi-Factor Authentication (MFA)?** +Obsidian supports [[2-factor authentication]] (2FA) for Obsidian accounts, but it does not support 2FA for opening and using the base application. Users of [[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]] will be required to confirm their 2FA key when they first log into the application. \ No newline at end of file From 641d6466e23c4ab601b1d959fd55adc5dec9d0e7 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Sun, 31 Mar 2024 23:53:27 -0500 Subject: [PATCH 17/54] Start of Obsidian Sync embed inclusions Signed-off-by: Sigrunixia --- en/Teams/Obsidian Sync in a team.md | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/en/Teams/Obsidian Sync in a team.md b/en/Teams/Obsidian Sync in a team.md index e69de29bb..15418f010 100644 --- a/en/Teams/Obsidian Sync in a team.md +++ b/en/Teams/Obsidian Sync in a team.md @@ -0,0 +1,33 @@ +--- +cssclasses: + - soft-embed +--- +This page details and pulls together the more important information when considering Obsidian Sync in your workplace or project. + +> [!tip] Haven't set up Obsidian Sync yet? Check out [[Set up Obsidian Sync]] first. + +## Collaboration + +With [Obsidian Sync](app://obsidian.md/Introduction%20to%20Obsidian%20Sync) you can collaborate on a shared vault with your team. + +All collaborators **must have an active Sync subscription** to access a shared vault. Joining a shared vault does not count towards your [vault limit](app://obsidian.md/Sync%20limitations#How%20many%20remote%20vaults%20can%20I%20have?). + +If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync/Security%20and%20privacy), collaborators must enter the encryption password when they set up the vault. + + +![[Collaborate on a shared vault#Manage users|Collaboration]] + +![[Collaborate on a shared vault#Collaborate with your team|Collaboration]] + +![[Collaborate on a shared vault#Limitations|Collaboration]] + +## Security + +![[Obsidian Sync/Security and privacy#Hosting|Security and privacy]] +![[Obsidian Sync/Security and privacy#What encryption do you use?|Security and privacy]] +![[Obsidian Sync/Security and privacy#Has Obsidian completed a third-party security audit?|Security and privacy]] + +## Frequently asked questions + +**Do you have an on-premises Sync server?** +Obsidian Sync does not have an on-premises solution at this time. From 93f01ba7644656d0874eb0815b07c43fad412ca7 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Mon, 1 Apr 2024 00:05:34 -0500 Subject: [PATCH 18/54] Added PayPal disclaimer Signed-off-by: Sigrunixia --- .../Introduction to licenses and payment.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/en/Licenses and payment/Introduction to licenses and payment.md b/en/Licenses and payment/Introduction to licenses and payment.md index 5bc63080f..951be756d 100644 --- a/en/Licenses and payment/Introduction to licenses and payment.md +++ b/en/Licenses and payment/Introduction to licenses and payment.md @@ -34,6 +34,9 @@ You can view our return policy for these purchases in our [[Refund policy|refund We accept the following payment methods: Stripe, PayPal, WeChat, and AliPay. +> [!info] PayPal and fees +> PayPal purchases will be processed in Canadian Dollars (CAD). You may incur a foreign transaction fee from your credit card issuer, and PayPal may charge a currency conversion fee. + After completing your payment, you will receive a receipt from the service through which you made the purchase. ## Generate an invoice From 59dc43015e8d2e36cc9e524e04ec4626bc2dd924 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Mon, 1 Apr 2024 00:05:51 -0500 Subject: [PATCH 19/54] Fix Sales Tax disclaimer Also adds Gifting link Signed-off-by: Sigrunixia --- en/Licenses and payment/Obsidian Credit.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/en/Licenses and payment/Obsidian Credit.md b/en/Licenses and payment/Obsidian Credit.md index c51850880..6661da0e0 100644 --- a/en/Licenses and payment/Obsidian Credit.md +++ b/en/Licenses and payment/Obsidian Credit.md @@ -3,9 +3,11 @@ aliases: - Licenses & Payment/Obsidian Credit --- -Obsidian Credit is a type of prepaid credit. It can be bought in advance and applied towards purchases of all things Obsidian has to offer. +Obsidian Credit is a type of prepaid credit that can be bought in advance and applied toward purchases of all things Obsidian has to offer. -Obsidian Credit will be applied before any payment is due, and it will also be applied at auto-renewals. +Obsidian Credit will be applied before any payment is due, including auto-renewals. + +Obsidian Credit can be [[Gifting|gifted]] to other Obsidian users. ## Add credit @@ -15,6 +17,7 @@ Obsidian Credit will be applied before any payment is due, and it will also be a 4. Proceed to pay for the credit with any of the supported payment methods. > [!Note] Sales tax -> Any applicable sales tax will be charged when you actually buy something, not when you buy Obsidian Credit. +> Any applicable sales tax will be charged when you make a purchase of a product, such as Obsidian Sync, not when you buy Obsidian Credit. > -> If you plan to cover auto-renewals with your credit, please take this into account. +> If you plan to cover auto-renewals with your credit, please keep this factor in mind. + From bc173fff5c724fb5c2a8b1a17616f67b8da8f561 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Mon, 1 Apr 2024 00:11:05 -0500 Subject: [PATCH 20/54] Add how to receive credit. Closes #700 Signed-off-by: Sigrunixia --- en/Licenses and payment/Gifting.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/en/Licenses and payment/Gifting.md b/en/Licenses and payment/Gifting.md index 1ff0b86f8..0d4ccc291 100644 --- a/en/Licenses and payment/Gifting.md +++ b/en/Licenses and payment/Gifting.md @@ -12,5 +12,16 @@ In Obsidian, you don’t gift a particular product, but rather Obsidian Credit t 1. If you don’t already have [[Obsidian Credit]], you must first [[Obsidian Credit#Add credit|purchase credit]]. 2. [On your account dashboard](https://obsidian.md/account), under **Payment & billing → Obsidian Credit**, click **Gift**. 3. Follow the instructions to either get a redeem link to send yourself, or have us send an anonymized email to the recipient. -4. Click **Send gift** to complete the gifting. +4. Click **Send gift** to complete the gifting. You will be sent an email confirmation. 5. After you send out a gift, you can view it under **Payment & billing → Gift history**. You can see the status of each gift, and cancel the ones that haven’t been redeemed yet. + +## Receiving gift credits + +If you have received a redemption link or an anonymized email, follow these steps to redeem your Obsidian Credit: + +1. Log in or create [your Obsidian account](https://obsidian.md/account). +2. Open the redemption link or click the link in your email. +3. Confirm that you want to receive the credits. +4. The credits will be deposited within your account, ready to be used. + +The purchaser will be notified that you have redeemed the Obsidian Credits. \ No newline at end of file From e9e2b9cd0449a28bd9b6bf682aabf678b0656b62 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Mon, 1 Apr 2024 00:12:07 -0500 Subject: [PATCH 21/54] Whole words good Signed-off-by: Sigrunixia --- en/Obsidian Sync/Plans and storage limits.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/Obsidian Sync/Plans and storage limits.md b/en/Obsidian Sync/Plans and storage limits.md index 053688f6d..e08d184ec 100644 --- a/en/Obsidian Sync/Plans and storage limits.md +++ b/en/Obsidian Sync/Plans and storage limits.md @@ -60,11 +60,11 @@ The new remote vault should be smaller than the previous vault, because of the a ## Downgrade your plan -If you want to downgrade your Sync plan but your storage use exceeds the new plan's limit, you'll need to free up space in your remote vault. Currently, there's no direct method to remove specific files from an existing remote vault quickly. This is because attachments are retained in version history for up to two weeks, and version history counts towards your storage limit. +If you want to downgrade your Sync plan but your storage use exceeds the new plan's limit, you will need to free up space in your remote vault. Currently, there's no direct method to remove specific files from an existing remote vault quickly. This is because attachments are retained in version history for up to two weeks, and version history counts towards your storage limit. The quickest way to reduce your Sync storage usage is to create a new remote vault with attachments disabled, then delete the old remote vault that exceeds the storage limits. Be aware that you will lose version history by doing this. -If you're downgrading from Sync Plus to Sync Standard, you'll also need to reduce the number of vaults present to one before the downgrade will be permitted. +If you are downgrading from Sync Plus to Sync Standard, you'll also need to reduce the number of vaults present to one before the downgrade will be permitted. ### Preserve version history From 463762fdb03e90ef5f2252db3d558306b395ae52 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Mon, 1 Apr 2024 14:53:26 -0500 Subject: [PATCH 22/54] Add business name question Signed-off-by: Sigrunixia --- en/Teams/Commercial licenses.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/en/Teams/Commercial licenses.md b/en/Teams/Commercial licenses.md index 96382c73f..794bb69ed 100644 --- a/en/Teams/Commercial licenses.md +++ b/en/Teams/Commercial licenses.md @@ -117,11 +117,18 @@ Yes. You can buy a license for yourself by going to your [Account dashboard](htt Some companies may have a different procurement process. Ask your IT department to contact [[Help and support#Contact Obsidian support|Obsidian support]] if they have questions or require specific paperwork. +**What business name should I use if I'm purchasing the license myself?** +Use your company's name for the license if you expect to be reimbursed by your company. + +Otherwise, use your legal name as the business name. + **Can I purchase a commercial license for multiple employees?** Yes. You can purchase multiple commercial license seats through your [Account dashboard](https://obsidian.md/account). There is no need for each employee to have their own Obsidian account, you can use a single admin account to purchase all the seats. After purchasing the license, you will receive a license key which you can send to employees to activate their license — see instructions above to activate the license. + + ### Applying the license **I work in a highly secure environment, in an air-gapped network. How do I apply my commercial license?** From a50cdd688f74eaf7c2b3405797bdd3b795473da3 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 12:46:21 -0500 Subject: [PATCH 23/54] Add publish.scss for future styling help Signed-off-by: Sigrunixia --- .gitignore | 1 + en/publish.css | 445 ++++++++++++++++++++++++------------------------ en/publish.scss | 399 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 620 insertions(+), 225 deletions(-) create mode 100644 en/publish.scss diff --git a/.gitignore b/.gitignore index 9bafbcdf6..0b5c38faf 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ Thumbs.db .obsidian .idea/ +.css.map diff --git a/en/publish.css b/en/publish.css index 78c6c499a..40fcee287 100644 --- a/en/publish.css +++ b/en/publish.css @@ -1,327 +1,322 @@ -.theme-dark { - --color-base-00: #151515; - --color-base-20: #222222; +.site-body-left-column-site-logo { + text-align: left; + margin-bottom: 24px; +} +.site-body-left-column-site-logo img { + height: 25px; +} +.theme-light .site-body-left-column-site-logo { + filter: invert(1) hue-rotate(180deg); } -img { - border-radius: 4px; +.site-header-logo { + display: flex; + align-items: center; +} +.site-header-logo img { + height: 25px; +} +.theme-light .site-header-logo { + filter: invert(1) hue-rotate(180deg); } -/* Makes icons invert in dark mode */ -.theme-dark img[src*="lucide"], -.theme-dark img[src*="obsidian-icon"] { - filter: invert(1); +.site-body-left-column-site-logo { + text-align: left; + margin-bottom: 24px; +} +.site-body-left-column-site-logo img { + height: 25px; +} +.theme-light .site-body-left-column-site-logo { + filter: invert(1) hue-rotate(180deg); } -span[src$="#interface"] img, -img[src$="#interface"] { - border: 1px solid var(--background-modifier-border); - box-shadow: 0px 0.5px 0.9px rgba(0, 0, 0, 0.021), - 0px 1.3px 2.5px rgba(0, 0, 0, 0.03), - 0px 3px 6px rgba(0, 0, 0, 0.039), - 0px 10px 20px rgba(0, 0, 0, 0.06); - margin-top: 10px; - margin-bottom: 15px; - border-radius: var(--radius-m); +.site-header-logo { + display: flex; + align-items: center; +} +.site-header-logo img { + height: 25px; +} +.theme-light .site-header-logo { + filter: invert(1) hue-rotate(180deg); } -span[src$="#outline"] img, -img[src$="#outline"] { - border: 1px solid var(--background-modifier-border); +.site-body-left-column-site-name { + display: none; +} + +.theme-dark { + --color-base-00: #151515; + --color-base-20: #222222; + /* Adds proper alignment to icons */ +} +.theme-dark img[src*=lucide], .theme-dark img[src*=obsidian-icon] { + filter: invert(1); /* Handles icon inversion in dark mode */ } /* Adds proper alignment to icons */ span[src$="#icon"] img, img[src$="#icon"] { - vertical-align: text-bottom; - margin-left: -0.1em; - margin-right: -0.1em; - border: none; - border-radius: 0; + vertical-align: text-bottom; + margin-left: -0.1em; + margin-right: -0.1em; + border: none; + border-radius: 0; } -.site-body-left-column-site-logo { - text-align: left; - margin-bottom: 24px; -} - -.site-header-logo { - display: flex; - align-items: center; +img { + border-radius: 4px; } -.site-header-logo img, -.site-body-left-column-site-logo img { - height: 25px; +span[src$="#interface"] img, +img[src$="#interface"] { + border: 1px solid var(--background-modifier-border); + box-shadow: 0 0.5px 0.9px rgba(0, 0, 0, 0.021), 0 1.3px 2.5px rgba(0, 0, 0, 0.03), 0 3px 6px rgba(0, 0, 0, 0.039), 0 10px 20px rgba(0, 0, 0, 0.06); + margin-top: 10px; + margin-bottom: 15px; + border-radius: var(--radius-m); } -.theme-light .site-header-logo, -.theme-light .site-body-left-column-site-logo { - filter: invert(1) hue-rotate(180deg); +span[src$="#outline"] img, +img[src$="#outline"] { + border: 1px solid var(--background-modifier-border); } -.site-body-left-column-site-name { - display: none; +.mobile-navbar-tabs-action { + /* Mobile Tab Switcher*/ + align-items: center; + border-radius: var(--clickable-icon-radius); + border: 2px solid var(--icon-color); + display: flex; + font-size: calc(var(--icon-size) * 0.6); + font-weight: var(--bold-weight); + justify-content: center; + height: 20px; + width: var(--icon-size); +} + +.hide-title { + /* Hides page headers in Publish, use H1 if needed */ + /* Use cssclasses: hide-title */ } - -/* Hides page headers in Publish, use H1 if needed */ .hide-title .page-header { - display: none; + display: none; } - .hide-title.markdown-preview-view div:nth-child(4) h1 { - margin-top: 0.25em; - font-variant: var(--page-title-variant); - letter-spacing: -0.015em; - line-height: var(--page-title-line-height); - font-size: var(--page-title-size); - color: var(--page-title-color); - font-weight: var(--page-title-weight); - font-style: var(--page-title-style); - font-family: var(--page-title-font); - border: none; + margin-top: 0.25em; + font-variant: var(--page-title-variant); + letter-spacing: -0.015em; + line-height: var(--page-title-line-height); + font-size: var(--page-title-size); + color: var(--page-title-color); + font-weight: var(--page-title-weight); + font-style: var(--page-title-style); + font-family: var(--page-title-font); + border: none; } -/* Kepano's List Cards */ .list-cards { - --list-cards-template: repeat(2, minmax(0, 1fr)); + /* Kepano's List Cards from minimal */ + /* Use cssclasses: list-cards */ + --list-cards-template: repeat(2, minmax(0, 1fr)); } - .list-cards div > ul { - --link-color: var(--text-normal); - --link-unresolved-color: var(--text-muted); - --link-decoration: none; - --link-decoration-hover: none; - --link-external-color: var(--text-normal); - --link-external-decoration: none; - --link-external-decoration-hover: none; - display: grid; - gap: 8px; - grid-template-columns: var(--list-cards-template); - padding: 0; + --link-color: var(--text-normal); + --link-unresolved-color: var(--text-muted); + --link-decoration: none; + --link-decoration-hover: none; + --link-external-color: var(--text-normal); + --link-external-decoration: none; + --link-external-decoration-hover: none; + display: grid; + gap: 8px; + grid-template-columns: var(--list-cards-template); + padding: 0; } - .list-cards div > ul > li { - display: flex; - border-radius: var(--radius-s); - border: 1px solid var(--color-base-25); - flex-wrap: wrap; + display: flex; + border-radius: var(--radius-s); + border: 1px solid var(--color-base-25); + flex-wrap: wrap; } - .list-cards div > ul > li a { - flex-grow: 0; + flex-grow: 0; } - .list-cards div > ul > li a:after { - content: ""; - flex-basis: 100%; - height: 0; + content: ""; + flex-basis: 100%; + height: 0; } - -.list-cards div ul > li a { - flex-grow: 1; - padding: 16px; - font-weight: var(--font-semibold); - background: none; +.list-cards div > ul > li a { + flex-grow: 1; + padding: 16px; + font-weight: var(--font-semibold); + background: none; } - -.list-cards div ul > li:hover { - border-color: var(--color-base-35); +.list-cards div > ul > li a:hover { + border-color: var(--color-base-35); } - -.theme-dark .list-cards div ul > li { - background-color: var(--background-secondary); +.list-cards div > ul ul { + display: block; + width: 100%; + color: var(--text-muted); + font-size: var(--font-smaller); + margin-top: -8px; + padding: 0 16px 16px; } - -.list-cards div ul ul { - display: block; - width: 100%; - color: var(--text-muted); - font-size: var(--font-smaller); - margin-top: -8px; - padding: 0 16px 16px; +.list-cards div > ul ul > li { + display: block; } - -.list-cards div ul ul > li { - display: block; +.theme-dark .list-cards div ul > li { + background-color: var(--background-secondary); } -/* App icons */ .list-cards .icon-app { - display: inline-block; - align-self: center; - left: 16px; - width: 24px; - height: 24px; - position: absolute; - background-repeat: no-repeat; - background-size: 24px 24px; - background-position: center; + display: inline-block; + align-self: center; + left: 16px; + width: 24px; + height: 24px; + position: absolute; + background-repeat: no-repeat; + background-size: 24px 24px; + background-position: center; } - .list-cards .icon-app + a { - padding-left: 52px; - align-self: center; - line-height: 1.15; + padding-left: 52px; + align-self: center; + line-height: 1.15; } .icon-app.icon-evernote { - background-image: url("data:image/svg+xml,%3Csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 163 190'%3E%3Cpath d='M50.8 42.7c0 1.8-.1 5-2 7-2 2-5.2 2-7 2H21.5c-5.9 0-9.3 0-11.7.4-1.2.2-2.8.8-3.6 1.1-.3.2-.3 0-.2-.2L52 6.3c.2-.2.3-.2.2.2-.4.7-1 2.3-1.1 3.6-.4 2.3-.4 5.8-.4 11.6v21ZM93.7 184a23 23 0 0 1-11-19.5c0-13 10.6-23.8 23.9-23.8A7 7 0 0 1 110 154a9 9 0 0 1-2.7 1c-.7.1-3.7.5-5.1 1.7a7.3 7.3 0 0 0-2.9 5.5c0 2.4 1 4.6 2.5 6.2a15 15 0 0 0 10.7 4.4c10.7 0 19.4-8.7 19.4-19.4 0-9.6-6.5-18-15-21.9-1.2-.6-3.3-1-5.1-1.5l-4.8-.8c-6.6-.8-23.1-6-24.2-20.7 0 0-4.9 22-14.6 28a21.1 21.1 0 0 1-7 1.7c-16 1-32.9-4-44.5-16 0 0-7.9-6.4-12-24.5-1-4.4-2.8-12.3-4-19.7-.4-2.7-.5-4.7-.7-6.6 0-7.7 4.7-13 10.7-13.7h32.1c5.5 0 8.7-1.4 10.7-3.3 2.7-2.5 3.3-6.1 3.3-10.4V10.7C57.6 4.9 62.8 0 70.5 0h3.8l5.2.3 4.2 1c9.6 2.3 11.7 12 11.7 12l27.2 4.8c8.7 1.6 30 3 34.2 24.6 9.6 51.3 3.7 101 3.3 101-6.8 48.5-47 46.1-47 46.1-8.7 0-15.2-2.8-19.4-5.8Zm36.2-103.1c-5.2-.5-9.6 1.6-11.2 5.5-.3.8-.7 1.7-.5 2.2.2.5.5.6.8.8 1.9 1 5 1.4 9.6 1.9s7.7.8 9.8.5c.3 0 .6-.2.9-.7.3-.4.2-1.4.2-2.2-.7-4.4-4.5-7.4-9.6-8Z' fill='%2300A82D'%3E%3C/path%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 163 190'%3E%3Cpath d='M50.8 42.7c0 1.8-.1 5-2 7-2 2-5.2 2-7 2H21.5c-5.9 0-9.3 0-11.7.4-1.2.2-2.8.8-3.6 1.1-.3.2-.3 0-.2-.2L52 6.3c.2-.2.3-.2.2.2-.4.7-1 2.3-1.1 3.6-.4 2.3-.4 5.8-.4 11.6v21ZM93.7 184a23 23 0 0 1-11-19.5c0-13 10.6-23.8 23.9-23.8A7 7 0 0 1 110 154a9 9 0 0 1-2.7 1c-.7.1-3.7.5-5.1 1.7a7.3 7.3 0 0 0-2.9 5.5c0 2.4 1 4.6 2.5 6.2a15 15 0 0 0 10.7 4.4c10.7 0 19.4-8.7 19.4-19.4 0-9.6-6.5-18-15-21.9-1.2-.6-3.3-1-5.1-1.5l-4.8-.8c-6.6-.8-23.1-6-24.2-20.7 0 0-4.9 22-14.6 28a21.1 21.1 0 0 1-7 1.7c-16 1-32.9-4-44.5-16 0 0-7.9-6.4-12-24.5-1-4.4-2.8-12.3-4-19.7-.4-2.7-.5-4.7-.7-6.6 0-7.7 4.7-13 10.7-13.7h32.1c5.5 0 8.7-1.4 10.7-3.3 2.7-2.5 3.3-6.1 3.3-10.4V10.7C57.6 4.9 62.8 0 70.5 0h3.8l5.2.3 4.2 1c9.6 2.3 11.7 12 11.7 12l27.2 4.8c8.7 1.6 30 3 34.2 24.6 9.6 51.3 3.7 101 3.3 101-6.8 48.5-47 46.1-47 46.1-8.7 0-15.2-2.8-19.4-5.8Zm36.2-103.1c-5.2-.5-9.6 1.6-11.2 5.5-.3.8-.7 1.7-.5 2.2.2.5.5.6.8.8 1.9 1 5 1.4 9.6 1.9s7.7.8 9.8.5c.3 0 .6-.2.9-.7.3-.4.2-1.4.2-2.2-.7-4.4-4.5-7.4-9.6-8Z' fill='%2300A82D'%3E%3C/path%3E%3C/svg%3E"); } - -.theme-dark .icon-app.icon-onenote { - filter: brightness(1.7) saturate(0.7); +.theme-dark .icon-app.icon-evernote { + filter: brightness(1.7) saturate(0.7); } - .icon-app.icon-onenote { - background-image: url("data:image/svg+xml,%3Csvg fill='%237F2DA6' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M22 42.66h17.2a3.46 3.46 0 0 0 3.26-2.3h1.35a3.46 3.46 0 0 0 3.46-3.47v-5.76c0-.85-.31-1.67-.88-2.3.57-.63.88-1.46.88-2.31v-5.77c0-.85-.31-1.67-.88-2.3.57-.63.88-1.45.88-2.3v-5.77a3.46 3.46 0 0 0-3.46-3.46h-1.35a3.46 3.46 0 0 0-3.26-2.3H22v2.3h17.2a1.15 1.15 0 0 1 1.15 1.15v1.15h3.46a1.15 1.15 0 0 1 1.16 1.16v5.76a1.15 1.15 0 0 1-1.16 1.16h-3.46v21.9a1.15 1.15 0 0 1-1.15 1.15H22v2.31Zm22.88-5.32c.06-.15.1-.3.09-.45v-5.76a1.15 1.15 0 0 0-1.16-1.15h-1.15v8.07h1.15a1.15 1.15 0 0 0 1.07-.71Zm0-10.38c.06-.14.09-.29.09-.44v-5.77a1.15 1.15 0 0 0-1.16-1.15h-1.15v8.07h1.15a1.15 1.15 0 0 0 1.07-.7Z'%3E%3C/path%3E%3Cpath d='M27 10.38h8.74v2.3H27v-2.3Zm0 6.91h8.74V15H27v2.29Zm0 4.62h8.74V19.6H27v2.31Zm0 4.6h8.74v-2.3H27v2.3Zm0 4.62h8.74v-2.3H27v2.3Zm0 4.61h8.74v-2.3H27v2.3Z'%3E%3C/path%3E%3Cpath d='M27 10.38h8.74v2.3H27v-2.3Zm0 6.91h8.74V15H27v2.29Zm0 4.62h8.74V19.6H27v2.31Zm0 4.6h8.74v-2.3H27v2.3Zm0 4.62h8.74v-2.3H27v2.3Zm0 4.61h8.74v-2.3H27v2.3Z'%3E%3C/path%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0 5.76 27.67 0v47.27L0 41.51V5.76Zm17.58 21.62V13.84l3.75-.57v20.16l-4.15-.23-6.8-14.23v13.79l-3.46-.2V14.42l3.46-.3s7.12 13.09 7.2 13.26Z'%3E%3C/path%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg fill='%237F2DA6' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M22 42.66h17.2a3.46 3.46 0 0 0 3.26-2.3h1.35a3.46 3.46 0 0 0 3.46-3.47v-5.76c0-.85-.31-1.67-.88-2.3.57-.63.88-1.46.88-2.31v-5.77c0-.85-.31-1.67-.88-2.3.57-.63.88-1.45.88-2.3v-5.77a3.46 3.46 0 0 0-3.46-3.46h-1.35a3.46 3.46 0 0 0-3.26-2.3H22v2.3h17.2a1.15 1.15 0 0 1 1.15 1.15v1.15h3.46a1.15 1.15 0 0 1 1.16 1.16v5.76a1.15 1.15 0 0 1-1.16 1.16h-3.46v21.9a1.15 1.15 0 0 1-1.15 1.15H22v2.31Zm22.88-5.32c.06-.15.1-.3.09-.45v-5.76a1.15 1.15 0 0 0-1.16-1.15h-1.15v8.07h1.15a1.15 1.15 0 0 0 1.07-.71Zm0-10.38c.06-.14.09-.29.09-.44v-5.77a1.15 1.15 0 0 0-1.16-1.15h-1.15v8.07h1.15a1.15 1.15 0 0 0 1.07-.7Z'%3E%3C/path%3E%3Cpath d='M27 10.38h8.74v2.3H27v-2.3Zm0 6.91h8.74V15H27v2.29Zm0 4.62h8.74V19.6H27v2.31Zm0 4.6h8.74v-2.3H27v2.3Zm0 4.62h8.74v-2.3H27v2.3Zm0 4.61h8.74v-2.3H27v2.3Z'%3E%3C/path%3E%3Cpath d='M27 10.38h8.74v2.3H27v-2.3Zm0 6.91h8.74V15H27v2.29Zm0 4.62h8.74V19.6H27v2.31Zm0 4.6h8.74v-2.3H27v2.3Zm0 4.62h8.74v-2.3H27v2.3Zm0 4.61h8.74v-2.3H27v2.3Z'%3E%3C/path%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0 5.76 27.67 0v47.27L0 41.51V5.76Zm17.58 21.62V13.84l3.75-.57v20.16l-4.15-.23-6.8-14.23v13.79l-3.46-.2V14.42l3.46-.3s7.12 13.09 7.2 13.26Z'%3E%3C/path%3E%3C/svg%3E"); } - .icon-app.icon-google-keep { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 88'%3E%3Cpath d='m42 22 12.06 2.28L64 22 42 0l-3.03 10.43Z' fill='%23f29900'%3E%3C/path%3E%3Cpath d='M42 22V0H6a6 6 0 0 0-6 6v76a6 6 0 0 0 6 6h52a6 6 0 0 0 6-6V22Z' fill='%23fbbc04'%3E%3C/path%3E%3Cpath d='M39 64H25v-5h14Zm-.07-10H25.07a13 13 0 1 1 13.85 0z' fill='%23fff'%3E%3C/path%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 88'%3E%3Cpath d='m42 22 12.06 2.28L64 22 42 0l-3.03 10.43Z' fill='%23f29900'%3E%3C/path%3E%3Cpath d='M42 22V0H6a6 6 0 0 0-6 6v76a6 6 0 0 0 6 6h52a6 6 0 0 0 6-6V22Z' fill='%23fbbc04'%3E%3C/path%3E%3Cpath d='M39 64H25v-5h14Zm-.07-10H25.07a13 13 0 1 1 13.85 0z' fill='%23fff'%3E%3C/path%3E%3C/svg%3E"); } - .icon-app.icon-apple-notes { - border-radius: 7px; - border: 1px solid var(--background-modifier-border-hover); - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='120' height='120' viewBox='0 0 120 120'%3E%3Cdefs%3E%3ClinearGradient id='e' x1='50%25' x2='50%25' y1='0%25' y2='100%25'%3E%3Cstop offset='0%25' stop-color='%23F4D87E'%3E%3C/stop%3E%3Cstop offset='100%25' stop-color='%23F5C52C'%3E%3C/stop%3E%3C/linearGradient%3E%3Cfilter id='c' width='110.2%25' height='146.7%25' x='-5.1%25' y='-16.7%25' filterUnits='objectBoundingBox'%3E%3CfeOffset dy='2' in='SourceAlpha' result='shadowOffsetOuter1'%3E%3C/feOffset%3E%3CfeGaussianBlur in='shadowOffsetOuter1' result='shadowBlurOuter1' stdDeviation='2'%3E%3C/feGaussianBlur%3E%3CfeColorMatrix in='shadowBlurOuter1' values='0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0'%3E%3C/feColorMatrix%3E%3C/filter%3E%3Crect id='a' width='120' height='120' x='0' y='0' rx='28'%3E%3C/rect%3E%3Cpath id='d' d='M-9 0h137v30H-9z'%3E%3C/path%3E%3C/defs%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cmask id='b' fill='%23fff'%3E%3Cuse xlink:href='%23a'%3E%3C/use%3E%3C/mask%3E%3Cuse fill='%23FFF' xlink:href='%23a'%3E%3C/use%3E%3Cg mask='url(%23b)'%3E%3Cuse fill='%23000' filter='url(%23c)' xlink:href='%23d'%3E%3C/use%3E%3Cuse fill='url(%23e)' xlink:href='%23d'%3E%3C/use%3E%3C/g%3E%3Cpath fill='%23C7C5C9' d='M0 59h120v2H0zM0 89h120v2H0z' mask='url(%23b)'%3E%3C/path%3E%3Cg fill='%23C2C0C4' mask='url(%23b)'%3E%3Cg transform='translate(0 35)'%3E%3Ccircle cx='11.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='16.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='21.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='26.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='31.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='36.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='41.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='46.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='51.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='56.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='61.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='66.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='71.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='76.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='81.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='86.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='91.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='96.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='101.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='106.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='111.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='116.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='6.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='1.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + border-radius: 7px; + border: 1px solid var(--background-modifier-border-hover); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='120' height='120' viewBox='0 0 120 120'%3E%3Cdefs%3E%3ClinearGradient id='e' x1='50%25' x2='50%25' y1='0%25' y2='100%25'%3E%3Cstop offset='0%25' stop-color='%23F4D87E'%3E%3C/stop%3E%3Cstop offset='100%25' stop-color='%23F5C52C'%3E%3C/stop%3E%3C/linearGradient%3E%3Cfilter id='c' width='110.2%25' height='146.7%25' x='-5.1%25' y='-16.7%25' filterUnits='objectBoundingBox'%3E%3CfeOffset dy='2' in='SourceAlpha' result='shadowOffsetOuter1'%3E%3C/feOffset%3E%3CfeGaussianBlur in='shadowOffsetOuter1' result='shadowBlurOuter1' stdDeviation='2'%3E%3C/feGaussianBlur%3E%3CfeColorMatrix in='shadowBlurOuter1' values='0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0'%3E%3C/feColorMatrix%3E%3C/filter%3E%3Crect id='a' width='120' height='120' x='0' y='0' rx='28'%3E%3C/rect%3E%3Cpath id='d' d='M-9 0h137v30H-9z'%3E%3C/path%3E%3C/defs%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cmask id='b' fill='%23fff'%3E%3Cuse xlink:href='%23a'%3E%3C/use%3E%3C/mask%3E%3Cuse fill='%23FFF' xlink:href='%23a'%3E%3C/use%3E%3Cg mask='url(%23b)'%3E%3Cuse fill='%23000' filter='url(%23c)' xlink:href='%23d'%3E%3C/use%3E%3Cuse fill='url(%23e)' xlink:href='%23d'%3E%3C/use%3E%3C/g%3E%3Cpath fill='%23C7C5C9' d='M0 59h120v2H0zM0 89h120v2H0z' mask='url(%23b)'%3E%3C/path%3E%3Cg fill='%23C2C0C4' mask='url(%23b)'%3E%3Cg transform='translate(0 35)'%3E%3Ccircle cx='11.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='16.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='21.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='26.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='31.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='36.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='41.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='46.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='51.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='56.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='61.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='66.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='71.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='76.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='81.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='86.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='91.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='96.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='101.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='106.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='111.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='116.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='6.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='1.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); } - .icon-app.icon-bear { - border: 1px solid white; - border-radius: 50px; - background-color: white; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Cpath fill='%23DD4C4F' fill-rule='evenodd' d='M50 2a50 50 0 0 1 18.04 96.65c-1.5-2.32-2.62-4-2.85-4.33l-.04-.06s-8.1-12.53-8.71-20.7c-1-13.51 23.22.03 29.04-21.5 1.36-5.04.04-7.23-3.96-6.6-24.58-6.58-14.05-17.8-40.9-15.07-3.35-3.6-6.83-5.39-10.44-5.39-4.36 0-3.33 10.28-3.33 10.28-7.73 8.04-14.42 22-20.05 41.9A50 50 0 0 1 50 2Z'/%3E%3C/svg%3E"); + border: 1px solid white; + border-radius: 50px; + background-color: white; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Cpath fill='%23DD4C4F' fill-rule='evenodd' d='M50 2a50 50 0 0 1 18.04 96.65c-1.5-2.32-2.62-4-2.85-4.33l-.04-.06s-8.1-12.53-8.71-20.7c-1-13.51 23.22.03 29.04-21.5 1.36-5.04.04-7.23-3.96-6.6-24.58-6.58-14.05-17.8-40.9-15.07-3.35-3.6-6.83-5.39-10.44-5.39-4.36 0-3.33 10.28-3.33 10.28-7.73 8.04-14.42 22-20.05 41.9A50 50 0 0 1 50 2Z'/%3E%3C/svg%3E"); } - .icon-app.icon-notion { - background-image: url("data:image/svg+xml,%3Csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 29 30'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M18.4 0 1.8 1.4c-1.3.1-1.8 1-1.8 2v18.2c0 .8.3 1.5 1 2.5l3.9 5c.6.9 1.2 1 2.4 1l19.3-1.2c1.6 0 2.1-.9 2.1-2.1V6.2c0-.7-.2-.9-1-1.4l-.2-.1L22.2.9C21 0 20.4 0 18.4.1ZM7.8 6c-1.6 0-2 0-2.8-.6L2.7 3.5c-.3-.3-.1-.6.4-.6l16-1.2c1.3-.1 2 .4 2.6.8l2.7 2c.1 0 .4.4 0 .4L8 5.9h-.2ZM5.9 26.5V9c.1-.6.3-1 1.1-1l18.9-1c.6-.1 1 .3 1 1v17.3c0 .8-.2 1.4-1.2 1.5l-18.1 1c-1 0-1.6-.3-1.6-1.2ZM24 10c0 .6 0 1-.6 1.2l-.9.1v12.9c-.7.4-1.4.6-2 .6-1 0-1.2-.3-1.9-1.2l-5.7-9v8.7l1.8.4s0 1.1-1.4 1.1l-4 .2c-.2-.2 0-.8.4-.9l1-.3V12.3l-1.5-.1c0-.5.2-1.3 1-1.3l4.3-.3 6 9v-8l-1.5-.2c-.1-.6.3-1 .9-1.1l4-.3Z' fill='black'%3E%3C/path%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 29 30'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M18.4 0 1.8 1.4c-1.3.1-1.8 1-1.8 2v18.2c0 .8.3 1.5 1 2.5l3.9 5c.6.9 1.2 1 2.4 1l19.3-1.2c1.6 0 2.1-.9 2.1-2.1V6.2c0-.7-.2-.9-1-1.4l-.2-.1L22.2.9C21 0 20.4 0 18.4.1ZM7.8 6c-1.6 0-2 0-2.8-.6L2.7 3.5c-.3-.3-.1-.6.4-.6l16-1.2c1.3-.1 2 .4 2.6.8l2.7 2c.1 0 .4.4 0 .4L8 5.9h-.2ZM5.9 26.5V9c.1-.6.3-1 1.1-1l18.9-1c.6-.1 1 .3 1 1v17.3c0 .8-.2 1.4-1.2 1.5l-18.1 1c-1 0-1.6-.3-1.6-1.2ZM24 10c0 .6 0 1-.6 1.2l-.9.1v12.9c-.7.4-1.4.6-2 .6-1 0-1.2-.3-1.9-1.2l-5.7-9v8.7l1.8.4s0 1.1-1.4 1.1l-4 .2c-.2-.2 0-.8.4-.9l1-.3V12.3l-1.5-.1c0-.5.2-1.3 1-1.3l4.3-.3 6 9v-8l-1.5-.2c-.1-.6.3-1 .9-1.1l4-.3Z' fill='black'%3E%3C/path%3E%3C/svg%3E"); } - .icon-app.icon-html { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='1.75' stroke-linecap='round' stroke-linejoin='round' icon-name='code-2' class='lucide lucide-code-2 icon-lg text-gray-700 icon'%3E%3Cpath d='m18 16 4-4-4-4'%3E%3C/path%3E%3Cpath d='m6 8-4 4 4 4'%3E%3C/path%3E%3Cpath d='m14.5 4-5 16'%3E%3C/path%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='1.75' stroke-linecap='round' stroke-linejoin='round' icon-name='code-2' class='lucide lucide-code-2 icon-lg text-gray-700 icon'%3E%3Cpath d='m18 16 4-4-4-4'%3E%3C/path%3E%3Cpath d='m6 8-4 4 4 4'%3E%3C/path%3E%3Cpath d='m14.5 4-5 16'%3E%3C/path%3E%3C/svg%3E"); } - .icon-app.icon-md { - opacity: 0.4; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='1.25' stroke-linecap='round' stroke-linejoin='round' class='lucide lucide-file-text'%3E%3Cpath d='M14.5 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7.5L14.5 2z'/%3E%3Cpolyline points='14 2 14 8 20 8'/%3E%3Cline x1='16' x2='8' y1='13' y2='13'/%3E%3Cline x1='16' x2='8' y1='17' y2='17'/%3E%3Cline x1='10' x2='8' y1='9' y2='9'/%3E%3C/svg%3E"); + opacity: 0.4; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='1.25' stroke-linecap='round' stroke-linejoin='round' class='lucide lucide-file-text'%3E%3Cpath d='M14.5 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7.5L14.5 2z'/%3E%3Cpolyline points='14 2 14 8 20 8'/%3E%3Cline x1='16' x2='8' y1='13' y2='13'/%3E%3Cline x1='16' x2='8' y1='17' y2='17'/%3E%3Cline x1='10' x2='8' y1='9' y2='9'/%3E%3C/svg%3E"); } - .icon-app.icon-roam { - background-image: url("data:image/svg+xml,%3Csvg fill='black' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M11.1 0a12 12 0 1 0 11.7 17.3 12 12 0 0 0-2.5-14A11.8 11.8 0 0 0 11.1 0zM16 2.6c1 .4 2 1 3 2 .6.6 1.3 1.4 1.3 1.6l-1.8.7v-.2l-.1-.3a77.4 77.4 0 0 0-3.4 2h-.2c-.1-.2-.2-.3-.3-.1l-.1.3v.2l-.8.5-1 .4h-.2V8.2a82.1 82.1 0 0 1 .4-4.1c0-1.1.2-1.3 1.3-1.4h.6l.1-.2.4-.2.8.3zm-7.1 0 .1.2h.7l.9.1c.3.2.5.5.5 1.2v.5h.4V10l-.2.2a3 3 0 0 0-1 .9l-.1.2H4.9V11H3.7l-.4-.6c-.3-.5-.4-.6-.7-.8-.4-.3-.4-.2-.2-1a9.8 9.8 0 0 1 6.3-6.2l.2.2zm12.2 5 .7 1.7-.3.2c-.4.2-.4.3-.4.5s-.2.4-.6.7l-.3.3h-1v.3h-2.8v-.9l-.3-.4-.3-.4a55 55 0 0 1 4.8-2.8l.5.7zm-5.6 3 .5.7h-1.8L14 11l-.2-.4L15 10l.5.7zm-7.3 2.6.4.7-5.2 3.4a6 6 0 0 1-1-2.1c-.2-.9-.3-.8.2-1l.6-.7.4-.6h1.2v-.5h3l.4.8zm1.8-.5.2.3-1 .6-.8-1.1h1.5l.1.2zm9.2 0v.2h.6c.6 0 .5 0 1.2.5v.4c.2.4.2.4.6.5.2 0 .3.2 0 .8a11 11 0 0 1-3.3 4.7c-.6.5-.6.5-.5 0 0-.7 0-1-.3-1.2-.2-.3-.5-.3-1.3.1l-.9.4c-.3 0-.6-.1-.8-.3l-.2-.1.4-.4c.5-.3.7-.7.6-.9-.2-.3-.5-.3-1-.2h-1c-.3-.1-.4-.4-.4-.7 0-.4 0-.4-.2-.7l-.2-.2v-1.8l.4-.3.7-.7.4-.4h5.2v.2zm-7.8 2.1v.8l-.3.2-.3.3.1.3v.6c0 .2-.3.3-.9.2a8.2 8.2 0 0 0-.7-.1c-.7 0-.7.5 0 1.2.2.4.2.4-.2.6-.5.3-.9.3-1.4-.1-.4-.3-.6-.4-1-.4l-.4.2-.1.2v1.4l-1.5-1.3a4 4 0 0 1-1-1.2l1.6-.7v.4l3-1.7a204.3 204.3 0 0 1 3-1.7v.8z'%3E%3C/path%3E%3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg fill='black' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M11.1 0a12 12 0 1 0 11.7 17.3 12 12 0 0 0-2.5-14A11.8 11.8 0 0 0 11.1 0zM16 2.6c1 .4 2 1 3 2 .6.6 1.3 1.4 1.3 1.6l-1.8.7v-.2l-.1-.3a77.4 77.4 0 0 0-3.4 2h-.2c-.1-.2-.2-.3-.3-.1l-.1.3v.2l-.8.5-1 .4h-.2V8.2a82.1 82.1 0 0 1 .4-4.1c0-1.1.2-1.3 1.3-1.4h.6l.1-.2.4-.2.8.3zm-7.1 0 .1.2h.7l.9.1c.3.2.5.5.5 1.2v.5h.4V10l-.2.2a3 3 0 0 0-1 .9l-.1.2H4.9V11H3.7l-.4-.6c-.3-.5-.4-.6-.7-.8-.4-.3-.4-.2-.2-1a9.8 9.8 0 0 1 6.3-6.2l.2.2zm12.2 5 .7 1.7-.3.2c-.4.2-.4.3-.4.5s-.2.4-.6.7l-.3.3h-1v.3h-2.8v-.9l-.3-.4-.3-.4a55 55 0 0 1 4.8-2.8l.5.7zm-5.6 3 .5.7h-1.8L14 11l-.2-.4L15 10l.5.7zm-7.3 2.6.4.7-5.2 3.4a6 6 0 0 1-1-2.1c-.2-.9-.3-.8.2-1l.6-.7.4-.6h1.2v-.5h3l.4.8zm1.8-.5.2.3-1 .6-.8-1.1h1.5l.1.2zm9.2 0v.2h.6c.6 0 .5 0 1.2.5v.4c.2.4.2.4.6.5.2 0 .3.2 0 .8a11 11 0 0 1-3.3 4.7c-.6.5-.6.5-.5 0 0-.7 0-1-.3-1.2-.2-.3-.5-.3-1.3.1l-.9.4c-.3 0-.6-.1-.8-.3l-.2-.1.4-.4c.5-.3.7-.7.6-.9-.2-.3-.5-.3-1-.2h-1c-.3-.1-.4-.4-.4-.7 0-.4 0-.4-.2-.7l-.2-.2v-1.8l.4-.3.7-.7.4-.4h5.2v.2zm-7.8 2.1v.8l-.3.2-.3.3.1.3v.6c0 .2-.3.3-.9.2a8.2 8.2 0 0 0-.7-.1c-.7 0-.7.5 0 1.2.2.4.2.4-.2.6-.5.3-.9.3-1.4-.1-.4-.3-.6-.4-1-.4l-.4.2-.1.2v1.4l-1.5-1.3a4 4 0 0 1-1-1.2l1.6-.7v.4l3-1.7a204.3 204.3 0 0 1 3-1.7v.8z'%3E%3C/path%3E%3C/svg%3E"); } .theme-dark .icon-app.icon-html, .theme-dark .icon-app.icon-md, .theme-dark .icon-app.icon-notion, .theme-dark .icon-app.icon-roam { - filter: invert(1); + filter: invert(1); } -/* Soft Embeds*/ - +.soft-embed { + /* Soft Embeds items */ + /* Use cssclasses: soft-embed */ +} .soft-embed body { - --embed-border-left: none; - --embed-border-right: none; - --embed-padding: var(--size-2-1) var(--size-4-2); + --embed-border-left: none; + --embed-border-right: none; + --embed-padding: var(--size-2-1) var(--size-4-2); } - -.soft-embed .markdown-embed-link, -.soft-embed .file-embed-link { -display: none; +.soft-embed .markdown-embed-link, .soft-embed .file-embed-link { + display: none; } - .soft-embed .markdown-embed { - border-right: none; - border-left: none; - border-radius: var(--radius-l); - position: relative; - padding: 0; + border-right: none; + border-left: none; + border-radius: var(--radius-l); + position: relative; + padding: 0; } - .soft-embed .markdown-embed h2 { -font-size: var(--h3-size); + /* Adjust header 2 size in embeds */ + font-size: var(--h3-size); } - .soft-embed .markdown-embed h3 { - font-size: var(--h4-size); + /* Adjust header 3 size in embeds */ + font-size: var(--h4-size); } - .soft-embed .markdown-embed .markdown-embed-content { - max-height: unset; - overflow: unset; + max-height: unset; + overflow: unset; } - -.soft-embed .markdown-embed .markdown-embed-content > .markdown-preview-view { -overflow-y: unset; +.soft-embed .markdown-embed .markdown-embed-content > .markdown-preview-view { + overflow-y: unset; } - .soft-embed .markdown-embed .markdown-rendered blockquote { - border-left: none; - padding: 0; + border-left: none; + padding: 0; } -/* Select */ .dropdown { - height: var(--input-height); - font-size: var(--font-ui-small); - font-family: inherit; - font-weight: var(--input-font-weight); - color: var(--text-normal); - line-height: var(--line-height-tight); - padding: 0 1.9em 0 .8em; - max-width: 100%; /* useful when width is set to anything other than 100% */ - box-sizing: border-box; - margin: 0; - border: 0; - box-shadow: var(--input-shadow); - border-radius: var(--input-radius); - -webkit-appearance: none; - appearance: none; - background-color: var(--interactive-normal); - background-repeat: no-repeat, repeat; - /* arrow icon position (1em from the right, 50% vertical) , then gradient position*/ - background-position: right .7em top 50%, 0 0; - /* icon size, then gradient */ - background-size: .65em auto, 100%; + /* Styling for the select/dropdown on home page */ + height: var(--input-height); + font-size: var(--font-ui-small); + font-family: inherit; + font-weight: var(--input-font-weight); + color: var(--text-normal); + line-height: var(--line-height-tight); + padding: 0 1.9em 0 0.8em; + max-width: 100%; + box-sizing: border-box; + margin: 0; + border: 0; + box-shadow: var(--input-shadow); + border-radius: var(--input-radius); + -webkit-appearance: none; + appearance: none; + background-color: var(--interactive-normal); + background-repeat: no-repeat, repeat; + background-position: right 0.7em top 50%, 0 0; + background-size: 0.65em auto, 100%; } .dropdown:hover { - box-shadow: var(--input-shadow-hover); - background-color: var(--interactive-hover); + box-shadow: var(--input-shadow-hover); + background-color: var(--interactive-hover); } .dropdown:focus { - box-shadow: 0 0 0px 3px var(--background-modifier-border-focus); - outline: none; + box-shadow: 0 0 0 3px var(--background-modifier-border-focus); + outline: none; } .dropdown { - background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="292.4" height="292.4"%3E%3Cpath fill="%23000" opacity="0.4" d="M287 69.4a17.6 17.6 0 0 0-13-5.4H18.4c-5 0-9.3 1.8-12.9 5.4A17.6 17.6 0 0 0 0 82.2c0 5 1.8 9.3 5.4 12.9l128 127.9c3.6 3.6 7.8 5.4 12.8 5.4s9.2-1.8 12.8-5.4L287 95c3.5-3.5 5.4-7.8 5.4-12.8 0-5-1.9-9.2-5.5-12.8z"/%3E%3C/svg%3E'); + background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="292.4" height="292.4"%3E%3Cpath fill="%23000" opacity="0.4" d="M287 69.4a17.6 17.6 0 0 0-13-5.4H18.4c-5 0-9.3 1.8-12.9 5.4A17.6 17.6 0 0 0 0 82.2c0 5 1.8 9.3 5.4 12.9l128 127.9c3.6 3.6 7.8 5.4 12.8 5.4s9.2-1.8 12.8-5.4L287 95c3.5-3.5 5.4-7.8 5.4-12.8 0-5-1.9-9.2-5.5-12.8z"/%3E%3C/svg%3E'); } .theme-dark .dropdown { - background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="292.4" height="292.4"%3E%3Cpath fill="%23FFF" opacity="0.4" d="M287 69.4a17.6 17.6 0 0 0-13-5.4H18.4c-5 0-9.3 1.8-12.9 5.4A17.6 17.6 0 0 0 0 82.2c0 5 1.8 9.3 5.4 12.9l128 127.9c3.6 3.6 7.8 5.4 12.8 5.4s9.2-1.8 12.8-5.4L287 95c3.5-3.5 5.4-7.8 5.4-12.8 0-5-1.9-9.2-5.5-12.8z"/%3E%3C/svg%3E'); -} - - -/* Add CSS created Icons from Obsidian */ - -/* Mobile Tab Switcher*/ -.mobile-navbar-tabs-action { - align-items: center; - border-radius: var(--clickable-icon-radius); - border: 2px solid var(--icon-color); - display: flex; - font-size: calc(var(--icon-size) * 0.6); - font-weight: var(--bold-weight); - justify-content: center; - height: 20px; - width: var(--icon-size); + background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="292.4" height="292.4"%3E%3Cpath fill="%23FFF" opacity="0.4" d="M287 69.4a17.6 17.6 0 0 0-13-5.4H18.4c-5 0-9.3 1.8-12.9 5.4A17.6 17.6 0 0 0 0 82.2c0 5 1.8 9.3 5.4 12.9l128 127.9c3.6 3.6 7.8 5.4 12.8 5.4s9.2-1.8 12.8-5.4L287 95c3.5-3.5 5.4-7.8 5.4-12.8 0-5-1.9-9.2-5.5-12.8z"/%3E%3C/svg%3E'); } -/* Mobile adjustments */ @media screen and (max-width: 750px) { - .site-header-text { - display: none; - } - .list-cards.list-cards-mobile-full { - --list-cards-template: repeat(1, minmax(0, 1fr)); - } + .site-header-text { + display: none; + } + .list-cards.list-cards-mobile-full { + /* Use cssclasses: list-cards list-cards-mobile-full */ + --list-cards-template: repeat(1, minmax(0, 1fr)); + } } + +/*# sourceMappingURL=publish.css.map */ diff --git a/en/publish.scss b/en/publish.scss new file mode 100644 index 000000000..395b58e87 --- /dev/null +++ b/en/publish.scss @@ -0,0 +1,399 @@ +// General Styling +.site-body-left-column-site-logo { + text-align: left; + margin-bottom: 24px; + + & img { + height: 25px; + } + + .theme-light & { + filter: invert(1) hue-rotate(180deg); + } +} + +.site-header-logo { + display: flex; + align-items: center; + + & img { + height: 25px; + } + + .theme-light & { + filter: invert(1) hue-rotate(180deg); + } +} + +// General Styling +.site-body-left-column-site-logo { + text-align: left; + margin-bottom: 24px; + + & img { + height: 25px; + } + + .theme-light & { + filter: invert(1) hue-rotate(180deg); + } +} + +.site-header-logo { + display: flex; + align-items: center; + + & img { + height: 25px; + } + + .theme-light & { + filter: invert(1) hue-rotate(180deg); + } +} + +.site-body-left-column-site-name { + display: none; +} + +// More specific overrides without cssclasses +// Edits to theme dark color base +.theme-dark { + --color-base-00: #151515; + --color-base-20: #222222; + + // Handle icons needing inversion in dark mode + /* Adds proper alignment to icons */ + & img[src*="lucide"], + & img[src*="obsidian-icon"] { + filter: invert(1); /* Handles icon inversion in dark mode */ + } +} + +// If image has anchor tag icon, apply styling +/* Adds proper alignment to icons */ +span[src$="#icon"] img, +img[src$="#icon"] { + vertical-align: text-bottom; + margin-left: -0.1em; + margin-right: -0.1em; + border: none; + border-radius: 0; +} + +// Add a border to all images + +img { + border-radius: 4px; +} + +// If image has anchor tag interface, apply styling +span[src$="#interface"] img, +img[src$="#interface"] { + border: 1px solid var(--background-modifier-border); + box-shadow: 0 0.5px 0.9px rgba(0, 0, 0, 0.021), + 0 1.3px 2.5px rgba(0, 0, 0, 0.03), + 0 3px 6px rgba(0, 0, 0, 0.039), + 0 10px 20px rgba(0, 0, 0, 0.06); + margin-top: 10px; + margin-bottom: 15px; + border-radius: var(--radius-m); +} + +// If image has anchor tag outline, apply styling +span[src$="#outline"] img, +img[src$="#outline"] { + border: 1px solid var(--background-modifier-border); +} + +// CSS created icons from Obsidian +.mobile-navbar-tabs-action { + /* Mobile Tab Switcher*/ + align-items: center; + border-radius: var(--clickable-icon-radius); + border: 2px solid var(--icon-color); + display: flex; + font-size: calc(var(--icon-size) * 0.6); + font-weight: var(--bold-weight); + justify-content: center; + height: 20px; + width: var(--icon-size); +} + +// CssClasses +// Hide title +.hide-title { + /* Hides page headers in Publish, use H1 if needed */ + /* Use cssclasses: hide-title */ + + & .page-header { + display: none; + } + + &.markdown-preview-view { + div:nth-child(4) h1 { + margin-top: 0.25em; + font-variant: var(--page-title-variant); + letter-spacing: -0.015em; + line-height: var(--page-title-line-height); + font-size: var(--page-title-size); + color: var(--page-title-color); + font-weight: var(--page-title-weight); + font-style: var(--page-title-style); + font-family: var(--page-title-font); + border: none; + } + } +} + +// Base List Cards styling +.list-cards { + /* Kepano's List Cards from minimal */ + /* Use cssclasses: list-cards */ + --list-cards-template: repeat(2, minmax(0, 1fr)); + + div > ul { + --link-color: var(--text-normal); + --link-unresolved-color: var(--text-muted); + --link-decoration: none; + --link-decoration-hover: none; + --link-external-color: var(--text-normal); + --link-external-decoration: none; + --link-external-decoration-hover: none; + display: grid; + gap: 8px; + grid-template-columns: var(--list-cards-template); + padding: 0; + + > li { + display: flex; + border-radius: var(--radius-s); + border: 1px solid var(--color-base-25); + flex-wrap: wrap; + + a { + flex-grow: 0; + + &:after { + content: ""; + flex-basis: 100%; + height: 0; + } + } + + a { + flex-grow: 1; + padding: 16px; + font-weight: var(--font-semibold); + background: none; + + &:hover { + border-color: var(--color-base-35); + } + } + } + + ul { + display: block; + width: 100%; + color: var(--text-muted); + font-size: var(--font-smaller); + margin-top: -8px; + padding: 0 16px 16px; + + > li { + display: block; + } + } + } + + .theme-dark & { + div ul > li { + background-color: var(--background-secondary); + } + } +} + +// List Cards styling with .icon-app also applied +.list-cards { + .icon-app { + display: inline-block; + align-self: center; + left: 16px; + width: 24px; + height: 24px; + position: absolute; + background-repeat: no-repeat; + background-size: 24px 24px; + background-position: center; + + + a { + padding-left: 52px; + align-self: center; + line-height: 1.15; + } + } +} + +// Icon App styling +.icon-app { + // Evernote icon + &.icon-evernote { + background-image: url("data:image/svg+xml,%3Csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 163 190'%3E%3Cpath d='M50.8 42.7c0 1.8-.1 5-2 7-2 2-5.2 2-7 2H21.5c-5.9 0-9.3 0-11.7.4-1.2.2-2.8.8-3.6 1.1-.3.2-.3 0-.2-.2L52 6.3c.2-.2.3-.2.2.2-.4.7-1 2.3-1.1 3.6-.4 2.3-.4 5.8-.4 11.6v21ZM93.7 184a23 23 0 0 1-11-19.5c0-13 10.6-23.8 23.9-23.8A7 7 0 0 1 110 154a9 9 0 0 1-2.7 1c-.7.1-3.7.5-5.1 1.7a7.3 7.3 0 0 0-2.9 5.5c0 2.4 1 4.6 2.5 6.2a15 15 0 0 0 10.7 4.4c10.7 0 19.4-8.7 19.4-19.4 0-9.6-6.5-18-15-21.9-1.2-.6-3.3-1-5.1-1.5l-4.8-.8c-6.6-.8-23.1-6-24.2-20.7 0 0-4.9 22-14.6 28a21.1 21.1 0 0 1-7 1.7c-16 1-32.9-4-44.5-16 0 0-7.9-6.4-12-24.5-1-4.4-2.8-12.3-4-19.7-.4-2.7-.5-4.7-.7-6.6 0-7.7 4.7-13 10.7-13.7h32.1c5.5 0 8.7-1.4 10.7-3.3 2.7-2.5 3.3-6.1 3.3-10.4V10.7C57.6 4.9 62.8 0 70.5 0h3.8l5.2.3 4.2 1c9.6 2.3 11.7 12 11.7 12l27.2 4.8c8.7 1.6 30 3 34.2 24.6 9.6 51.3 3.7 101 3.3 101-6.8 48.5-47 46.1-47 46.1-8.7 0-15.2-2.8-19.4-5.8Zm36.2-103.1c-5.2-.5-9.6 1.6-11.2 5.5-.3.8-.7 1.7-.5 2.2.2.5.5.6.8.8 1.9 1 5 1.4 9.6 1.9s7.7.8 9.8.5c.3 0 .6-.2.9-.7.3-.4.2-1.4.2-2.2-.7-4.4-4.5-7.4-9.6-8Z' fill='%2300A82D'%3E%3C/path%3E%3C/svg%3E"); + + .theme-dark & { + filter: brightness(1.7) saturate(0.7); + } + } + + &.icon-onenote { + background-image: url("data:image/svg+xml,%3Csvg fill='%237F2DA6' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 48 48'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M22 42.66h17.2a3.46 3.46 0 0 0 3.26-2.3h1.35a3.46 3.46 0 0 0 3.46-3.47v-5.76c0-.85-.31-1.67-.88-2.3.57-.63.88-1.46.88-2.31v-5.77c0-.85-.31-1.67-.88-2.3.57-.63.88-1.45.88-2.3v-5.77a3.46 3.46 0 0 0-3.46-3.46h-1.35a3.46 3.46 0 0 0-3.26-2.3H22v2.3h17.2a1.15 1.15 0 0 1 1.15 1.15v1.15h3.46a1.15 1.15 0 0 1 1.16 1.16v5.76a1.15 1.15 0 0 1-1.16 1.16h-3.46v21.9a1.15 1.15 0 0 1-1.15 1.15H22v2.31Zm22.88-5.32c.06-.15.1-.3.09-.45v-5.76a1.15 1.15 0 0 0-1.16-1.15h-1.15v8.07h1.15a1.15 1.15 0 0 0 1.07-.71Zm0-10.38c.06-.14.09-.29.09-.44v-5.77a1.15 1.15 0 0 0-1.16-1.15h-1.15v8.07h1.15a1.15 1.15 0 0 0 1.07-.7Z'%3E%3C/path%3E%3Cpath d='M27 10.38h8.74v2.3H27v-2.3Zm0 6.91h8.74V15H27v2.29Zm0 4.62h8.74V19.6H27v2.31Zm0 4.6h8.74v-2.3H27v2.3Zm0 4.62h8.74v-2.3H27v2.3Zm0 4.61h8.74v-2.3H27v2.3Z'%3E%3C/path%3E%3Cpath d='M27 10.38h8.74v2.3H27v-2.3Zm0 6.91h8.74V15H27v2.29Zm0 4.62h8.74V19.6H27v2.31Zm0 4.6h8.74v-2.3H27v2.3Zm0 4.62h8.74v-2.3H27v2.3Zm0 4.61h8.74v-2.3H27v2.3Z'%3E%3C/path%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M0 5.76 27.67 0v47.27L0 41.51V5.76Zm17.58 21.62V13.84l3.75-.57v20.16l-4.15-.23-6.8-14.23v13.79l-3.46-.2V14.42l3.46-.3s7.12 13.09 7.2 13.26Z'%3E%3C/path%3E%3C/svg%3E"); + } + + &.icon-google-keep { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 88'%3E%3Cpath d='m42 22 12.06 2.28L64 22 42 0l-3.03 10.43Z' fill='%23f29900'%3E%3C/path%3E%3Cpath d='M42 22V0H6a6 6 0 0 0-6 6v76a6 6 0 0 0 6 6h52a6 6 0 0 0 6-6V22Z' fill='%23fbbc04'%3E%3C/path%3E%3Cpath d='M39 64H25v-5h14Zm-.07-10H25.07a13 13 0 1 1 13.85 0z' fill='%23fff'%3E%3C/path%3E%3C/svg%3E"); + } + + &.icon-apple-notes { + border-radius: 7px; + border: 1px solid var(--background-modifier-border-hover); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='120' height='120' viewBox='0 0 120 120'%3E%3Cdefs%3E%3ClinearGradient id='e' x1='50%25' x2='50%25' y1='0%25' y2='100%25'%3E%3Cstop offset='0%25' stop-color='%23F4D87E'%3E%3C/stop%3E%3Cstop offset='100%25' stop-color='%23F5C52C'%3E%3C/stop%3E%3C/linearGradient%3E%3Cfilter id='c' width='110.2%25' height='146.7%25' x='-5.1%25' y='-16.7%25' filterUnits='objectBoundingBox'%3E%3CfeOffset dy='2' in='SourceAlpha' result='shadowOffsetOuter1'%3E%3C/feOffset%3E%3CfeGaussianBlur in='shadowOffsetOuter1' result='shadowBlurOuter1' stdDeviation='2'%3E%3C/feGaussianBlur%3E%3CfeColorMatrix in='shadowBlurOuter1' values='0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0'%3E%3C/feColorMatrix%3E%3C/filter%3E%3Crect id='a' width='120' height='120' x='0' y='0' rx='28'%3E%3C/rect%3E%3Cpath id='d' d='M-9 0h137v30H-9z'%3E%3C/path%3E%3C/defs%3E%3Cg fill='none' fill-rule='evenodd'%3E%3Cmask id='b' fill='%23fff'%3E%3Cuse xlink:href='%23a'%3E%3C/use%3E%3C/mask%3E%3Cuse fill='%23FFF' xlink:href='%23a'%3E%3C/use%3E%3Cg mask='url(%23b)'%3E%3Cuse fill='%23000' filter='url(%23c)' xlink:href='%23d'%3E%3C/use%3E%3Cuse fill='url(%23e)' xlink:href='%23d'%3E%3C/use%3E%3C/g%3E%3Cpath fill='%23C7C5C9' d='M0 59h120v2H0zM0 89h120v2H0z' mask='url(%23b)'%3E%3C/path%3E%3Cg fill='%23C2C0C4' mask='url(%23b)'%3E%3Cg transform='translate(0 35)'%3E%3Ccircle cx='11.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='16.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='21.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='26.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='31.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='36.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='41.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='46.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='51.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='56.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='61.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='66.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='71.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='76.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='81.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='86.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='91.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='96.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='101.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='106.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='111.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='116.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='6.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3Ccircle cx='1.5' cy='1.5' r='1.5'%3E%3C/circle%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E"); + } + + &.icon-bear { + border: 1px solid white; + border-radius: 50px; + background-color: white; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Cpath fill='%23DD4C4F' fill-rule='evenodd' d='M50 2a50 50 0 0 1 18.04 96.65c-1.5-2.32-2.62-4-2.85-4.33l-.04-.06s-8.1-12.53-8.71-20.7c-1-13.51 23.22.03 29.04-21.5 1.36-5.04.04-7.23-3.96-6.6-24.58-6.58-14.05-17.8-40.9-15.07-3.35-3.6-6.83-5.39-10.44-5.39-4.36 0-3.33 10.28-3.33 10.28-7.73 8.04-14.42 22-20.05 41.9A50 50 0 0 1 50 2Z'/%3E%3C/svg%3E"); + } + + &.icon-notion { + background-image: url("data:image/svg+xml,%3Csvg fill='none' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 29 30'%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M18.4 0 1.8 1.4c-1.3.1-1.8 1-1.8 2v18.2c0 .8.3 1.5 1 2.5l3.9 5c.6.9 1.2 1 2.4 1l19.3-1.2c1.6 0 2.1-.9 2.1-2.1V6.2c0-.7-.2-.9-1-1.4l-.2-.1L22.2.9C21 0 20.4 0 18.4.1ZM7.8 6c-1.6 0-2 0-2.8-.6L2.7 3.5c-.3-.3-.1-.6.4-.6l16-1.2c1.3-.1 2 .4 2.6.8l2.7 2c.1 0 .4.4 0 .4L8 5.9h-.2ZM5.9 26.5V9c.1-.6.3-1 1.1-1l18.9-1c.6-.1 1 .3 1 1v17.3c0 .8-.2 1.4-1.2 1.5l-18.1 1c-1 0-1.6-.3-1.6-1.2ZM24 10c0 .6 0 1-.6 1.2l-.9.1v12.9c-.7.4-1.4.6-2 .6-1 0-1.2-.3-1.9-1.2l-5.7-9v8.7l1.8.4s0 1.1-1.4 1.1l-4 .2c-.2-.2 0-.8.4-.9l1-.3V12.3l-1.5-.1c0-.5.2-1.3 1-1.3l4.3-.3 6 9v-8l-1.5-.2c-.1-.6.3-1 .9-1.1l4-.3Z' fill='black'%3E%3C/path%3E%3C/svg%3E"); + } + + &.icon-html { + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='1.75' stroke-linecap='round' stroke-linejoin='round' icon-name='code-2' class='lucide lucide-code-2 icon-lg text-gray-700 icon'%3E%3Cpath d='m18 16 4-4-4-4'%3E%3C/path%3E%3Cpath d='m6 8-4 4 4 4'%3E%3C/path%3E%3Cpath d='m14.5 4-5 16'%3E%3C/path%3E%3C/svg%3E"); + } + + &.icon-md { + opacity: 0.4; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='black' stroke-width='1.25' stroke-linecap='round' stroke-linejoin='round' class='lucide lucide-file-text'%3E%3Cpath d='M14.5 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7.5L14.5 2z'/%3E%3Cpolyline points='14 2 14 8 20 8'/%3E%3Cline x1='16' x2='8' y1='13' y2='13'/%3E%3Cline x1='16' x2='8' y1='17' y2='17'/%3E%3Cline x1='10' x2='8' y1='9' y2='9'/%3E%3C/svg%3E"); + } + + &.icon-roam { + background-image: url("data:image/svg+xml,%3Csvg fill='black' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M11.1 0a12 12 0 1 0 11.7 17.3 12 12 0 0 0-2.5-14A11.8 11.8 0 0 0 11.1 0zM16 2.6c1 .4 2 1 3 2 .6.6 1.3 1.4 1.3 1.6l-1.8.7v-.2l-.1-.3a77.4 77.4 0 0 0-3.4 2h-.2c-.1-.2-.2-.3-.3-.1l-.1.3v.2l-.8.5-1 .4h-.2V8.2a82.1 82.1 0 0 1 .4-4.1c0-1.1.2-1.3 1.3-1.4h.6l.1-.2.4-.2.8.3zm-7.1 0 .1.2h.7l.9.1c.3.2.5.5.5 1.2v.5h.4V10l-.2.2a3 3 0 0 0-1 .9l-.1.2H4.9V11H3.7l-.4-.6c-.3-.5-.4-.6-.7-.8-.4-.3-.4-.2-.2-1a9.8 9.8 0 0 1 6.3-6.2l.2.2zm12.2 5 .7 1.7-.3.2c-.4.2-.4.3-.4.5s-.2.4-.6.7l-.3.3h-1v.3h-2.8v-.9l-.3-.4-.3-.4a55 55 0 0 1 4.8-2.8l.5.7zm-5.6 3 .5.7h-1.8L14 11l-.2-.4L15 10l.5.7zm-7.3 2.6.4.7-5.2 3.4a6 6 0 0 1-1-2.1c-.2-.9-.3-.8.2-1l.6-.7.4-.6h1.2v-.5h3l.4.8zm1.8-.5.2.3-1 .6-.8-1.1h1.5l.1.2zm9.2 0v.2h.6c.6 0 .5 0 1.2.5v.4c.2.4.2.4.6.5.2 0 .3.2 0 .8a11 11 0 0 1-3.3 4.7c-.6.5-.6.5-.5 0 0-.7 0-1-.3-1.2-.2-.3-.5-.3-1.3.1l-.9.4c-.3 0-.6-.1-.8-.3l-.2-.1.4-.4c.5-.3.7-.7.6-.9-.2-.3-.5-.3-1-.2h-1c-.3-.1-.4-.4-.4-.7 0-.4 0-.4-.2-.7l-.2-.2v-1.8l.4-.3.7-.7.4-.4h5.2v.2zm-7.8 2.1v.8l-.3.2-.3.3.1.3v.6c0 .2-.3.3-.9.2a8.2 8.2 0 0 0-.7-.1c-.7 0-.7.5 0 1.2.2.4.2.4-.2.6-.5.3-.9.3-1.4-.1-.4-.3-.6-.4-1-.4l-.4.2-.1.2v1.4l-1.5-1.3a4 4 0 0 1-1-1.2l1.6-.7v.4l3-1.7a204.3 204.3 0 0 1 3-1.7v.8z'%3E%3C/path%3E%3C/svg%3E"); + } +} + +.theme-dark .icon-app.icon-html, +.theme-dark .icon-app.icon-md, +.theme-dark .icon-app.icon-notion, +.theme-dark .icon-app.icon-roam { + filter: invert(1); +} + +// Soft embeds + +.soft-embed { + /* Soft Embeds items */ + /* Use cssclasses: soft-embed */ + body { + --embed-border-left: none; + --embed-border-right: none; + --embed-padding: var(--size-2-1) var(--size-4-2); + } + + & .markdown-embed-link, + & .file-embed-link { + display: none; + } + + & .markdown-embed { + border-right: none; + border-left: none; + border-radius: var(--radius-l); + position: relative; + padding: 0; + + h2 { + /* Adjust header 2 size in embeds */ + font-size: var(--h3-size); + } + + h3 { + /* Adjust header 3 size in embeds */ + font-size: var(--h4-size); + } + + & .markdown-embed-content { + max-height: unset; + overflow: unset; + + > .markdown-preview-view { + overflow-y: unset; + } + } + + & .markdown-rendered { + blockquote { + border-left: none; + padding: 0; + } + } + } +} + + +// Dropdowns +.dropdown { + /* Styling for the select/dropdown on home page */ + height: var(--input-height); + font-size: var(--font-ui-small); + font-family: inherit; + font-weight: var(--input-font-weight); + color: var(--text-normal); + line-height: var(--line-height-tight); + padding: 0 1.9em 0 .8em; + max-width: 100%; + box-sizing: border-box; + margin: 0; + border: 0; + box-shadow: var(--input-shadow); + border-radius: var(--input-radius); + -webkit-appearance: none; + appearance: none; + background-color: var(--interactive-normal); + background-repeat: no-repeat, repeat; + background-position: right .7em top 50%, 0 0; + background-size: .65em auto, 100%; + + &:hover { + box-shadow: var(--input-shadow-hover); + background-color: var(--interactive-hover); + } + + &:focus { + box-shadow: 0 0 0 3px var(--background-modifier-border-focus); + outline: none; + } + + & { + background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="292.4" height="292.4"%3E%3Cpath fill="%23000" opacity="0.4" d="M287 69.4a17.6 17.6 0 0 0-13-5.4H18.4c-5 0-9.3 1.8-12.9 5.4A17.6 17.6 0 0 0 0 82.2c0 5 1.8 9.3 5.4 12.9l128 127.9c3.6 3.6 7.8 5.4 12.8 5.4s9.2-1.8 12.8-5.4L287 95c3.5-3.5 5.4-7.8 5.4-12.8 0-5-1.9-9.2-5.5-12.8z"/%3E%3C/svg%3E'); + } + + .theme-dark & { + background-image: url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="292.4" height="292.4"%3E%3Cpath fill="%23FFF" opacity="0.4" d="M287 69.4a17.6 17.6 0 0 0-13-5.4H18.4c-5 0-9.3 1.8-12.9 5.4A17.6 17.6 0 0 0 0 82.2c0 5 1.8 9.3 5.4 12.9l128 127.9c3.6 3.6 7.8 5.4 12.8 5.4s9.2-1.8 12.8-5.4L287 95c3.5-3.5 5.4-7.8 5.4-12.8 0-5-1.9-9.2-5.5-12.8z"/%3E%3C/svg%3E'); + } +} + +// Mobile specific adjustments + +@media screen and (max-width: 750px) { + .site-header-text { + display: none; + } + .list-cards.list-cards-mobile-full { + /* Use cssclasses: list-cards list-cards-mobile-full */ + --list-cards-template: repeat(1, minmax(0, 1fr)); + } +} From a860cab5b1e5f446924ad31ac7fa657b7ff92f24 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 12:55:48 -0500 Subject: [PATCH 24/54] Add Minor cssclasses change Signed-off-by: Sigrunixia --- en/publish.css | 2 +- en/publish.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/en/publish.css b/en/publish.css index 40fcee287..356fc164e 100644 --- a/en/publish.css +++ b/en/publish.css @@ -314,7 +314,7 @@ img[src$="#outline"] { display: none; } .list-cards.list-cards-mobile-full { - /* Use cssclasses: list-cards list-cards-mobile-full */ + /* Use cssclasses: list-cards-mobile-full */ --list-cards-template: repeat(1, minmax(0, 1fr)); } } diff --git a/en/publish.scss b/en/publish.scss index 395b58e87..e7978359a 100644 --- a/en/publish.scss +++ b/en/publish.scss @@ -393,7 +393,7 @@ img[src$="#outline"] { display: none; } .list-cards.list-cards-mobile-full { - /* Use cssclasses: list-cards list-cards-mobile-full */ + /* Use cssclasses: list-cards-mobile-full */ --list-cards-template: repeat(1, minmax(0, 1fr)); } } From 57138030de2a611730f4cf42ad5c8dd9e2c61099 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 14:56:23 -0500 Subject: [PATCH 25/54] Merge gifting into Obsidian Credit.md Signed-off-by: Sigrunixia --- en/Licenses and payment/Gifting.md | 27 ------------------ en/Licenses and payment/Obsidian Credit.md | 33 ++++++++++++++++++++-- 2 files changed, 31 insertions(+), 29 deletions(-) delete mode 100644 en/Licenses and payment/Gifting.md diff --git a/en/Licenses and payment/Gifting.md b/en/Licenses and payment/Gifting.md deleted file mode 100644 index 0d4ccc291..000000000 --- a/en/Licenses and payment/Gifting.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -aliases: -- Licenses & Payment/Gifting ---- - -Although using Obsidian for personal use is completely free of charge, you can give the gift of Obsidian to someone to help them get an add-on service like [[Introduction to Obsidian Sync|Obsidian Sync]], or to get a [[Commercial licenses]] so they can use Obsidian for work. - -## Give gift credits - -In Obsidian, you don’t gift a particular product, but rather Obsidian Credit that can be used towards anything. It’s like an Obsidian gift card. - -1. If you don’t already have [[Obsidian Credit]], you must first [[Obsidian Credit#Add credit|purchase credit]]. -2. [On your account dashboard](https://obsidian.md/account), under **Payment & billing → Obsidian Credit**, click **Gift**. -3. Follow the instructions to either get a redeem link to send yourself, or have us send an anonymized email to the recipient. -4. Click **Send gift** to complete the gifting. You will be sent an email confirmation. -5. After you send out a gift, you can view it under **Payment & billing → Gift history**. You can see the status of each gift, and cancel the ones that haven’t been redeemed yet. - -## Receiving gift credits - -If you have received a redemption link or an anonymized email, follow these steps to redeem your Obsidian Credit: - -1. Log in or create [your Obsidian account](https://obsidian.md/account). -2. Open the redemption link or click the link in your email. -3. Confirm that you want to receive the credits. -4. The credits will be deposited within your account, ready to be used. - -The purchaser will be notified that you have redeemed the Obsidian Credits. \ No newline at end of file diff --git a/en/Licenses and payment/Obsidian Credit.md b/en/Licenses and payment/Obsidian Credit.md index 6661da0e0..cf509c849 100644 --- a/en/Licenses and payment/Obsidian Credit.md +++ b/en/Licenses and payment/Obsidian Credit.md @@ -1,13 +1,18 @@ --- aliases: -- Licenses & Payment/Obsidian Credit + - Licenses & Payment/Obsidian Credit + - Gifting + - Licenses & Payment/Gifting + - Licenses and Payment/Gifting --- Obsidian Credit is a type of prepaid credit that can be bought in advance and applied toward purchases of all things Obsidian has to offer. Obsidian Credit will be applied before any payment is due, including auto-renewals. -Obsidian Credit can be [[Gifting|gifted]] to other Obsidian users. +Obsidian Credit can be [[#Gifting|gifted]] to other Obsidian users. + +Obsidian Credit is not eligible for a refund per our [[Refund policy]]. ## Add credit @@ -21,3 +26,27 @@ Obsidian Credit can be [[Gifting|gifted]] to other Obsidian users. > > If you plan to cover auto-renewals with your credit, please keep this factor in mind. +## Gifting + +Although using Obsidian for personal use is completely free of charge, you can give the gift of Obsidian to someone to help them get an add-on service like [[Introduction to Obsidian Sync|Obsidian Sync]], or to get a [[Commercial licenses]] so they can use Obsidian for work. + +## Give Obsidian Credit + +In Obsidian, you don't gift a particular product, but rather Obsidian Credit that can be used towards anything. It's like an Obsidian gift card. + +1. If you don't already have [[Obsidian Credit]], you must first [[Obsidian Credit#Add credit|purchase credit]]. +2. [On your account dashboard](https://obsidian.md/account), under **Payment & billing → Obsidian Credit**, click **Gift**. +3. Follow the instructions to either get a redeem link to send yourself, or have us send an anonymized email to the recipient. +4. Click **Send gift** to complete the gifting. You will be sent an email confirmation. +5. After you send out a gift, you can view it under **Payment & billing → Gift history**. You can see the status of each gift, and cancel the ones that haven't been redeemed yet. + +## Receiving Obsidian Credit + +If you have received a redemption link or an anonymized email, follow these steps to redeem your Obsidian Credit: + +1. Log in or create [your Obsidian account](https://obsidian.md/account). +2. Open the redemption link or click the link in your email. +3. Confirm that you want to receive the credits. +4. The credits will be deposited within your account, ready to be used. + +The purchaser will be notified that you have redeemed the Obsidian Credits. \ No newline at end of file From 512df93fee2b90b6dde4daec16c33234c75825d9 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 14:56:46 -0500 Subject: [PATCH 26/54] Update other files for grammar Signed-off-by: Sigrunixia --- .../Education and non-profit discount.md | 8 +++++++- .../Introduction to licenses and payment.md | 6 +++--- en/Licenses and payment/Refund policy.md | 19 +++++++++++++++---- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/en/Licenses and payment/Education and non-profit discount.md b/en/Licenses and payment/Education and non-profit discount.md index 56cd0c744..79be48f39 100644 --- a/en/Licenses and payment/Education and non-profit discount.md +++ b/en/Licenses and payment/Education and non-profit discount.md @@ -3,6 +3,8 @@ aliases: - Student and non-profit discount - Licenses & Payment/Education and non-profit discount - Discounts +cssclasses: + - soft-embed --- Obsidian currently offers two types of discounts: education and non-profit. They both give you 40% off our add-on services, including [[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]]. @@ -41,4 +43,8 @@ If you’re already an early bird, there’s generally no point in applying for **What if my educational or non-profit organization doesn't provide an email address?** In that case, you can send other forms of verification such as student ID card, transcript, or employee ID card to the [[Help and support#Contact Obsidian support|Obsidian support]]. Be sure to include your Obsidian account email address too. Our team will review your application and get back to you. Thank you for your patience! -**If I qualify for a discount but have recently paid for my subscription, what should I do?** Please contact [[Help and support#Contact Obsidian support|Obsidian support]] so we can assess your options. \ No newline at end of file +### Refunds + +![[Refund policy#^discount-then-refund]] + +![[Refund policy#^purchase-then-discount-then-refund]] \ No newline at end of file diff --git a/en/Licenses and payment/Introduction to licenses and payment.md b/en/Licenses and payment/Introduction to licenses and payment.md index 951be756d..637a3717b 100644 --- a/en/Licenses and payment/Introduction to licenses and payment.md +++ b/en/Licenses and payment/Introduction to licenses and payment.md @@ -10,9 +10,9 @@ Obsidian currently offers five items available for purchase to augment your Obsi - [[Introduction to Obsidian Publish|Obsidian Publish]] - Publish notes to the web - [[Commercial licenses]] - - Legally use Obsidian in your workplace + - Use Obsidian in your workplace - [[Obsidian Credit]] - - Purchase and [[Gifting|gift]] Obsidian services + - Purchase and Gift Obsidian services - [[Catalyst license]] - Support development and gain early access to releases @@ -35,7 +35,7 @@ You can view our return policy for these purchases in our [[Refund policy|refund We accept the following payment methods: Stripe, PayPal, WeChat, and AliPay. > [!info] PayPal and fees -> PayPal purchases will be processed in Canadian Dollars (CAD). You may incur a foreign transaction fee from your credit card issuer, and PayPal may charge a currency conversion fee. +> PayPal purchases will be processed in Canadian Dollars (CAD). You may incur a foreign transaction fee from your card issuer, and PayPal may charge a currency conversion fee. After completing your payment, you will receive a receipt from the service through which you made the purchase. diff --git a/en/Licenses and payment/Refund policy.md b/en/Licenses and payment/Refund policy.md index 9bda476bd..f099775cb 100644 --- a/en/Licenses and payment/Refund policy.md +++ b/en/Licenses and payment/Refund policy.md @@ -3,6 +3,8 @@ aliases: - Licenses & Payment/Refund policy - Cancel my subscription - Cancel subscription +cssclasses: + - soft-embed --- We offer full refunds within 7 days of purchase with no questions asked for the following services and licenses: @@ -17,7 +19,7 @@ We offer full refunds within 7 days of purchase with no questions asked for the > > While they give you a number of benefits, they're intended to support the Obsidian development and aren't sold as products. > -> Similarly, we do not offer refunds for Obsidian Credit, as credit can be transferred to another account. +> Similarly, we do not offer refunds for [[Obsidian Credit]], as credit can be transferred to another account. > > Sorry for the inconvenience. @@ -34,8 +36,17 @@ We offer full refunds within 7 days of purchase with no questions asked for the ## Frequently asked questions **What happens if I refund my service?** -If you are refunding an Obsidian Sync or Obsidian Publish subscription, any remote vaults or publish sites are deleted, and can not be retrieved even if you subscribe again. ->[!info] Please note that this does not happen if your [[Sync limitations#How long do you keep my data after my subscription expires?|subscription expires]]. +Refunding an Obsidian Sync or Obsidian Publish subscription results in the deletion of any remote vaults or publish sites, which cannot be retrieved even if you subscribe again. However, your local data on your devices will remain unaffected. -If you are refunding an Obsidian Commercial license, the associated license key will be deactivated. \ No newline at end of file +**What if I miss a payment and my subscription expires? Will I lose my remote vault data?** + +No, your data is retained in such cases for 30 days. If you do not resubscribe within that period, your remote vault or publish site data will be deleted. Your local data will remain unaffected. + +**If I qualify for a discount but have paid for my subscription in the past 7 days, what should I do?** +Please contact [[Help and support#Contact Obsidian support|Obsidian support]] so we can assess your options. +^discount-then-refund + +**I purchased my subscription a few weeks ago and now qualify for a discount. Can I get a partial refund?** +We understand that some may have purchased Sync or Publish without discounts, either due to being unaware of the discount or not qualifying for it at the time. Unfortunately, we do not offer refunds in such cases. However, future renewals will automatically apply the discount if the discount is still valid. +^purchase-then-discount-then-refund \ No newline at end of file From 5c84fb39a225c84fb2202c34f442b86f43043408 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 14:57:13 -0500 Subject: [PATCH 27/54] Quick backup Signed-off-by: Sigrunixia --- en/Teams/Commercial licenses.md | 10 ++-- en/Teams/Install and deploy Obsidian.md | 51 +++++++++++++++++++ en/Teams/Introduction to Teams.md | 17 ++++++- en/Teams/Publishing in a team.md | 7 +++ ...orkplace.md => Security considerations.md} | 33 ++++++++---- en/Teams/Syncing in a team.md | 38 ++++++++++++++ en/publish.css | 3 ++ en/publish.scss | 4 ++ 8 files changed, 148 insertions(+), 15 deletions(-) create mode 100644 en/Teams/Install and deploy Obsidian.md create mode 100644 en/Teams/Publishing in a team.md rename en/Teams/{Manage Obsidian in your workplace.md => Security considerations.md} (55%) create mode 100644 en/Teams/Syncing in a team.md diff --git a/en/Teams/Commercial licenses.md b/en/Teams/Commercial licenses.md index 794bb69ed..175395b1c 100644 --- a/en/Teams/Commercial licenses.md +++ b/en/Teams/Commercial licenses.md @@ -61,7 +61,6 @@ Your PO must include: > [!info] Purchasing a commercial license does not include an [Obsidian Sync](https://obsidian.md/sync) or [Obsidian Publish](https://obsidian.md/publish) subscription. - ### Activate a commercial license To activate a commercial license @@ -101,7 +100,7 @@ If you are a single-person company, then you don't require a commercial license. **I use Obsidian to store all of my knowledge, both personal and professional, because it's difficult to separate them. Do I need a commercial license?** If your notes contain content directly related to work projects or processes for a company with more than one employee, then yes, you need a commercial license. -**I’m still not sure if I need a commercial license. What should I do?** +**I'm still not sure if I need a commercial license. What should I do?** If you still have questions regarding the commercial license requirements, contact [[Help and support#Contact Obsidian support|Obsidian support]] and describe your situation in detail. ### Purchasing process @@ -110,7 +109,7 @@ If you still have questions regarding the commercial license requirements, conta Yes. You and your team may evaluate Obsidian for commercial use for **14** days. You don't need to pay before evaluating. **Are there bulk discounts?** -Yes. If you are purchasing more than 20 seats you may be eligible for bulk pricing. Please contact [[Help and support#Contact Obsidian support|Obsidian support]]. +Yes. If you are purchasing 21 or more seats, you may be eligible for bulk pricing. Please contact [[Help and support#Contact Obsidian support|Obsidian support]]. **Can I buy a license for myself, or do I have to ask my company to buy it for me?** Yes. You can buy a license for yourself by going to your [Account dashboard](https://obsidian.md/account). Most companies allow you to submit an expense report for the purchase. @@ -127,9 +126,12 @@ Yes. You can purchase multiple commercial license seats through your [Account da After purchasing the license, you will receive a license key which you can send to employees to activate their license — see instructions above to activate the license. +### Applying the license + +**Can I use the commercial license I purchased on both my work phone and work computer?** +Yes. The commercial license is charged per seat count, not per device. This means you can use the same license key on all your individual work devices. -### Applying the license **I work in a highly secure environment, in an air-gapped network. How do I apply my commercial license?** In such specialized environments, you don't need to apply the commercial license directly to your installation. However, you must monitor license usage and retain relevant records to ensure compliance with our End User License Agreement (EULA). diff --git a/en/Teams/Install and deploy Obsidian.md b/en/Teams/Install and deploy Obsidian.md new file mode 100644 index 000000000..d686a1cae --- /dev/null +++ b/en/Teams/Install and deploy Obsidian.md @@ -0,0 +1,51 @@ +--- +cssclasses: + - soft-embed +--- + +This page details how to install and manage the Obsidian installation in your workplace. + +## Installing and updating Obsidian + +Download your preferred version of Obsidian from our [GitHub releases page](https://github.com/obsidianmd/obsidian-releases/releases). Each release includes a link to [our changelog](https://obsidian.md/changelog/). + +> [!tip] For Windows users who need a system installer, use the `-allusers.exe` file on the releases page. + +If automatic updates are enabled, future updates will install as allowed. Additionally, we recommend periodically completing [[Update Obsidian#Installer updates|installer updates]] to gain the latest electron updates. + +If you are looking how to limit network access to Obsidian during this process, review [[Security considerations#Network and access|network and access]] instead. + +## Customizing Obsidian + +One of Obsidian's strength lies in its extensibility. With an extensive API and a large community base, Obsidian offers access to numerous community-made plugins, themes, and complementary tools, including Command Line Interfaces (CLIs). + +For security-related questions concerning these subjects, please refer to our [[Security considerations]] page. + +**Configuration folders** +A [[Configuration folder]] is the defined folder that an Obsidian [[Glossary#Vault|vault]] will use to store application settings for that vault. By default, this folder is named `.obsidian` but you are able to [[Configuration folder#Changing your configuration folder|change the configuration folder]] name per your preference. + +We recommend creating a standard template of the configuration folder to be deployed across your team's devices + +**Plugins** +A [[Core plugins|Core plugin]] is an optional feature within the base Obsidian application, created by the Obsidian Team. These features are integrated within the existing codebase. + +A [[Community plugins|Community plugin]] is is a third-party optional featured added to the Obsidian application through the plugin and the Obsidian API, and can be downloaded into the application through the community store. If installing manually, community plugins need to be installed into the `.obsidian/plugins` folder for Obsidian to read them. + +**Themes and snippets** +A [[CSS snippets|Snippet]] is a `.css` file that visually modifies one or more aspects of the Obsidian interface. In some cases, it can also add functional enhancements, such as CSS animations like transitions. To be recognized by Obsidian, snippets must be inserted into `.obsidian/snippets`. + +A [[Themes|Theme]] is a `.css` file that visually alters multiple aspects of the Obsidian interface to create a unified look. Themes, like plugins, can be downloaded from our community store. When installing manually, themes need to be placed into `.obsidian/themes`. + +Many themes utilize the community plugin [Style Settings](https://github.com/mgmeyers/obsidian-style-settings) to further enhance the features and customizability of their theme. + +## Frequently asked questions + +For questions regarding account management and security, please refer to [[Security considerations#Account security|Account security]]. + +### Deployment + +**Can I deploy licenses across multiple installations?** +Currently, we do not support deploying licenses via a deployment script, such as in a `.json` file. If you're interested in this feature for your team, please submit a [feature request](https://forum.obsidian.md/c/feature-requests/8). + +**Can Obsidian lock certain features or configurations via a setting or an application flag?** +No, this capability is not available at this time. If you're interested in this feature for your team, please submit a [feature request](https://forum.obsidian.md/c/feature-requests/8). diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md index 16b6e7ef8..9f1c9665d 100644 --- a/en/Teams/Introduction to Teams.md +++ b/en/Teams/Introduction to Teams.md @@ -12,9 +12,24 @@ Obsidian serves as an excellent note-taking application for individuals, and a c - [[Commercial licenses]] - Determine if you need a license and find purchase information -- [[Manage Obsidian in your workplace]] +- [[Install and deploy Obsidian]] - Install, update, and customize Obsidian - [[Obsidian Sync in a team]] - Use Obsidian Sync with your team - [[Obsidian Publish in a team]] - Use Obsidian Publish with your team + +## Important resources + +- [Purchase our products](https://obsidian.md/pricing) + - Purchase a Commercial license, Sync, or Publish +- [License overview](https://obsidian.md/license) + - Review our license overview in plain English +- [Terms of Service](https://obsidian.md/terms) + - Review our latest Terms of Service +- [Privacy Policy](https://obsidian.md/privacy) + - Review our privacy policy +- [Report a bug](https://forum.obsidian.md/c/bug-reports/7) + - Report an application issue +- [Request a new feature](https://forum.obsidian.md/tags/c/feature-requests/8/commercial) + - Report a feature request \ No newline at end of file diff --git a/en/Teams/Publishing in a team.md b/en/Teams/Publishing in a team.md new file mode 100644 index 000000000..b9eab14e1 --- /dev/null +++ b/en/Teams/Publishing in a team.md @@ -0,0 +1,7 @@ +--- +cssclasses: + - soft-embed +--- +This page details some of the considerations a team of people may have when using Publish. For more information on setting up your publish site, please review [[Introduction to Obsidian Publish]]. + +## \ No newline at end of file diff --git a/en/Teams/Manage Obsidian in your workplace.md b/en/Teams/Security considerations.md similarity index 55% rename from en/Teams/Manage Obsidian in your workplace.md rename to en/Teams/Security considerations.md index ac14326c3..dd477af8a 100644 --- a/en/Teams/Manage Obsidian in your workplace.md +++ b/en/Teams/Security considerations.md @@ -1,20 +1,24 @@ --- -cssClasses: soft-embed +cssclasses: + - soft-embed --- +This page details some of the security information and considerations you may need to know for your team. -This page details how to install and manage the Obsidian installation in your workplace. +Please be sure to read our official [Security](https://obsidian.md/security) page to review our independent audits before reviewing this page. -## Installing and updating Obsidian +## Initial considerations -Download your preferred version of Obsidian from our [GitHub releases page](https://github.com/obsidianmd/obsidian-releases/releases). Each release includes a link to our changelog, detailing the changes. +Obsidian is designed to function primarily as an offline and standalone application. For extensibility, we do allow and encourage community plugins and themes, as well as offer official and unofficial support for syncing services. -For Windows users who need a system installer, use the `-allusers.exe` file on the releases page. +If you are using Obsidian in your team and you do not plan to use community plugins or themes, the security considerations are -If automatic updates are enabled, future updates will install as allowed. We recommend periodically completing [[Update Obsidian#Installer updates|installer updates]] to gain the latest electron updates. +## Plugins and themes ## Network and access -Obsidian is designed to function primarily as an offline application. However, it does make network calls based on the services and features you use. These network connections can be disabled via a domain firewall or application lockdown. +While prioritizing the local-first approach of our application, Obsidian does make network calls based on the services and features you use. These network connections can be disabled via a domain firewall or application lockdown. + +We make our network connections on HTTPS port 443. The following is a list of network connections Obsidian makes. @@ -41,11 +45,20 @@ The following is a list of network connections Obsidian makes. ## Frequently asked questions -**How can I deploy licenses across multiple installations?** -Currently, we do not support deploying licenses via a deployment script, such as in a `.json` file. +### Account security **Does Obsidian support Single Sign-On (SSO)?** Obsidian does not support SSO. In most use cases, Obsidian does not require an account or sign-on in your workplace, unless you are using [[Introduction to Obsidian Publish|Obsidian Publish]] or [[Introduction to Obsidian Sync|Obsidian Sync]]. **Does Obsidian support Multi-Factor Authentication (MFA)?** -Obsidian supports [[2-factor authentication]] (2FA) for Obsidian accounts, but it does not support 2FA for opening and using the base application. Users of [[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]] will be required to confirm their 2FA key when they first log into the application. \ No newline at end of file +Obsidian supports [[2-factor authentication]] (2FA) for Obsidian accounts, but it does not support 2FA for opening and using the base application. Users of [[Introduction to Obsidian Sync|Obsidian Sync]] and [[Introduction to Obsidian Publish|Obsidian Publish]] who have 2FA enabled will be required to confirm their 2FA key when they first log into the application. + +### Assessments and certifications + +**Will you accept security assessments from our company?** +We require a minimum quoted purchase order amount before considering completing a security assessment. These assessments are often time-consuming and may not be applicable to offline applications like Obsidian, which is primarily a cloud-based service. + +However, you can waive this quoted purchase order amount by agreeing to pay a retainer fee. + +**Do you have any recognized certifications related to Information Security or quality standards, such as ISO27001, NIST, COBIT, or other ISO or CSA certifications?** +Not at this time. It may be something we explore in the future, but for now, our focus is on our [security audits]() \ No newline at end of file diff --git a/en/Teams/Syncing in a team.md b/en/Teams/Syncing in a team.md new file mode 100644 index 000000000..2db0c4260 --- /dev/null +++ b/en/Teams/Syncing in a team.md @@ -0,0 +1,38 @@ +--- +cssclasses: + - soft-embed +--- +This page details and pulls together the more important information when considering Obsidian Sync in your workplace or project. + +> [!tip] Haven't set up Obsidian Sync yet? Check out [[Set up Obsidian Sync]] first. + +## Collaboration + +With [Obsidian Sync](app://obsidian.md/Introduction%20to%20Obsidian%20Sync) you can collaborate on a shared vault with your team. + +All collaborators **must have an active Sync subscription** to access a shared vault. Joining a shared vault does not count towards your [vault limit](app://obsidian.md/Sync%20limitations#How%20many%20remote%20vaults%20can%20I%20have?). + +If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync/Security%20and%20privacy), collaborators must enter the encryption password when they set up the vault. + + +![[Collaborate on a shared vault#Manage users|Collaboration]] + +![[Collaborate on a shared vault#Collaborate with your team|Collaboration]] + +![[Collaborate on a shared vault#Limitations|Collaboration]] + +## Security + + +![[Obsidian Sync/Security and privacy#Where do you host the servers for Obsidian Sync?|Security and privacy]] + +![[Obsidian Sync/Security and privacy#What encryption do you use?|Security and privacy]] + +![[Obsidian Sync/Security and privacy#Has Obsidian completed a third-party security audit?|Security and privacy]] + +## Frequently asked questions + +**Do you have an on-premises Sync server?** +Obsidian Sync does not have an on-premises solution at this time. + + diff --git a/en/publish.css b/en/publish.css index 356fc164e..bc16825e5 100644 --- a/en/publish.css +++ b/en/publish.css @@ -148,6 +148,9 @@ img[src$="#outline"] { flex-basis: 100%; height: 0; } +.list-cards div > ul > li a:hover { + border-color: var(--color-base-35); +} .list-cards div > ul > li a { flex-grow: 1; padding: 16px; diff --git a/en/publish.scss b/en/publish.scss index e7978359a..d4fec40b4 100644 --- a/en/publish.scss +++ b/en/publish.scss @@ -179,6 +179,10 @@ img[src$="#outline"] { flex-basis: 100%; height: 0; } + + &:hover { + border-color: var(--color-base-35); + } } a { From 7ee4d66528f37b564a586a47ce8bf5b22c6acd1b Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 14:57:39 -0500 Subject: [PATCH 28/54] Add space due to rare Publish rendering issue Signed-off-by: Sigrunixia --- en/Obsidian Sync/Collaborate on a shared vault.md | 1 + 1 file changed, 1 insertion(+) diff --git a/en/Obsidian Sync/Collaborate on a shared vault.md b/en/Obsidian Sync/Collaborate on a shared vault.md index ad648f99d..6bf4bb1d3 100644 --- a/en/Obsidian Sync/Collaborate on a shared vault.md +++ b/en/Obsidian Sync/Collaborate on a shared vault.md @@ -5,6 +5,7 @@ aliases: - Collaborating - Obsidian Sync/Share remote vaults --- + With [[Introduction to Obsidian Sync|Obsidian Sync]] you can collaborate on a shared vault with your team. All collaborators must have an active Sync subscription to access a shared vault. Joining a shared vault does not count towards your [[Sync limitations#How many remote vaults can I have?|vault limit]]. From bc65ff6452c75a70bad0212bb1bbc976a8872376 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 15:29:05 -0500 Subject: [PATCH 29/54] Clarification Signed-off-by: Sigrunixia --- en/Extending Obsidian/Plugin security.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en/Extending Obsidian/Plugin security.md b/en/Extending Obsidian/Plugin security.md index 8d4e11bfa..723f08639 100644 --- a/en/Extending Obsidian/Plugin security.md +++ b/en/Extending Obsidian/Plugin security.md @@ -1,7 +1,7 @@ The Obsidian team takes security seriously. This page explains the risks involved when installing community plugins, and what the Obsidian team does to address them. -> [!tip] -> If you're working with sensitive data and wish to install a community plugin, we recommend that you perform an independent security audit before using it. +> [!tip] +> If you're working with sensitive data and wish to install a community plugin, we recommend that you perform an independent security audit on the plugin before using it. ## Restricted mode @@ -35,6 +35,6 @@ Community plugins undergo an initial review when they're submitted to the plugin The Obsidian team is small and unable to manually review every new release of community plugins. Instead, we rely on the help of the community to identify and report issues with plugins. -- If you find any security flaws with a community plugin, create an issue on the plugin repository on GitHub. +- If you discover any security vulnerabilities in a community plugin, please create an issue on the plugin's GitHub repository. For Critical category flaws, please additionally report the plugin to [[Help and support#Contact Obsidian support|Obsidian support]] after creating the GitHub issue. - If you suspect that a community plugin is malicious, report it to [[Help and support#Contact Obsidian support|Obsidian support]], or by sending a DM to our moderators. From 61bce02fc209c9fc3f208dccba826db44a9ec5b3 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 15:29:25 -0500 Subject: [PATCH 30/54] Focusing on Sync now Signed-off-by: Sigrunixia --- en/Teams/Commercial licenses.md | 2 - en/Teams/Install and deploy Obsidian.md | 2 +- en/Teams/Introduction to Teams.md | 2 +- en/Teams/Publishing for Teams.md | 9 +++++ en/Teams/Publishing in a team.md | 7 ---- en/Teams/Security considerations.md | 10 ++++- ...Sync in a team.md => Syncing for Teams.md} | 1 + en/Teams/Syncing in a team.md | 38 ------------------- 8 files changed, 21 insertions(+), 50 deletions(-) create mode 100644 en/Teams/Publishing for Teams.md delete mode 100644 en/Teams/Publishing in a team.md rename en/Teams/{Obsidian Sync in a team.md => Syncing for Teams.md} (99%) delete mode 100644 en/Teams/Syncing in a team.md diff --git a/en/Teams/Commercial licenses.md b/en/Teams/Commercial licenses.md index 175395b1c..6bf827a30 100644 --- a/en/Teams/Commercial licenses.md +++ b/en/Teams/Commercial licenses.md @@ -129,10 +129,8 @@ After purchasing the license, you will receive a license key which you can send ### Applying the license **Can I use the commercial license I purchased on both my work phone and work computer?** - Yes. The commercial license is charged per seat count, not per device. This means you can use the same license key on all your individual work devices. - **I work in a highly secure environment, in an air-gapped network. How do I apply my commercial license?** In such specialized environments, you don't need to apply the commercial license directly to your installation. However, you must monitor license usage and retain relevant records to ensure compliance with our End User License Agreement (EULA). diff --git a/en/Teams/Install and deploy Obsidian.md b/en/Teams/Install and deploy Obsidian.md index d686a1cae..57dc7d2f3 100644 --- a/en/Teams/Install and deploy Obsidian.md +++ b/en/Teams/Install and deploy Obsidian.md @@ -24,7 +24,7 @@ For security-related questions concerning these subjects, please refer to our [[ **Configuration folders** A [[Configuration folder]] is the defined folder that an Obsidian [[Glossary#Vault|vault]] will use to store application settings for that vault. By default, this folder is named `.obsidian` but you are able to [[Configuration folder#Changing your configuration folder|change the configuration folder]] name per your preference. -We recommend creating a standard template of the configuration folder to be deployed across your team's devices +We recommend creating a standard template of the configuration folder to be deployed across your team's devices. **Plugins** A [[Core plugins|Core plugin]] is an optional feature within the base Obsidian application, created by the Obsidian Team. These features are integrated within the existing codebase. diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md index 9f1c9665d..fe462787a 100644 --- a/en/Teams/Introduction to Teams.md +++ b/en/Teams/Introduction to Teams.md @@ -14,7 +14,7 @@ Obsidian serves as an excellent note-taking application for individuals, and a c - Determine if you need a license and find purchase information - [[Install and deploy Obsidian]] - Install, update, and customize Obsidian -- [[Obsidian Sync in a team]] +- [[Syncing for Teams]] - Use Obsidian Sync with your team - [[Obsidian Publish in a team]] - Use Obsidian Publish with your team diff --git a/en/Teams/Publishing for Teams.md b/en/Teams/Publishing for Teams.md new file mode 100644 index 000000000..eff541702 --- /dev/null +++ b/en/Teams/Publishing for Teams.md @@ -0,0 +1,9 @@ +--- +cssclasses: + - soft-embed +--- +This page details some of the considerations a team of people may have when using Publish. + +For more information on setting up your Publish site, please review [[Introduction to Obsidian Publish]]. + +## \ No newline at end of file diff --git a/en/Teams/Publishing in a team.md b/en/Teams/Publishing in a team.md deleted file mode 100644 index b9eab14e1..000000000 --- a/en/Teams/Publishing in a team.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -cssclasses: - - soft-embed ---- -This page details some of the considerations a team of people may have when using Publish. For more information on setting up your publish site, please review [[Introduction to Obsidian Publish]]. - -## \ No newline at end of file diff --git a/en/Teams/Security considerations.md b/en/Teams/Security considerations.md index dd477af8a..25c3ded82 100644 --- a/en/Teams/Security considerations.md +++ b/en/Teams/Security considerations.md @@ -10,10 +10,18 @@ Please be sure to read our official [Security](https://obsidian.md/security) pag Obsidian is designed to function primarily as an offline and standalone application. For extensibility, we do allow and encourage community plugins and themes, as well as offer official and unofficial support for syncing services. -If you are using Obsidian in your team and you do not plan to use community plugins or themes, the security considerations are +If you do not intend to use community plugins or themes, or Obsidian Sync or Publish, your standard procedures for securing applications will apply. However, if you plan to use any of these features, we recommend thoroughly evaluating their suitability for your workplace. ## Plugins and themes +Please review [[Plugin security]] in addition to this section. + +We review plugins and themes via a pull request to our [releases repository](https://github.com/obsidianmd/obsidian-releases/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc). We do not review community items which have not been submitted, such as plugins which are currently in [beta-testing](https://github.com/TfTHacker/obsidian42-brat). + +We do not have a community store for CSS Snippets. These files are typically obtained from within our [Obsidian Community](https://obsidian.md/community) or from public GitHub repositories. + +We require bundling of assets in CSS snippets and Themes. However, we have made an exception for [Google Fonts](https://fonts.google.com/) to maintain performance on mobile devices, where the impact of bundling fonts is more noticeable. + ## Network and access While prioritizing the local-first approach of our application, Obsidian does make network calls based on the services and features you use. These network connections can be disabled via a domain firewall or application lockdown. diff --git a/en/Teams/Obsidian Sync in a team.md b/en/Teams/Syncing for Teams.md similarity index 99% rename from en/Teams/Obsidian Sync in a team.md rename to en/Teams/Syncing for Teams.md index 15418f010..a31ae2750 100644 --- a/en/Teams/Obsidian Sync in a team.md +++ b/en/Teams/Syncing for Teams.md @@ -2,6 +2,7 @@ cssclasses: - soft-embed --- + This page details and pulls together the more important information when considering Obsidian Sync in your workplace or project. > [!tip] Haven't set up Obsidian Sync yet? Check out [[Set up Obsidian Sync]] first. diff --git a/en/Teams/Syncing in a team.md b/en/Teams/Syncing in a team.md deleted file mode 100644 index 2db0c4260..000000000 --- a/en/Teams/Syncing in a team.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -cssclasses: - - soft-embed ---- -This page details and pulls together the more important information when considering Obsidian Sync in your workplace or project. - -> [!tip] Haven't set up Obsidian Sync yet? Check out [[Set up Obsidian Sync]] first. - -## Collaboration - -With [Obsidian Sync](app://obsidian.md/Introduction%20to%20Obsidian%20Sync) you can collaborate on a shared vault with your team. - -All collaborators **must have an active Sync subscription** to access a shared vault. Joining a shared vault does not count towards your [vault limit](app://obsidian.md/Sync%20limitations#How%20many%20remote%20vaults%20can%20I%20have?). - -If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync/Security%20and%20privacy), collaborators must enter the encryption password when they set up the vault. - - -![[Collaborate on a shared vault#Manage users|Collaboration]] - -![[Collaborate on a shared vault#Collaborate with your team|Collaboration]] - -![[Collaborate on a shared vault#Limitations|Collaboration]] - -## Security - - -![[Obsidian Sync/Security and privacy#Where do you host the servers for Obsidian Sync?|Security and privacy]] - -![[Obsidian Sync/Security and privacy#What encryption do you use?|Security and privacy]] - -![[Obsidian Sync/Security and privacy#Has Obsidian completed a third-party security audit?|Security and privacy]] - -## Frequently asked questions - -**Do you have an on-premises Sync server?** -Obsidian Sync does not have an on-premises solution at this time. - - From 207751f4b39295730b605bf933b13c9078814dd4 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 15:32:00 -0500 Subject: [PATCH 31/54] Removed duplicate page Signed-off-by: Sigrunixia --- en/Teams/Introduction to Teams.md | 2 +- en/Teams/Obsidian Publish in a team.md | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 en/Teams/Obsidian Publish in a team.md diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md index fe462787a..20dcc3f20 100644 --- a/en/Teams/Introduction to Teams.md +++ b/en/Teams/Introduction to Teams.md @@ -16,7 +16,7 @@ Obsidian serves as an excellent note-taking application for individuals, and a c - Install, update, and customize Obsidian - [[Syncing for Teams]] - Use Obsidian Sync with your team -- [[Obsidian Publish in a team]] +- [[Publishing for Teams]] - Use Obsidian Publish with your team ## Important resources diff --git a/en/Teams/Obsidian Publish in a team.md b/en/Teams/Obsidian Publish in a team.md deleted file mode 100644 index e69de29bb..000000000 From f60cc42e9496c38bfd98df7f6df813a01548e59b Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 15:49:31 -0500 Subject: [PATCH 32/54] Adds missing icons Closes #712 Signed-off-by: Sigrunixia --- .../Collaborate on a Publish site.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/en/Obsidian Publish/Collaborate on a Publish site.md b/en/Obsidian Publish/Collaborate on a Publish site.md index 984c71307..6610d67df 100644 --- a/en/Obsidian Publish/Collaborate on a Publish site.md +++ b/en/Obsidian Publish/Collaborate on a Publish site.md @@ -7,22 +7,22 @@ Learn how to collaborate on your [[Introduction to Obsidian Publish|Obsidian Pub Only the site owner needs an active subscription for Obsidian Publish. Collaborators only need an [Obsidian account](https://obsidian.md/account). > [!warning] -> Before you publish changes to a shared site, make sure to [[#Syncing changes between collaborators|sync changes from other collaborators]]. Otherwise, you risk overwriting changes from other collaborators. +> Before you publish changes to a shared site, make sure to [[#Sync changes between collaborators|sync changes between collaborators]]. Otherwise, you risk overwriting changes from other collaborators. ## Add a collaborator to a site -1. In ribbon, to the left of the application window, click **Publish changes** (paper plane icon). -2. In the **Publish changes** dialog, click **Change site options** (cog icon). +1. In ribbon, to the left of the application window, click **Publish changes** ( ![[lucide-send.svg#icon]] ). +2. In the **Publish changes** dialog, click **Change site options** ![[lucide-cog.svg#icon]]. 3. Next to **Site collaboration**, select **Manage**. 4. In **Invite user**, enter the email of the collaborator. 5. Select **Add**. ## Remove a collaborator from a site -1. In ribbon, to the left of the application window, click **Publish changes** (paper plane icon). -2. In the **Publish changes** dialog, click **Change site options** (cog icon). +1. In ribbon, to the left of the application window, click **Publish changes** ( ![[lucide-send.svg#icon]] ). +2. In the **Publish changes** dialog, click **Change site options** ( ![[lucide-cog.svg#icon]] ). 3. Next to **Site collaboration**, select **Manage**. -4. Next to the collaborator you want to remove, select **Remove user** (cross icon). +4. Next to the collaborator you want to remove, select **Remove user** ( ![[lucide-x.svg#icon]]). ## Sync changes between collaborators @@ -30,7 +30,7 @@ Obsidian Publish doesn't sync published changes between local vaults automatical To update a local note with changes from the live site: -1. In ribbon, to the left of the application window, click **Publish changes** (paper plane icon). +1. In ribbon, to the left of the application window, click **Publish changes** ( ![[lucide-send.svg#icon]] ). 2. Right-click the change you want to sync, and then select **Use live version**. **This will overwrite the note in your local vault.** > [!tip] From f6c646fea5454a4b11eca412302d3b6ef8086178 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 15:57:03 -0500 Subject: [PATCH 33/54] Adds missing icons Closes #712 Signed-off-by: Sigrunixia --- .../Collaborate on a Publish site.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/en/Obsidian Publish/Collaborate on a Publish site.md b/en/Obsidian Publish/Collaborate on a Publish site.md index 6610d67df..992bb0bfa 100644 --- a/en/Obsidian Publish/Collaborate on a Publish site.md +++ b/en/Obsidian Publish/Collaborate on a Publish site.md @@ -40,10 +40,12 @@ To update a local note with changes from the live site: The following table lists the available site permissions for owners and collaborators: -| Action | Collaborator | Owner | -|------------------------------------|:------------:|:-----:| -| Publish new pages | ✓ | ✓ | -| Publish changes to published pages | ✓ | ✓ | -| Unpublish pages | ✓ | ✓ | -| Configure site options | | ✓ | -| Manage permissions | | ✓ | + +> [!tldr] Test +> Test + +> [!note] Test +> Test + + + From 70f15c474a6d89003e27de57966d9a7f493c6371 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 15:57:25 -0500 Subject: [PATCH 34/54] Adds Trainbuffer Closes #721 Signed-off-by: Sigrunixia --- en/Obsidian/Credits.md | 1 + 1 file changed, 1 insertion(+) diff --git a/en/Obsidian/Credits.md b/en/Obsidian/Credits.md index 7c3d62403..5a3ac7904 100644 --- a/en/Obsidian/Credits.md +++ b/en/Obsidian/Credits.md @@ -28,6 +28,7 @@ Names aren't listed by amount of contribution, but alphabetically (or at least w - ryanjamurphy ([Ryan](https://fulcra.design/) [J. A. Murphy](https://axle.design/))That funny guy Apple Fanboy Forum master - WhiteNoiseThink Tank Zotero master Bug report exterminator - CawlinTeffid ([Colin Tedford](https://colintedford.com/)) embedded-search ambassador +- Trainbuffer ferroequinologist Travels by rail - Carl the TurtleOnline 24/7 Easily triggered Good and pure Go green or go home ## Plugin inspirations From d1fc3681e98726bf8b0f0d620f947b8037f951a1 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:03:51 -0500 Subject: [PATCH 35/54] Wording seems better Signed-off-by: Sigrunixia --- en/Teams/Security considerations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/Teams/Security considerations.md b/en/Teams/Security considerations.md index 25c3ded82..07e2be11f 100644 --- a/en/Teams/Security considerations.md +++ b/en/Teams/Security considerations.md @@ -26,7 +26,7 @@ We require bundling of assets in CSS snippets and Themes. However, we have made While prioritizing the local-first approach of our application, Obsidian does make network calls based on the services and features you use. These network connections can be disabled via a domain firewall or application lockdown. -We make our network connections on HTTPS port 443. +Obsidian makes these network connections on HTTPS port 443. The following is a list of network connections Obsidian makes. From 17a4a45e90e3b2f44deeaf08b6ca3df06d21d0d9 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:04:12 -0500 Subject: [PATCH 36/54] Clarification on when this step happens. Signed-off-by: Sigrunixia --- en/Teams/Syncing for Teams.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/en/Teams/Syncing for Teams.md b/en/Teams/Syncing for Teams.md index a31ae2750..cb8f61744 100644 --- a/en/Teams/Syncing for Teams.md +++ b/en/Teams/Syncing for Teams.md @@ -2,7 +2,6 @@ cssclasses: - soft-embed --- - This page details and pulls together the more important information when considering Obsidian Sync in your workplace or project. > [!tip] Haven't set up Obsidian Sync yet? Check out [[Set up Obsidian Sync]] first. @@ -13,7 +12,7 @@ With [Obsidian Sync](app://obsidian.md/Introduction%20to%20Obsidian%20Sync) yo All collaborators **must have an active Sync subscription** to access a shared vault. Joining a shared vault does not count towards your [vault limit](app://obsidian.md/Sync%20limitations#How%20many%20remote%20vaults%20can%20I%20have?). -If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync/Security%20and%20privacy), collaborators must enter the encryption password when they set up the vault. +If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync/Security%20and%20privacy), collaborators must enter the encryption password when they first access the shared remote vault. ![[Collaborate on a shared vault#Manage users|Collaboration]] @@ -31,4 +30,4 @@ If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync ## Frequently asked questions **Do you have an on-premises Sync server?** -Obsidian Sync does not have an on-premises solution at this time. +Obsidian Sync does not have an on-premises solution at this time. Feel free to add your use case to [this feature request](https://forum.obsidian.md/t/obsidian-sync-self-hosted-server/20975) thread. From dd32b3241c0eb7c7994bd5bb18e388bf835339fa Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:08:29 -0500 Subject: [PATCH 37/54] Corrects old URL Closes #727 Signed-off-by: Sigrunixia --- en/Obsidian Sync/Set up Obsidian Sync.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/Obsidian Sync/Set up Obsidian Sync.md b/en/Obsidian Sync/Set up Obsidian Sync.md index d75713e1a..42cfe1241 100644 --- a/en/Obsidian Sync/Set up Obsidian Sync.md +++ b/en/Obsidian Sync/Set up Obsidian Sync.md @@ -11,7 +11,7 @@ In this guide, you'll create a new [[Local and remote vaults|remote vault]] and - An active Obsidian Sync [[Plans and storage limits|subscription]]. If you don't have one, subscribe from [your account dashboard](https://obsidian.md/account). - Sync enabled within the [[Core plugins]] settings. -> [!danger] Is your current vault in an iCloud, OneDrive, Dropbox, or other syncing folder? Please [[Back up your Obsidian files|read this guide]] before proceeding. +> [!danger] Is your current vault in an iCloud, OneDrive, Dropbox, or other syncing folder? Please read [[Sync limitations#Can I use a third-party sync with Obsidian Sync?|this]] before proceeding. ## Log in with your Obsidian account From 7c1da9194f562b8154878c1814fff366611b975c Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:26:26 -0500 Subject: [PATCH 38/54] reverted oops edit Signed-off-by: Sigrunixia --- .../Collaborate on a Publish site.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/en/Obsidian Publish/Collaborate on a Publish site.md b/en/Obsidian Publish/Collaborate on a Publish site.md index 992bb0bfa..d6d2094d2 100644 --- a/en/Obsidian Publish/Collaborate on a Publish site.md +++ b/en/Obsidian Publish/Collaborate on a Publish site.md @@ -40,12 +40,12 @@ To update a local note with changes from the live site: The following table lists the available site permissions for owners and collaborators: - -> [!tldr] Test -> Test - -> [!note] Test -> Test - +| Action | Collaborator | Owner | +|------------------------------------|:------------:|:-----:| +| Publish new pages | ✓ | ✓ | +| Publish changes to published pages | ✓ | ✓ | +| Unpublish pages | ✓ | ✓ | +| Configure site options | | ✓ | +| Manage permissions | | ✓ | From e9ef6c8b21479b4631c5071e8a0e4e2e7f06dfd7 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:26:36 -0500 Subject: [PATCH 39/54] Added FAQ item Signed-off-by: Sigrunixia --- en/Teams/Syncing for Teams.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/en/Teams/Syncing for Teams.md b/en/Teams/Syncing for Teams.md index cb8f61744..7a3fb6bc5 100644 --- a/en/Teams/Syncing for Teams.md +++ b/en/Teams/Syncing for Teams.md @@ -29,5 +29,8 @@ If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync ## Frequently asked questions +**Can I purchase one Sync subscription and use it for my team?** +If you are a team of one person, yes, you can use the Sync subscription for that team member. However, if you have multiple team members, each member will need their own Obsidian Sync subscription to access and share remote vaults. + **Do you have an on-premises Sync server?** Obsidian Sync does not have an on-premises solution at this time. Feel free to add your use case to [this feature request](https://forum.obsidian.md/t/obsidian-sync-self-hosted-server/20975) thread. From f4c511e6513fce8c22ecb518f8ce0b48008e297e Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:39:09 -0500 Subject: [PATCH 40/54] Added alias to Commercial Licenes when needed Signed-off-by: Sigrunixia --- en/Contributing to Obsidian/Financial contributions.md | 2 +- en/Licenses and payment/Catalyst license.md | 2 +- en/Licenses and payment/Obsidian Credit.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/en/Contributing to Obsidian/Financial contributions.md b/en/Contributing to Obsidian/Financial contributions.md index 0191c1ef9..3b02e84a5 100644 --- a/en/Contributing to Obsidian/Financial contributions.md +++ b/en/Contributing to Obsidian/Financial contributions.md @@ -4,6 +4,6 @@ One of the best ways to support the team is through one or more of our paid prod - If you need to sync notes across your devices, consider a subscription for [[Introduction to Obsidian Sync|Obsidian Sync]]. - If you want to publish your notes to the world, consider a subscription for [[Introduction to Obsidian Publish|Obsidian Publish]]. -- If you use Obsidian for work, we ask you to purchase a [[Commercial licenses]]. +- If you use Obsidian for work, we ask you to purchase a [[Commercial licenses|Commercial license]]. We understand that you might not be interested in any of our paid products right now, though we'd love to know how we can change that! If you still want to support Obsidian and you only use Obsidian for personal purposes, consider getting a [[Catalyst license]]. diff --git a/en/Licenses and payment/Catalyst license.md b/en/Licenses and payment/Catalyst license.md index 5d4ec8336..8e02f0185 100644 --- a/en/Licenses and payment/Catalyst license.md +++ b/en/Licenses and payment/Catalyst license.md @@ -11,7 +11,7 @@ Catalyst license gives you exclusive benefits including: - Exclusive [[#Get your forum badge|forum badges]] and [[#Get your Discord badge|Discord badges]]. > [!Note] Commercial use -> If you use Obsidian for work in a company with two or more employees, you must purchase a [[Commercial licenses]]. +> If you use Obsidian for work in a company with two or more employees, you must purchase a [[Commercial licenses|Commercial license]]. ## Catalyst tiers diff --git a/en/Licenses and payment/Obsidian Credit.md b/en/Licenses and payment/Obsidian Credit.md index cf509c849..7d97778c4 100644 --- a/en/Licenses and payment/Obsidian Credit.md +++ b/en/Licenses and payment/Obsidian Credit.md @@ -28,7 +28,7 @@ Obsidian Credit is not eligible for a refund per our [[Refund policy]]. ## Gifting -Although using Obsidian for personal use is completely free of charge, you can give the gift of Obsidian to someone to help them get an add-on service like [[Introduction to Obsidian Sync|Obsidian Sync]], or to get a [[Commercial licenses]] so they can use Obsidian for work. +Although using Obsidian for personal use is completely free of charge, you can give the gift of Obsidian to someone to help them get an add-on service like [[Introduction to Obsidian Sync|Obsidian Sync]], or to get a [[Commercial licenses|Commercial license]] so they can use Obsidian for work. ## Give Obsidian Credit From 66ea4051abe9e4e6314cbd5903b984626b35bf3b Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:55:51 -0500 Subject: [PATCH 41/54] Fixed missing words for assessments Signed-off-by: Sigrunixia --- en/Teams/Security considerations.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en/Teams/Security considerations.md b/en/Teams/Security considerations.md index 07e2be11f..2797c01aa 100644 --- a/en/Teams/Security considerations.md +++ b/en/Teams/Security considerations.md @@ -2,7 +2,7 @@ cssclasses: - soft-embed --- -This page details some of the security information and considerations you may need to know for your team. +2This page details some of the security information and considerations you may need to know for your team. Please be sure to read our official [Security](https://obsidian.md/security) page to review our independent audits before reviewing this page. @@ -64,9 +64,9 @@ Obsidian supports [[2-factor authentication]] (2FA) for Obsidian accounts, but i ### Assessments and certifications **Will you accept security assessments from our company?** -We require a minimum quoted purchase order amount before considering completing a security assessment. These assessments are often time-consuming and may not be applicable to offline applications like Obsidian, which is primarily a cloud-based service. +We require a minimum quoted purchase order amount before considering completing a security assessment. These assessments are often time-consuming and may not be applicable to offline applications like Obsidian, as they are typically geared towards cloud-based services. -However, you can waive this quoted purchase order amount by agreeing to pay a retainer fee. +However, you can waive this quoted purchase order amount by agreeing to pay a retainer fee. Please contact [[Help and support#Contact Obsidian support|Obsidian support]] to inquire about this option. **Do you have any recognized certifications related to Information Security or quality standards, such as ISO27001, NIST, COBIT, or other ISO or CSA certifications?** Not at this time. It may be something we explore in the future, but for now, our focus is on our [security audits]() \ No newline at end of file From b25e71c23454e9625b261656ad365233212e7aa9 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 16:56:49 -0500 Subject: [PATCH 42/54] Fixed link for security audits Signed-off-by: Sigrunixia --- en/Teams/Security considerations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/Teams/Security considerations.md b/en/Teams/Security considerations.md index 2797c01aa..94c035eea 100644 --- a/en/Teams/Security considerations.md +++ b/en/Teams/Security considerations.md @@ -69,4 +69,4 @@ We require a minimum quoted purchase order amount before considering completing However, you can waive this quoted purchase order amount by agreeing to pay a retainer fee. Please contact [[Help and support#Contact Obsidian support|Obsidian support]] to inquire about this option. **Do you have any recognized certifications related to Information Security or quality standards, such as ISO27001, NIST, COBIT, or other ISO or CSA certifications?** -Not at this time. It may be something we explore in the future, but for now, our focus is on our [security audits]() \ No newline at end of file +Not at this time. It may be something we explore in the future, but for now, our focus is on our [security audits](https://obsidian.md/security). \ No newline at end of file From 102e0c26cea9d9b1601ac049e9188a95e78068eb Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 17:36:01 -0500 Subject: [PATCH 43/54] Adds line about access levels and moves callout Signed-off-by: Sigrunixia --- en/Extending Obsidian/Plugin security.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/en/Extending Obsidian/Plugin security.md b/en/Extending Obsidian/Plugin security.md index 723f08639..c2e2e5457 100644 --- a/en/Extending Obsidian/Plugin security.md +++ b/en/Extending Obsidian/Plugin security.md @@ -1,8 +1,5 @@ The Obsidian team takes security seriously. This page explains the risks involved when installing community plugins, and what the Obsidian team does to address them. -> [!tip] -> If you're working with sensitive data and wish to install a community plugin, we recommend that you perform an independent security audit on the plugin before using it. - ## Restricted mode By default, Obsidian runs in Restricted Mode to prevent third-party code execution. Only disable Restricted mode if you trust the authors of the plugins that you install. @@ -23,18 +20,22 @@ Installed plugins remain in your vault even if you turn on Restricted mode, but ## Plugin capabilities -Due to technical reasons, Obsidian is unable to reliably restrict plugins to specific permissions or access levels. As a result, consider the following examples of what community plugins can do: +Due to technical limitations, Obsidian cannot reliably restrict plugins to specific permissions or access levels. This means that plugins will inherit Obsidian's access levels. As a result, consider the following examples of what community plugins can do: - Community plugins can access files on your computer. - Community plugins can connect to internet. - Community plugins can install additional programs. +> [!tip] +> If you're working with sensitive data and wish to install a community plugin, we recommend that you perform an independent security audit on the plugin before using it. + ## Plugin review process Community plugins undergo an initial review when they're submitted to the plugin store. All plugins must adhere to [Obsidian Developer Policies](https://docs.obsidian.md/Developer+policies). The Obsidian team is small and unable to manually review every new release of community plugins. Instead, we rely on the help of the community to identify and report issues with plugins. -- If you discover any security vulnerabilities in a community plugin, please create an issue on the plugin's GitHub repository. For Critical category flaws, please additionally report the plugin to [[Help and support#Contact Obsidian support|Obsidian support]] after creating the GitHub issue. +- If you discover any minor security vulnerabilities in a community plugin, refer to the plugin author's `security.md` or `readme.md` for how to report those. For Critical category flaws, please report the issue to [[Help and support#Contact Obsidian support|Obsidian support]] as well. - If you suspect that a community plugin is malicious, report it to [[Help and support#Contact Obsidian support|Obsidian support]], or by sending a DM to our moderators. + From 13ac0599834c7cfd8b940fa28779c04e45e6b381 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 17:59:52 -0500 Subject: [PATCH 44/54] Grammar Passing Signed-off-by: Sigrunixia --- en/Obsidian Sync/Security and privacy.md | 2 +- en/Teams/Install and deploy Obsidian.md | 12 +++++++----- en/Teams/Publishing for Teams.md | 22 ++++++++++++++++++++-- en/Teams/Syncing for Teams.md | 6 +++--- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/en/Obsidian Sync/Security and privacy.md b/en/Obsidian Sync/Security and privacy.md index 13c4d309c..d240a6b43 100644 --- a/en/Obsidian Sync/Security and privacy.md +++ b/en/Obsidian Sync/Security and privacy.md @@ -43,7 +43,7 @@ Yes. Obsidian has been independently audited. Visit our [Security page](https:// If you ever lose or forget the encryption password, you won't be able to connect additional vaults to your remote vault. Since the encryption password isn't saved anywhere, it's forever lost. -Your data, however, are usually safely stored locally on each of your devices. +Your data, however, is usually safely stored locally on each of your devices. To continue using Obsidian Sync, we suggest doing a full re-setup to be able to add new devices to your Sync system: diff --git a/en/Teams/Install and deploy Obsidian.md b/en/Teams/Install and deploy Obsidian.md index 57dc7d2f3..6d37a70ba 100644 --- a/en/Teams/Install and deploy Obsidian.md +++ b/en/Teams/Install and deploy Obsidian.md @@ -11,7 +11,7 @@ Download your preferred version of Obsidian from our [GitHub releases page](http > [!tip] For Windows users who need a system installer, use the `-allusers.exe` file on the releases page. -If automatic updates are enabled, future updates will install as allowed. Additionally, we recommend periodically completing [[Update Obsidian#Installer updates|installer updates]] to gain the latest electron updates. +If automatic updates are enabled, future updates will install as allowed. Additionally, we recommend periodically completing [[Update Obsidian#Installer updates|installer updates]] to receive the latest electron updates, including security fixes. If you are looking how to limit network access to Obsidian during this process, review [[Security considerations#Network and access|network and access]] instead. @@ -22,14 +22,16 @@ One of Obsidian's strength lies in its extensibility. With an extensive API and For security-related questions concerning these subjects, please refer to our [[Security considerations]] page. **Configuration folders** -A [[Configuration folder]] is the defined folder that an Obsidian [[Glossary#Vault|vault]] will use to store application settings for that vault. By default, this folder is named `.obsidian` but you are able to [[Configuration folder#Changing your configuration folder|change the configuration folder]] name per your preference. +A [[Configuration folder]] is the designated folder where an Obsidian [[Glossary#Vault|vault]] stores its application settings. By default, this folder is named `.obsidian`, but you have the flexibility to [[Configuration folder#Changing your configuration folder|change the configuration folder]] name according to your preference. -We recommend creating a standard template of the configuration folder to be deployed across your team's devices. +We recommend creating a standardized template of the configuration folder to be deployed across your team's devices. **Plugins** A [[Core plugins|Core plugin]] is an optional feature within the base Obsidian application, created by the Obsidian Team. These features are integrated within the existing codebase. -A [[Community plugins|Community plugin]] is is a third-party optional featured added to the Obsidian application through the plugin and the Obsidian API, and can be downloaded into the application through the community store. If installing manually, community plugins need to be installed into the `.obsidian/plugins` folder for Obsidian to read them. +A [[Community plugins|Community plugin]] is a third-party optional feature added to the Obsidian application through the plugin, and can be added to the application through the community store. If installing manually, community plugins need to be installed into the `.obsidian/plugins` folder for Obsidian to read them. + +Community plugins operate through a combination of their own code and [Obsidian's API](https://github.com/obsidianmd/obsidian-api). **Themes and snippets** A [[CSS snippets|Snippet]] is a `.css` file that visually modifies one or more aspects of the Obsidian interface. In some cases, it can also add functional enhancements, such as CSS animations like transitions. To be recognized by Obsidian, snippets must be inserted into `.obsidian/snippets`. @@ -40,7 +42,7 @@ Many themes utilize the community plugin [Style Settings](https://github.com/mgm ## Frequently asked questions -For questions regarding account management and security, please refer to [[Security considerations#Account security|Account security]]. +For questions regarding account management and security, please refer to [[Security considerations#Account security|account security]]. ### Deployment diff --git a/en/Teams/Publishing for Teams.md b/en/Teams/Publishing for Teams.md index eff541702..c9f861da6 100644 --- a/en/Teams/Publishing for Teams.md +++ b/en/Teams/Publishing for Teams.md @@ -4,6 +4,24 @@ cssclasses: --- This page details some of the considerations a team of people may have when using Publish. -For more information on setting up your Publish site, please review [[Introduction to Obsidian Publish]]. +For more information on setting up your Publish site and general considerations, please review [[Introduction to Obsidian Publish]] and [[Publish limitations]]. + +## Collaboration management + +First, please read our guide on how to [[Collaborate on a Publish site]]. This will answer most basic questions, and will be appropriate for very small teams. + +If you are a larger team, the default collaboration options in Obsidian Publish may not be scalable enough for proper version control (VCS). While we strongly recommend using [[Back up your Obsidian files|backups]] for your content, the day-to-day management of changes for Publish collaboration is not as fully functional as a service like Git. + +You will need to combine Publish with an external VCS, or use it in conjunction with a syncing service like [[Introduction to Obsidian Sync|Obsidian Sync]] to smooth the process of updating changes between multiple users. For example, this documentation is merged together on our [GitHub repository](https://github.com/obsidianmd/obsidian-help) and then the contents are published in Obsidian to the Publish site. + +## Media + +Publish is designed to primarily take plain text files, and some images, and make them available on a website for others to view. Because Obsidian achieves this using part of the same code as the application's [[Edit and preview Markdown#Editor views|reading view]], it is not designed with very high quality media in mind, such as large high-resolution galleries, image hosting, etc. Rather, it aims to be as speedy and lightweight as possible. + +Obsidian Publish is designed to primarily process plain text files and some images, presenting them on a website for viewing. Due to its use of the same code as the application's [[Edit and preview Markdown#Editor views|reading view]], Obsidian Publish is not intended for high-quality media, such as large high-resolution galleries or image hosting. Instead, it prioritizes speed and lightweight functionality. + +## Frequently asked questions + +**Does every employee need to purchase a Publish subscription?** +No. Only the site own needs to purchase an Obsidian Publish subscription. -## \ No newline at end of file diff --git a/en/Teams/Syncing for Teams.md b/en/Teams/Syncing for Teams.md index 7a3fb6bc5..848ac0b8a 100644 --- a/en/Teams/Syncing for Teams.md +++ b/en/Teams/Syncing for Teams.md @@ -8,11 +8,11 @@ This page details and pulls together the more important information when conside ## Collaboration -With [Obsidian Sync](app://obsidian.md/Introduction%20to%20Obsidian%20Sync) you can collaborate on a shared vault with your team. +With [[Introduction to Obsidian Sync|Obsidian Sync]] you can collaborate on a shared vault with your team. -All collaborators **must have an active Sync subscription** to access a shared vault. Joining a shared vault does not count towards your [vault limit](app://obsidian.md/Sync%20limitations#How%20many%20remote%20vaults%20can%20I%20have?). +All collaborators **must have an active Sync subscription** to access a shared vault. Joining a shared vault does not count towards your [[Plans and storage limits#Plans|remote vault limit]]. -If the remote vault is [end-to-end encrypted](app://obsidian.md/Obsidian%20Sync/Security%20and%20privacy), collaborators must enter the encryption password when they first access the shared remote vault. +If the remote vault is [[Obsidian Sync/Security and privacy#Encryption|end-to-end encrypted]], collaborators must enter the encryption password when they first access the shared remote vault. ![[Collaborate on a shared vault#Manage users|Collaboration]] From a33156996f89df53346000ce75fed790b11b9950 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 18:13:42 -0500 Subject: [PATCH 45/54] Grammar Passing again Signed-off-by: Sigrunixia --- en/Obsidian Publish/Redirect old notes.md | 1 + en/Obsidian Publish/Security and privacy.md | 4 ++++ en/Teams/Introduction to Teams.md | 10 ++++++---- en/Teams/Publishing for Teams.md | 4 +--- en/Teams/Security considerations.md | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/en/Obsidian Publish/Redirect old notes.md b/en/Obsidian Publish/Redirect old notes.md index a9853f368..5cf4c75f9 100644 --- a/en/Obsidian Publish/Redirect old notes.md +++ b/en/Obsidian Publish/Redirect old notes.md @@ -2,6 +2,7 @@ aliases: - Obsidian Publish/Redirecting old notes --- + Renaming and removing notes is a natural part of maintaining a living vault. While Obsidian automatically updates links when you move a note within your local vault, other websites may still link to your old notes on your published [[Introduction to Obsidian Publish|Obsidian Publish]] site. In this article, you'll learn how to redirect readers from one note to another. Imagine you want to move a note from one folder to another: diff --git a/en/Obsidian Publish/Security and privacy.md b/en/Obsidian Publish/Security and privacy.md index dcc358d71..48f5cca96 100644 --- a/en/Obsidian Publish/Security and privacy.md +++ b/en/Obsidian Publish/Security and privacy.md @@ -3,6 +3,7 @@ aliases: - Access control for Obsidian Publish - Security/privacy for Obsidian Publish --- + You can choose the notes you want to publish to [[Introduction to Obsidian Publish|Obsidian Publish]]. The rest of your notes stay safe in your vault. Only the notes you choose to publish are sent to Obsidian's servers, and any notes you unpublish are removed. @@ -38,6 +39,9 @@ By default, Obsidian Publish **does not** collect visitor data, store cookies, o As the site owner, you are responsible for complying with GDPR and privacy regulations in your region. This includes creating your own notification banner, which can be implemented using publish.js, and adding a privacy policy page to your site. ## Access + +Obsidian contracts with [Cloudflare](https://www.cloudflare.com) to provide site hosting for our Publish sites. The servers are hosted in San Francisco, CA. + ### Managing access to Obsidian Publish on your network To regulate access to Obsidian Publish on your network, you need to manage the following domains: diff --git a/en/Teams/Introduction to Teams.md b/en/Teams/Introduction to Teams.md index 20dcc3f20..eee2d0ad2 100644 --- a/en/Teams/Introduction to Teams.md +++ b/en/Teams/Introduction to Teams.md @@ -21,15 +21,17 @@ Obsidian serves as an excellent note-taking application for individuals, and a c ## Important resources +Below are important links to relevant parts of our main website, and are listed here for quick access. + - [Purchase our products](https://obsidian.md/pricing) - Purchase a Commercial license, Sync, or Publish +- [Report a bug](https://forum.obsidian.md/c/bug-reports/7) + - Report an application issue +- [Request a new feature](https://forum.obsidian.md/tags/c/feature-requests/8/commercial) + - Report a feature request - [License overview](https://obsidian.md/license) - Review our license overview in plain English - [Terms of Service](https://obsidian.md/terms) - Review our latest Terms of Service - [Privacy Policy](https://obsidian.md/privacy) - Review our privacy policy -- [Report a bug](https://forum.obsidian.md/c/bug-reports/7) - - Report an application issue -- [Request a new feature](https://forum.obsidian.md/tags/c/feature-requests/8/commercial) - - Report a feature request \ No newline at end of file diff --git a/en/Teams/Publishing for Teams.md b/en/Teams/Publishing for Teams.md index c9f861da6..b3a95ad06 100644 --- a/en/Teams/Publishing for Teams.md +++ b/en/Teams/Publishing for Teams.md @@ -16,12 +16,10 @@ You will need to combine Publish with an external VCS, or use it in conjunction ## Media -Publish is designed to primarily take plain text files, and some images, and make them available on a website for others to view. Because Obsidian achieves this using part of the same code as the application's [[Edit and preview Markdown#Editor views|reading view]], it is not designed with very high quality media in mind, such as large high-resolution galleries, image hosting, etc. Rather, it aims to be as speedy and lightweight as possible. - Obsidian Publish is designed to primarily process plain text files and some images, presenting them on a website for viewing. Due to its use of the same code as the application's [[Edit and preview Markdown#Editor views|reading view]], Obsidian Publish is not intended for high-quality media, such as large high-resolution galleries or image hosting. Instead, it prioritizes speed and lightweight functionality. ## Frequently asked questions **Does every employee need to purchase a Publish subscription?** -No. Only the site own needs to purchase an Obsidian Publish subscription. +No. Only the site owner needs to purchase an Obsidian Publish subscription. diff --git a/en/Teams/Security considerations.md b/en/Teams/Security considerations.md index 94c035eea..c7bee0cf9 100644 --- a/en/Teams/Security considerations.md +++ b/en/Teams/Security considerations.md @@ -2,7 +2,7 @@ cssclasses: - soft-embed --- -2This page details some of the security information and considerations you may need to know for your team. +This page details some of the security information and considerations you may need to know for your team. Please be sure to read our official [Security](https://obsidian.md/security) page to review our independent audits before reviewing this page. From 44827ef30cecdde86d7c5c4b37336a66cf7ef934 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 3 May 2024 18:25:55 -0500 Subject: [PATCH 46/54] Grammar Passing again.. again? Signed-off-by: Sigrunixia --- en/Teams/Security considerations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/Teams/Security considerations.md b/en/Teams/Security considerations.md index c7bee0cf9..21e9e1a49 100644 --- a/en/Teams/Security considerations.md +++ b/en/Teams/Security considerations.md @@ -8,13 +8,13 @@ Please be sure to read our official [Security](https://obsidian.md/security) pag ## Initial considerations -Obsidian is designed to function primarily as an offline and standalone application. For extensibility, we do allow and encourage community plugins and themes, as well as offer official and unofficial support for syncing services. +Obsidian is primarily designed to function as an offline and standalone application. However, for extensibility, we support and encourage community plugins and themes. Additionally, we provide both official and unofficial support for various syncing services. If you do not intend to use community plugins or themes, or Obsidian Sync or Publish, your standard procedures for securing applications will apply. However, if you plan to use any of these features, we recommend thoroughly evaluating their suitability for your workplace. ## Plugins and themes -Please review [[Plugin security]] in addition to this section. +Please also read the [[Plugin security]] page in addition to this section. We review plugins and themes via a pull request to our [releases repository](https://github.com/obsidianmd/obsidian-releases/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc). We do not review community items which have not been submitted, such as plugins which are currently in [beta-testing](https://github.com/TfTHacker/obsidian42-brat). From f1170344b270e5ef0a9900817c3a2c674d0ec7b0 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Mon, 6 May 2024 15:30:17 -0500 Subject: [PATCH 47/54] Added Sync servers to this page Signed-off-by: Sigrunixia --- en/Teams/Security considerations.md | 1 + 1 file changed, 1 insertion(+) diff --git a/en/Teams/Security considerations.md b/en/Teams/Security considerations.md index 21e9e1a49..ae5694dec 100644 --- a/en/Teams/Security considerations.md +++ b/en/Teams/Security considerations.md @@ -35,6 +35,7 @@ The following is a list of network connections Obsidian makes. - **Early access updates**: Uses `releases.obsidian.md`. - **Account and license management**: When accessing your Obsidian account in Settings and applying a Commercial License, we call `api.obsidian.md`. - **Obsidian Sync**: Used for syncing your notes across devices. + - `sync-xx.obsidian.md`, where `xx` is a number between 01-100. - **Obsidian Publish**: 1. Backend: `publish-main.obsidian.md` and `publish-xx.obsidian.md`, where `xx` is a number. 2. Frontend: `publish.obsidian.md`. From 1475fa1a6549d0635a490214e83b7f66b354d65b Mon Sep 17 00:00:00 2001 From: Liam Cain Date: Thu, 9 May 2024 16:43:24 -0400 Subject: [PATCH 48/54] Release notes (cherry picked from commit be67fd971f8d3b535774d00cfe4c854e9c9d58c7) --- Release notes/v1.6.0.md | 124 ++++++++++++++++++++++++++++++++++++++++ Release notes/v1.6.md | 124 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+) create mode 100644 Release notes/v1.6.0.md create mode 100644 Release notes/v1.6.md diff --git a/Release notes/v1.6.0.md b/Release notes/v1.6.0.md new file mode 100644 index 000000000..76c8000ee --- /dev/null +++ b/Release notes/v1.6.0.md @@ -0,0 +1,124 @@ +--- +tags: + - desktop + - insider +date: 2024-05-09 +title: "1.6.0" +--- + +## Shiny new things + +- The interface direction is now mirrored when the app is set to an RTL language. +- Updated the left sidebar layout. Vault switcher is now shown at the bottom. App ribbon can now be hidden in settings or by right-clicking on the ribbon and selecting "hide ribbon." +- Character and word count is now updated based on the current text selection. +- `Tab` will now complete the path segment of the currently selected file in the Quick switcher and "Move files" modal. + +## Improved + +- Initial workspace load time should be improved. +- The "More options" menu items have been reorganized to be easier to parse visually. +- Added "Add alias" command. +- Added "Create new folder" command. +- Hotkeys and property types are now automatically reloaded if the settings are modified outside of Obsidian. +- Improved editor parsing performance. +- Added custom instructions and result when adding display text to a link. + +### Properties + +- When merging two properties, the new property name will now flash in the global property list. +- You can now double-click on a property list item to edit it. + +### Page preview + +- Hovering over a footnote ID will now display a popup with the corresponding footnote. +- Previews should now have more consistent sizing and positioning. + +### Sync Improvements + +- Updated the default selective syncing when setting up Sync. By default, Sync will now sync: + - Main settings + - Appearance settings + - Hotkeys + - Core plugins + - Core plugin settings + - Video, images, PDFs, and audio +- Arbitrary files inside plugin folders will no longer get tracked by Sync. The only files inside a plugin folder that will get tracked are: + - data.json + - main.js + - styles.css + - manifest.json +- The "Purge" button will now appear if storage is more than 95% full. +- Add command to open the activity log. +- Improve styling of status bar menu. +- Clicking the statusbar item now always shows the Sync menu instead of opening the activity log. +- Tweak appearance of "Disconnect" button in settings. +- Syncing should be faster when processing pending sync changes. +- Don't throttle when main window is minimized or in the background. +- Improved loading experience while Sync connects to the remote vault. +- Improved the interface for inviting Sync collaborators to your vault. +- Fixed issue with "View version history" not working if file is not tracked in Sync. + +## No longer broken + +- Fixed parsing and rendering of footnotes in the editor. +- Markdown files larger than 2MB will no longer get indexed. This should prevent programmatically generated Markdown files causing Obsidian to lag at startup. +- Fixed `Redo` not working when triggered from the macOS app menu. +- Properties now inherit the page preview setting of whatever mode the view is in. +- Updated the "move to new window" and "open in new window" icons. +- Updated the context menu icons in the Bookmarks view to be consistent with the rest of the app. +- Fixed workspace layout not always saving after selecting a tab. +- Attempting to open an invalid URL will show a Notice instead of failing silently. +- The "Light themes only" toggle is no longer displayed when using 'adapt to system'. +- Fixed vim mode crashing when dragging cursor over folded text. +- Don't show empty text when there's a fallback suggestion. +- Allow clicking at start of line inside blockquote. +- Fix scrolling when clicking at next to scrollbar in a PDF. +- Fixed minimized main window doesn't adapt to system theme change. +- Improved drag and drop for the command palette reordering. +- Fixed clicking "Collapse all" sometimes requiring two clicks to work. +- Fixed backlinks view not always showing an empty state. +- Fixed toggling core plugins not always showing the settings "gear" icon immediately. +- Fixed checklists getting unfolded when clicking on the checkbox. +- Fixed list collapse indicators from extending into text in Live Preview. +- Fix callout images getting clipped inside hover preview. +- Improve styling of tree items during rename. +- Fixed appearance of "destructive" menu items when they are disabled. + +### Search + +- Dismiss suggestions when typing quoted string. +- Don't open suggestions if next character is non-space. +- Clicking "clear" button will no longer cause search input fields to lose focus. + +### Localization + +- The Norsk language is now mapped to the Bokmål locale. + +### Table + +- Clicking in margin to right of table now focuses the editor. +- Fixed shift + arrow key not responding. +- Ensure cell updates from main editor correctly update cell offsets. +- Fix parsing math blocks inside table cells. + +## Developers + +- We have published [a guide](https://docs.obsidian.md/Plugins/User+interface/Right-to-left) for how to adapt your theme or plugin to support RTL interfaces. + +### Themes + +- Switched to Cascadia Mono instead of Cascadia Code for default monospace on Windows. +- Bold is now computed based on the current text weight, so bold inside a heading will still appear bold. +- Added `--caret-color` CSS variable to make it easier to style caret color on both desktop and mobile. +- Added new `--link-weight` variable. +- The user's interface language is added to the `lang` attribute on the `html` element, which allows language-specific CSS rules. +- The `.mod-rtl` class is added to `body` element when the user's interface language is RTL. + +### Plugins + +- Fixed `processFrontmatter` failing to process file if all properties are removed. +- Improve detection of external config changes. +- We've made several improvements to the behavior of `app.emulateMobile` that should make it easier to test that your plugins are mobile-compatible. Attempting to run a NodeJS library will present a Notice. Drag and drop will more accurately mirror the behavior on mobile. The app will have default `safe-area-inset` properties set so that your views properly account for offsets in the mobile device viewport (such as the iPhone Dynamic Island). +- Bare modals should respect `safe-area-insets` by default. +- Added loading state to some of the settings button that make remote requests. +- Global `app` has been completely removed from the API spec (previously it was marked as deprecated). diff --git a/Release notes/v1.6.md b/Release notes/v1.6.md new file mode 100644 index 000000000..76c8000ee --- /dev/null +++ b/Release notes/v1.6.md @@ -0,0 +1,124 @@ +--- +tags: + - desktop + - insider +date: 2024-05-09 +title: "1.6.0" +--- + +## Shiny new things + +- The interface direction is now mirrored when the app is set to an RTL language. +- Updated the left sidebar layout. Vault switcher is now shown at the bottom. App ribbon can now be hidden in settings or by right-clicking on the ribbon and selecting "hide ribbon." +- Character and word count is now updated based on the current text selection. +- `Tab` will now complete the path segment of the currently selected file in the Quick switcher and "Move files" modal. + +## Improved + +- Initial workspace load time should be improved. +- The "More options" menu items have been reorganized to be easier to parse visually. +- Added "Add alias" command. +- Added "Create new folder" command. +- Hotkeys and property types are now automatically reloaded if the settings are modified outside of Obsidian. +- Improved editor parsing performance. +- Added custom instructions and result when adding display text to a link. + +### Properties + +- When merging two properties, the new property name will now flash in the global property list. +- You can now double-click on a property list item to edit it. + +### Page preview + +- Hovering over a footnote ID will now display a popup with the corresponding footnote. +- Previews should now have more consistent sizing and positioning. + +### Sync Improvements + +- Updated the default selective syncing when setting up Sync. By default, Sync will now sync: + - Main settings + - Appearance settings + - Hotkeys + - Core plugins + - Core plugin settings + - Video, images, PDFs, and audio +- Arbitrary files inside plugin folders will no longer get tracked by Sync. The only files inside a plugin folder that will get tracked are: + - data.json + - main.js + - styles.css + - manifest.json +- The "Purge" button will now appear if storage is more than 95% full. +- Add command to open the activity log. +- Improve styling of status bar menu. +- Clicking the statusbar item now always shows the Sync menu instead of opening the activity log. +- Tweak appearance of "Disconnect" button in settings. +- Syncing should be faster when processing pending sync changes. +- Don't throttle when main window is minimized or in the background. +- Improved loading experience while Sync connects to the remote vault. +- Improved the interface for inviting Sync collaborators to your vault. +- Fixed issue with "View version history" not working if file is not tracked in Sync. + +## No longer broken + +- Fixed parsing and rendering of footnotes in the editor. +- Markdown files larger than 2MB will no longer get indexed. This should prevent programmatically generated Markdown files causing Obsidian to lag at startup. +- Fixed `Redo` not working when triggered from the macOS app menu. +- Properties now inherit the page preview setting of whatever mode the view is in. +- Updated the "move to new window" and "open in new window" icons. +- Updated the context menu icons in the Bookmarks view to be consistent with the rest of the app. +- Fixed workspace layout not always saving after selecting a tab. +- Attempting to open an invalid URL will show a Notice instead of failing silently. +- The "Light themes only" toggle is no longer displayed when using 'adapt to system'. +- Fixed vim mode crashing when dragging cursor over folded text. +- Don't show empty text when there's a fallback suggestion. +- Allow clicking at start of line inside blockquote. +- Fix scrolling when clicking at next to scrollbar in a PDF. +- Fixed minimized main window doesn't adapt to system theme change. +- Improved drag and drop for the command palette reordering. +- Fixed clicking "Collapse all" sometimes requiring two clicks to work. +- Fixed backlinks view not always showing an empty state. +- Fixed toggling core plugins not always showing the settings "gear" icon immediately. +- Fixed checklists getting unfolded when clicking on the checkbox. +- Fixed list collapse indicators from extending into text in Live Preview. +- Fix callout images getting clipped inside hover preview. +- Improve styling of tree items during rename. +- Fixed appearance of "destructive" menu items when they are disabled. + +### Search + +- Dismiss suggestions when typing quoted string. +- Don't open suggestions if next character is non-space. +- Clicking "clear" button will no longer cause search input fields to lose focus. + +### Localization + +- The Norsk language is now mapped to the Bokmål locale. + +### Table + +- Clicking in margin to right of table now focuses the editor. +- Fixed shift + arrow key not responding. +- Ensure cell updates from main editor correctly update cell offsets. +- Fix parsing math blocks inside table cells. + +## Developers + +- We have published [a guide](https://docs.obsidian.md/Plugins/User+interface/Right-to-left) for how to adapt your theme or plugin to support RTL interfaces. + +### Themes + +- Switched to Cascadia Mono instead of Cascadia Code for default monospace on Windows. +- Bold is now computed based on the current text weight, so bold inside a heading will still appear bold. +- Added `--caret-color` CSS variable to make it easier to style caret color on both desktop and mobile. +- Added new `--link-weight` variable. +- The user's interface language is added to the `lang` attribute on the `html` element, which allows language-specific CSS rules. +- The `.mod-rtl` class is added to `body` element when the user's interface language is RTL. + +### Plugins + +- Fixed `processFrontmatter` failing to process file if all properties are removed. +- Improve detection of external config changes. +- We've made several improvements to the behavior of `app.emulateMobile` that should make it easier to test that your plugins are mobile-compatible. Attempting to run a NodeJS library will present a Notice. Drag and drop will more accurately mirror the behavior on mobile. The app will have default `safe-area-inset` properties set so that your views properly account for offsets in the mobile device viewport (such as the iPhone Dynamic Island). +- Bare modals should respect `safe-area-insets` by default. +- Added loading state to some of the settings button that make remote requests. +- Global `app` has been completely removed from the API spec (previously it was marked as deprecated). From efae295d2eeb0bc3d6692d5fa42822109a9f2069 Mon Sep 17 00:00:00 2001 From: kepano <10565871+kepano@users.noreply.github.com> Date: Mon, 13 May 2024 09:56:38 -0700 Subject: [PATCH 49/54] Sync: Clarify language (cherry picked from commit d3bcf67676813802be49e5485569da51bebb05bb) --- .../Back up your Obsidian files.md | 20 +++--- .../Sync your notes across devices.md | 6 +- .../Select files and settings to sync.md | 64 ++++++++++--------- .../Troubleshoot Obsidian Sync.md | 2 +- 4 files changed, 49 insertions(+), 43 deletions(-) diff --git a/en/Getting started/Back up your Obsidian files.md b/en/Getting started/Back up your Obsidian files.md index 849768230..643d98f73 100644 --- a/en/Getting started/Back up your Obsidian files.md +++ b/en/Getting started/Back up your Obsidian files.md @@ -7,11 +7,11 @@ aliases: If you haven't backed up your computer yet, start now! Obsidian's [[File recovery]] plugin is a good beginning, but it's limited to notes, and the snapshots themselves should be backed up. -**Why Back Up?** +**Why back up your data?** Your notes are stored locally on your device by default, not in the cloud. This ensures that [the data is yours](https://obsidian.md/about) and gives you control over it. However, local storage is susceptible to real-world problems like corruption and data loss. Backups protect against these issues and further ensure that you control your own data. -## Understand: Syncing is not a backup +## Syncing is not a backup Services like [[Introduction to Obsidian Sync|Obsidian Sync]], iCloud, OneDrive, and Dropbox sync your notes across devices. They may offer [[Version history|note restoration]], but they are **not** designed to [back up your vault](https://www.backblaze.com/blog/cloud-backup-vs-cloud-sync/). @@ -41,17 +41,17 @@ In terms of security, you should always pay close attention to access and securi ## Use external drives -**Hard drives and SSD Drives** +**Hard drives and SSD drives** External hard drive backups are still valuable in an increasing cloud-based world, and are mainly used for data storage and computer backups. The biggest disadvantage of an external drive is that the drive can break down or get lost. The biggest advantage is that the storage space only needs to be purchased once. Using an external hard drive is often combined with a [[#Use computer backups|computer backup]]. -**USB Sticks** -USB sticks are a simple and effective method for quick backups. +**USB flash drives** +Flash drives (also called thumb drives, memory sticks, or pen drives) are a simple and effective method for quick backups. -1. Insert the USB stick into your computer or laptop. -2. Ensure the device is recognized and mounted in your file system. If necessary, format the USB stick to be compatible with your filesystem. -3. Copy your vault folder from its current location onto the USB stick. -4. Safely unmount the USB stick. -5. Remove the USB stick from your device. +1. Insert the flash drive into your computer or laptop. +2. Ensure the device is recognized and mounted in your file system. If necessary, format the flash drive to be compatible with your filesystem. +3. Copy your vault folder from its current location onto the flash drive. +4. Safely unmount the flash drive. +5. Remove the flash drive from your device. > [!tip] If your external drive contains sensitive information, it is recommended to keep the external drive secure, such as in a secured room. diff --git a/en/Getting started/Sync your notes across devices.md b/en/Getting started/Sync your notes across devices.md index fe883bbee..32ed147e8 100644 --- a/en/Getting started/Sync your notes across devices.md +++ b/en/Getting started/Sync your notes across devices.md @@ -8,15 +8,15 @@ The easiest way to sync your notes between your devices is to use [[Introduction Note that using multiple syncing services at the same time (e.g., Obsidian Sync _and_ Dropbox) may cause data loss, corruption, and other issues. [[Back up your Obsidian files|Find out more about using Obsidian Sync with other services here.]] -> [!important] Dealing with on-demand cloud storage -> Some cloud storage services, such as OneDrive, allow you to only download files when you use them and later remove them locally to free up space. Since the files are no longer available locally, Obsidian Sync believes they've been deleted and removes them from your remote vault. +> [!warning] On-demand cloud storage +> Some cloud storage services, such as OneDrive and Dropbox, allow you to only download files when you use them and later remove them locally to free up space. Since the files are no longer available locally, Obsidian Sync believes they've been deleted and removes them from your remote vault. > > To use Obsidian Sync together with Files On-Demand and similar features, make sure to configure the service to always keep the files on the device. ^sync-files-on-demand If you don't want to use Obsidian Sync, this page lists alternative methods for syncing your vaults with multiple devices. -## Sync notes across multiple desktops +## Sync notes across multiple desktop devices If you don't use Obsidian on your mobile devices, you can use any third-party service that syncs a local folder to a cloud storage. diff --git a/en/Obsidian Sync/Select files and settings to sync.md b/en/Obsidian Sync/Select files and settings to sync.md index 3fabdc1d8..34428f5d0 100644 --- a/en/Obsidian Sync/Select files and settings to sync.md +++ b/en/Obsidian Sync/Select files and settings to sync.md @@ -1,26 +1,46 @@ -Any files or settings that have been synced to your [[Local and remote vaults|remote vault]] count towards your [[Sync limitations#How large can each remote vault be|storage space]]. By default, [[Introduction to Obsidian Sync|Obsidian Sync]] ignores larger files such as audio, video, and PDFs. +Any files or settings that have been synced to your [[Local and remote vaults|remote vault]] count towards your [[Sync limitations#How large can each remote vault be|storage space]]. By default, [[Introduction to Obsidian Sync|Obsidian Sync]] does not sync larger files such as audio, video, and PDFs. -**Synced files and exclusions**: -Synced files remain in your remote vault even if you exclude them later on. If possible, configure the files and settings you want to sync before you start syncing your vault. +## Change the file types you want to sync -**Sync does not sync .hidden folders:** -`.hidden` folders will not sync, with the exception of the [[configuration folder]], as these are considered folders hidden from the filesystem. +1. Open **Settings → Sync**. +2. Under **Selective sync**, enable the file types you want to sync. +3. Restart the application to ensure that your new settings take effect. On mobile or tablet, this may require a force quit. + +Note that your [[Plans and storage limits|Sync plan]] defines the maximum file size you can sync. With the Standard plan you can sync files up to 5MB, while the Plus plan allows you to sync files up to 200MB. + +> [!info] Synced files will not be deleted from your remote vault if you exclude them from sync. If possible, configure the files and settings you want to sync before you start syncing your vault to prevent using storage space unnecessarily. + +## Exclude a folder from being synced + +By default, Obsidian syncs all files and folders in your vault. If you don't want Obsidian to sync a specific folder, you can exclude it. + +1. Open **Settings → Sync**. +2. Under **Selective sync**, next to **Excluded folders**, select **Manage**. +3. Select the checkbox to the left of the folder you want to exclude. +4. Select **Done**. + +## Always excluded from sync + +### Folders that start with a dot are not synced -Common examples include `.vscode`, `.git`, and `.idea`. +Any folder that starts with a `.` such as`.hidden` will not sync, because these are considered hidden folders in the filesystem. The only exception is your [[configuration folder]], which is called `.obsidian` by default. -==**Sync does not sync Sync's settings**==: -This allows users to configure Sync differently on each device according to their needs. This means, however, that you must configure custom Sync settings on each device. +Common examples of hidden folders that will not be synced include `.vscode`, `.git`, and `.idea`. -> [!tip] Sync settings and application restarts -> Obsidian **only** applies vault settings during start-up. If you change a setting on one device, you **need to restart** Obsidian on your other devices for the new changes to take effect. +### Sync settings are not synced + +Sync settings are not synced so that each each device can be separately configured according to your needs. + +> [!tip] Restart the app to apply settings changes on other devices +> Obsidian **only** applies vault settings when the app starts. If you change a setting on one device, you **must restart** Obsidian on your other devices for the new changes to take effect. > > For example, if you change the path of your daily notes in the [[Daily Notes]] plugin, you need to restart Obsidian on your other devices to use the new path. -## Syncing your vault settings +## Updating your synced vault settings -> [!help] These instructions are designed for users with existing multi-device sync setups who wish to modify these settings across their devices. +If you have an existing multi-device sync setup and want to modify your sync settings across devices. -**Primary device** +### Primary device The primary device is your source-of-truth device. It can also mean the device you make the new change on, that you wish to sync across your other devices. @@ -29,29 +49,15 @@ The primary device is your source-of-truth device. It can also mean the device y 3. Restart Obsidian. On mobile or tablet, this may require a force quit. 4. Allow time for the settings to synchronize with your remote vault. -**Secondary device(s)** +### Secondary device(s) -The secondary device is your other devices. It can also mean the devices you wish to receive an updated change on. +The secondary device is another device you use Obsidian with (e.g. your phone). It can also mean the devices you wish to receive an updated change on. 1. Navigate to **Settings** → **Sync**. 2. Enable the desired settings under **Vault configuration sync**. 3. Wait for the changes to be downloaded from your remote vault. 4. Restart the application to ensure that your synchronized settings take effect. On mobile or tablet, this may require a force quit. -## Select file types to sync - -1. Open **Settings → Sync**. -2. Under **Selective sync**, enable the file types you want to sync. -3. Restart the application to ensure that your new settings take effect. On mobile or tablet, this may require a force quit. - -## Exclude folder from being synced - -By default, Obsidian syncs all files and folders in your vault. If you don't want Obsidian to sync a certain folder, you can exclude it. - -1. Open **Settings → Sync**. -2. Under **Selective sync**, next to **Excluded folders**, select **Manage**. -3. Select the checkbox to the left of the folder you want to exclude. -4. Select **Done**. ## Settings profiles diff --git a/en/Obsidian Sync/Troubleshoot Obsidian Sync.md b/en/Obsidian Sync/Troubleshoot Obsidian Sync.md index af7477efb..82a6c6d2f 100644 --- a/en/Obsidian Sync/Troubleshoot Obsidian Sync.md +++ b/en/Obsidian Sync/Troubleshoot Obsidian Sync.md @@ -2,7 +2,7 @@ cssClasses: soft-embed --- -This page lists common issues that you might encounter, and how to address them. +This page lists common issues that you might encounter with [[Introduction to Obsidian Sync|Obsidian Sync]], and how to address them. ![[Sync your notes across devices#^sync-files-on-demand]] From c646bf2639c3a97e3916df38284b2806d9b74a3f Mon Sep 17 00:00:00 2001 From: kepano <10565871+kepano@users.noreply.github.com> Date: Tue, 14 May 2024 16:39:53 -0700 Subject: [PATCH 50/54] Sync: clarity (cherry picked from commit c09eedff88427ddc991963f18148e47d34f9e9f4) --- en/Obsidian Sync/Troubleshoot Obsidian Sync.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/Obsidian Sync/Troubleshoot Obsidian Sync.md b/en/Obsidian Sync/Troubleshoot Obsidian Sync.md index 82a6c6d2f..76dcafff2 100644 --- a/en/Obsidian Sync/Troubleshoot Obsidian Sync.md +++ b/en/Obsidian Sync/Troubleshoot Obsidian Sync.md @@ -28,7 +28,7 @@ If a note was created locally on a device less than a couple of minutes before S ### Obsidian Sync will not Sync my plugins and settings updates -Obsidian [[Sync limitations#Does Obsidian Sync live-reload my settings?|does not live]], or hot reload, settings. You will need to restart Obsidian on the other devices after they have updated their settings. On mobile devices, this may require a force-quit of Obsidian. +Obsidian [[Sync limitations#Does Obsidian Sync live-reload my settings?|does not live-reload settings]]. You will need to restart Obsidian on the other devices after they have updated their settings. On mobile devices, this may require a force-quit of Obsidian. > [!example]- Example: Changing a theme > - Your primary device, a computer, currently has a custom theme and you decide to change it back to the default theme. From 3b597cdc83c634ace2ce8ac66f3899bef27895c3 Mon Sep 17 00:00:00 2001 From: kepano <10565871+kepano@users.noreply.github.com> Date: Tue, 14 May 2024 18:45:00 -0700 Subject: [PATCH 51/54] Sync: Add upgrade instructions (cherry picked from commit 56e1b1117894c29c6b3fb6b1c49dd2da7263e8bf) --- en/Obsidian Sync/Plans and storage limits.md | 4 ++++ en/Obsidian Sync/Sync limitations.md | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/en/Obsidian Sync/Plans and storage limits.md b/en/Obsidian Sync/Plans and storage limits.md index e08d184ec..061ac6ed3 100644 --- a/en/Obsidian Sync/Plans and storage limits.md +++ b/en/Obsidian Sync/Plans and storage limits.md @@ -58,6 +58,10 @@ To sync to a new remote vault, follow these steps: The new remote vault should be smaller than the previous vault, because of the absence of version history and excluded files. +## Upgrade your plan + +You can upgrade your plan by logging into [your account dashboard](https://obsidian.md/account). From there you will be able to upgrade your plan from Sync Standard to Sync Plus, and increase storage up to 100 GB. + ## Downgrade your plan If you want to downgrade your Sync plan but your storage use exceeds the new plan's limit, you will need to free up space in your remote vault. Currently, there's no direct method to remove specific files from an existing remote vault quickly. This is because attachments are retained in version history for up to two weeks, and version history counts towards your storage limit. diff --git a/en/Obsidian Sync/Sync limitations.md b/en/Obsidian Sync/Sync limitations.md index 99d6ba275..0ee294235 100644 --- a/en/Obsidian Sync/Sync limitations.md +++ b/en/Obsidian Sync/Sync limitations.md @@ -4,7 +4,6 @@ aliases: - Sync limitations - Sync FAQ --- - This page lists some of the common questions related to questions and limitations for [[Introduction to Obsidian Sync|Obsidian Sync]]. ## General From 50827f3b802e92385fe8946b4098b2c357e517a8 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Wed, 15 May 2024 13:44:56 -0500 Subject: [PATCH 52/54] Fixed remote vault question Signed-off-by: Sigrunixia --- en/Obsidian Sync/Plans and storage limits.md | 2 +- en/Obsidian Sync/Sync limitations.md | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/en/Obsidian Sync/Plans and storage limits.md b/en/Obsidian Sync/Plans and storage limits.md index 061ac6ed3..dcc540533 100644 --- a/en/Obsidian Sync/Plans and storage limits.md +++ b/en/Obsidian Sync/Plans and storage limits.md @@ -74,4 +74,4 @@ If you are downgrading from Sync Plus to Sync Standard, you'll also need to redu Attachments are held in your [[version history]] for up to two weeks. If you plan to downgrade in the near future, you can start by removing attachments from your local vault. -After two weeks these will be purged from the remote vault and will no longer count towards your storage limit. At this point you will be able to downgrade your plan while preserving the version history for other file types, such as Markdown files. \ No newline at end of file +After two weeks these will be purged from the remote vault and will no longer count towards your storage limit. At this point you will be able to downgrade your plan while preserving the version history for other file types, such as Markdown files. diff --git a/en/Obsidian Sync/Sync limitations.md b/en/Obsidian Sync/Sync limitations.md index 0ee294235..1b52ee6eb 100644 --- a/en/Obsidian Sync/Sync limitations.md +++ b/en/Obsidian Sync/Sync limitations.md @@ -4,6 +4,7 @@ aliases: - Sync limitations - Sync FAQ --- + This page lists some of the common questions related to questions and limitations for [[Introduction to Obsidian Sync|Obsidian Sync]]. ## General @@ -24,13 +25,13 @@ You can add additional syncing options of PDF's, audio files, video files, and o ### How much storage do I have? -The storage limit depends on your Obsidian Sync plan. The maximum storage amount is 100 GB. This storage limit includes [[Version history|version history]]. +The storage limit depends on your Obsidian [[Plans and storage limits#Plans|Sync plan]]. The maximum storage amount is 100 GB. This storage limit includes [[Version history|version history]]. You can view **Storage usage** in the Obsidian app by going to **Settings → Sync**. -### How many remote vaults can I have? - -Each account with Obsidian Sync can have up to 10 remote vaults. +### How many remote vaults can I have? + +The amount of remote vaults you can have is determined based on your [[Plans and storage limits#Plans|Sync plan]]. ### How large can each remote vault be? From a2e307db7826d4a3a0b9aaedc0c293cba88c3ea4 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Wed, 15 May 2024 13:52:31 -0500 Subject: [PATCH 53/54] Revert "Release notes" This reverts commit be67fd971f8d3b535774d00cfe4c854e9c9d58c7. --- Release notes/v1.6.0.md | 124 ---------------------------------------- Release notes/v1.6.md | 124 ---------------------------------------- 2 files changed, 248 deletions(-) delete mode 100644 Release notes/v1.6.0.md delete mode 100644 Release notes/v1.6.md diff --git a/Release notes/v1.6.0.md b/Release notes/v1.6.0.md deleted file mode 100644 index 76c8000ee..000000000 --- a/Release notes/v1.6.0.md +++ /dev/null @@ -1,124 +0,0 @@ ---- -tags: - - desktop - - insider -date: 2024-05-09 -title: "1.6.0" ---- - -## Shiny new things - -- The interface direction is now mirrored when the app is set to an RTL language. -- Updated the left sidebar layout. Vault switcher is now shown at the bottom. App ribbon can now be hidden in settings or by right-clicking on the ribbon and selecting "hide ribbon." -- Character and word count is now updated based on the current text selection. -- `Tab` will now complete the path segment of the currently selected file in the Quick switcher and "Move files" modal. - -## Improved - -- Initial workspace load time should be improved. -- The "More options" menu items have been reorganized to be easier to parse visually. -- Added "Add alias" command. -- Added "Create new folder" command. -- Hotkeys and property types are now automatically reloaded if the settings are modified outside of Obsidian. -- Improved editor parsing performance. -- Added custom instructions and result when adding display text to a link. - -### Properties - -- When merging two properties, the new property name will now flash in the global property list. -- You can now double-click on a property list item to edit it. - -### Page preview - -- Hovering over a footnote ID will now display a popup with the corresponding footnote. -- Previews should now have more consistent sizing and positioning. - -### Sync Improvements - -- Updated the default selective syncing when setting up Sync. By default, Sync will now sync: - - Main settings - - Appearance settings - - Hotkeys - - Core plugins - - Core plugin settings - - Video, images, PDFs, and audio -- Arbitrary files inside plugin folders will no longer get tracked by Sync. The only files inside a plugin folder that will get tracked are: - - data.json - - main.js - - styles.css - - manifest.json -- The "Purge" button will now appear if storage is more than 95% full. -- Add command to open the activity log. -- Improve styling of status bar menu. -- Clicking the statusbar item now always shows the Sync menu instead of opening the activity log. -- Tweak appearance of "Disconnect" button in settings. -- Syncing should be faster when processing pending sync changes. -- Don't throttle when main window is minimized or in the background. -- Improved loading experience while Sync connects to the remote vault. -- Improved the interface for inviting Sync collaborators to your vault. -- Fixed issue with "View version history" not working if file is not tracked in Sync. - -## No longer broken - -- Fixed parsing and rendering of footnotes in the editor. -- Markdown files larger than 2MB will no longer get indexed. This should prevent programmatically generated Markdown files causing Obsidian to lag at startup. -- Fixed `Redo` not working when triggered from the macOS app menu. -- Properties now inherit the page preview setting of whatever mode the view is in. -- Updated the "move to new window" and "open in new window" icons. -- Updated the context menu icons in the Bookmarks view to be consistent with the rest of the app. -- Fixed workspace layout not always saving after selecting a tab. -- Attempting to open an invalid URL will show a Notice instead of failing silently. -- The "Light themes only" toggle is no longer displayed when using 'adapt to system'. -- Fixed vim mode crashing when dragging cursor over folded text. -- Don't show empty text when there's a fallback suggestion. -- Allow clicking at start of line inside blockquote. -- Fix scrolling when clicking at next to scrollbar in a PDF. -- Fixed minimized main window doesn't adapt to system theme change. -- Improved drag and drop for the command palette reordering. -- Fixed clicking "Collapse all" sometimes requiring two clicks to work. -- Fixed backlinks view not always showing an empty state. -- Fixed toggling core plugins not always showing the settings "gear" icon immediately. -- Fixed checklists getting unfolded when clicking on the checkbox. -- Fixed list collapse indicators from extending into text in Live Preview. -- Fix callout images getting clipped inside hover preview. -- Improve styling of tree items during rename. -- Fixed appearance of "destructive" menu items when they are disabled. - -### Search - -- Dismiss suggestions when typing quoted string. -- Don't open suggestions if next character is non-space. -- Clicking "clear" button will no longer cause search input fields to lose focus. - -### Localization - -- The Norsk language is now mapped to the Bokmål locale. - -### Table - -- Clicking in margin to right of table now focuses the editor. -- Fixed shift + arrow key not responding. -- Ensure cell updates from main editor correctly update cell offsets. -- Fix parsing math blocks inside table cells. - -## Developers - -- We have published [a guide](https://docs.obsidian.md/Plugins/User+interface/Right-to-left) for how to adapt your theme or plugin to support RTL interfaces. - -### Themes - -- Switched to Cascadia Mono instead of Cascadia Code for default monospace on Windows. -- Bold is now computed based on the current text weight, so bold inside a heading will still appear bold. -- Added `--caret-color` CSS variable to make it easier to style caret color on both desktop and mobile. -- Added new `--link-weight` variable. -- The user's interface language is added to the `lang` attribute on the `html` element, which allows language-specific CSS rules. -- The `.mod-rtl` class is added to `body` element when the user's interface language is RTL. - -### Plugins - -- Fixed `processFrontmatter` failing to process file if all properties are removed. -- Improve detection of external config changes. -- We've made several improvements to the behavior of `app.emulateMobile` that should make it easier to test that your plugins are mobile-compatible. Attempting to run a NodeJS library will present a Notice. Drag and drop will more accurately mirror the behavior on mobile. The app will have default `safe-area-inset` properties set so that your views properly account for offsets in the mobile device viewport (such as the iPhone Dynamic Island). -- Bare modals should respect `safe-area-insets` by default. -- Added loading state to some of the settings button that make remote requests. -- Global `app` has been completely removed from the API spec (previously it was marked as deprecated). diff --git a/Release notes/v1.6.md b/Release notes/v1.6.md deleted file mode 100644 index 76c8000ee..000000000 --- a/Release notes/v1.6.md +++ /dev/null @@ -1,124 +0,0 @@ ---- -tags: - - desktop - - insider -date: 2024-05-09 -title: "1.6.0" ---- - -## Shiny new things - -- The interface direction is now mirrored when the app is set to an RTL language. -- Updated the left sidebar layout. Vault switcher is now shown at the bottom. App ribbon can now be hidden in settings or by right-clicking on the ribbon and selecting "hide ribbon." -- Character and word count is now updated based on the current text selection. -- `Tab` will now complete the path segment of the currently selected file in the Quick switcher and "Move files" modal. - -## Improved - -- Initial workspace load time should be improved. -- The "More options" menu items have been reorganized to be easier to parse visually. -- Added "Add alias" command. -- Added "Create new folder" command. -- Hotkeys and property types are now automatically reloaded if the settings are modified outside of Obsidian. -- Improved editor parsing performance. -- Added custom instructions and result when adding display text to a link. - -### Properties - -- When merging two properties, the new property name will now flash in the global property list. -- You can now double-click on a property list item to edit it. - -### Page preview - -- Hovering over a footnote ID will now display a popup with the corresponding footnote. -- Previews should now have more consistent sizing and positioning. - -### Sync Improvements - -- Updated the default selective syncing when setting up Sync. By default, Sync will now sync: - - Main settings - - Appearance settings - - Hotkeys - - Core plugins - - Core plugin settings - - Video, images, PDFs, and audio -- Arbitrary files inside plugin folders will no longer get tracked by Sync. The only files inside a plugin folder that will get tracked are: - - data.json - - main.js - - styles.css - - manifest.json -- The "Purge" button will now appear if storage is more than 95% full. -- Add command to open the activity log. -- Improve styling of status bar menu. -- Clicking the statusbar item now always shows the Sync menu instead of opening the activity log. -- Tweak appearance of "Disconnect" button in settings. -- Syncing should be faster when processing pending sync changes. -- Don't throttle when main window is minimized or in the background. -- Improved loading experience while Sync connects to the remote vault. -- Improved the interface for inviting Sync collaborators to your vault. -- Fixed issue with "View version history" not working if file is not tracked in Sync. - -## No longer broken - -- Fixed parsing and rendering of footnotes in the editor. -- Markdown files larger than 2MB will no longer get indexed. This should prevent programmatically generated Markdown files causing Obsidian to lag at startup. -- Fixed `Redo` not working when triggered from the macOS app menu. -- Properties now inherit the page preview setting of whatever mode the view is in. -- Updated the "move to new window" and "open in new window" icons. -- Updated the context menu icons in the Bookmarks view to be consistent with the rest of the app. -- Fixed workspace layout not always saving after selecting a tab. -- Attempting to open an invalid URL will show a Notice instead of failing silently. -- The "Light themes only" toggle is no longer displayed when using 'adapt to system'. -- Fixed vim mode crashing when dragging cursor over folded text. -- Don't show empty text when there's a fallback suggestion. -- Allow clicking at start of line inside blockquote. -- Fix scrolling when clicking at next to scrollbar in a PDF. -- Fixed minimized main window doesn't adapt to system theme change. -- Improved drag and drop for the command palette reordering. -- Fixed clicking "Collapse all" sometimes requiring two clicks to work. -- Fixed backlinks view not always showing an empty state. -- Fixed toggling core plugins not always showing the settings "gear" icon immediately. -- Fixed checklists getting unfolded when clicking on the checkbox. -- Fixed list collapse indicators from extending into text in Live Preview. -- Fix callout images getting clipped inside hover preview. -- Improve styling of tree items during rename. -- Fixed appearance of "destructive" menu items when they are disabled. - -### Search - -- Dismiss suggestions when typing quoted string. -- Don't open suggestions if next character is non-space. -- Clicking "clear" button will no longer cause search input fields to lose focus. - -### Localization - -- The Norsk language is now mapped to the Bokmål locale. - -### Table - -- Clicking in margin to right of table now focuses the editor. -- Fixed shift + arrow key not responding. -- Ensure cell updates from main editor correctly update cell offsets. -- Fix parsing math blocks inside table cells. - -## Developers - -- We have published [a guide](https://docs.obsidian.md/Plugins/User+interface/Right-to-left) for how to adapt your theme or plugin to support RTL interfaces. - -### Themes - -- Switched to Cascadia Mono instead of Cascadia Code for default monospace on Windows. -- Bold is now computed based on the current text weight, so bold inside a heading will still appear bold. -- Added `--caret-color` CSS variable to make it easier to style caret color on both desktop and mobile. -- Added new `--link-weight` variable. -- The user's interface language is added to the `lang` attribute on the `html` element, which allows language-specific CSS rules. -- The `.mod-rtl` class is added to `body` element when the user's interface language is RTL. - -### Plugins - -- Fixed `processFrontmatter` failing to process file if all properties are removed. -- Improve detection of external config changes. -- We've made several improvements to the behavior of `app.emulateMobile` that should make it easier to test that your plugins are mobile-compatible. Attempting to run a NodeJS library will present a Notice. Drag and drop will more accurately mirror the behavior on mobile. The app will have default `safe-area-inset` properties set so that your views properly account for offsets in the mobile device viewport (such as the iPhone Dynamic Island). -- Bare modals should respect `safe-area-insets` by default. -- Added loading state to some of the settings button that make remote requests. -- Global `app` has been completely removed from the API spec (previously it was marked as deprecated). From f8e17bdca8e22e899cd928803b24914f2b2968d4 Mon Sep 17 00:00:00 2001 From: Sigrunixia Date: Fri, 17 May 2024 16:20:31 -0500 Subject: [PATCH 54/54] Adjusted header positions for flow and clarity Signed-off-by: Sigrunixia --- en/Obsidian Publish/Manage sites.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/Obsidian Publish/Manage sites.md b/en/Obsidian Publish/Manage sites.md index 74350f696..e9c3db633 100644 --- a/en/Obsidian Publish/Manage sites.md +++ b/en/Obsidian Publish/Manage sites.md @@ -67,7 +67,7 @@ A site is a collection of notes that's hosted by Obsidian Publish and available | Hide page title | Toggle | Enable or disable the inline title of a published note to be displayed. | | Readable line length | Toggle | Enable or disable readable line length within your site. | | Strict line breaks | Toggle | Enable or disable single line breaks from being displayed on your site. | -| Stack Pages | Toggle | Enable or disable [[Tabs#Stack tab groups|Stacked tabs]] on your site. | +| Stack Pages | Toggle | Enable or disable [[Tabs#Stack tab groups\|Stacked tabs]] on your site. | ### Components