Merge branch 'main' into feat/mass-import

shared/i18n/locales/en_US/translation.json

@@ -8,6 +8,10 @@
   "Drafts": "Drafts",
   "Templates": "Templates",
   "Deleted Collection": "Deleted Collection",
+  "Sorry, an error occurred saving the collection": "Sorry, an error occurred saving the collection",
+  "Add a description": "Add a description",
+  "Collapse": "Collapse",
+  "Expand": "Expand",
   "Submenu": "Submenu",
   "New": "New",
   "Only visible to you": "Only visible to you",
@@ -94,7 +98,7 @@
   "Settings": "Settings",
   "Invite people": "Invite people",
   "Create a collection": "Create a collection",
-  "Return to App": "Return to App",
+  "Return to App": "Back to App",
   "Account": "Account",
   "Profile": "Profile",
   "Notifications": "Notifications",
@@ -108,8 +112,6 @@
   "Import / Export": "Import / Export",
   "Integrations": "Integrations",
   "Installation": "Installation",
-  "Expand": "Expand",
-  "Collapse": "Collapse",
   "Unstar": "Unstar",
   "Star": "Star",
   "Appearance": "Appearance",
@@ -204,8 +206,6 @@
   "The collection was updated": "The collection was updated",
   "You can edit the name and other details at any time, however doing so often might confuse your team mates.": "You can edit the name and other details at any time, however doing so often might confuse your team mates.",
   "Name": "Name",
-  "Description": "Description",
-  "More details about this collection…": "More details about this collection…",
   "Alphabetical": "Alphabetical",
   "Private collection": "Private collection",
   "A private collection will only be visible to invited team members.": "A private collection will only be visible to invited team members.",
@@ -237,12 +237,9 @@
   "Never signed in": "Never signed in",
   "Invited": "Invited",
   "Admin": "Admin",
-  "Collections are for grouping your knowledge base. They work best when organized around a topic or internal team — Product or Engineering for example.": "Collections are for grouping your knowledge base. They work best when organized around a topic or internal team — Product or Engineering for example.",
+  "Collections are for grouping your documents. They work best when organized around a topic or internal team — Product or Engineering for example.": "Collections are for grouping your documents. They work best when organized around a topic or internal team — Product or Engineering for example.",
   "Creating": "Creating",
   "Create": "Create",
-  "Recently viewed": "Recently viewed",
-  "Created by me": "Created by me",
-  "Search documents": "Search documents",
   "Hide contents": "Hide contents",
   "Show contents": "Show contents",
   "Archived": "Archived",
@@ -260,6 +257,7 @@
   "Deleting": "Deleting",
   "I’m sure – Delete": "I’m sure – Delete",
   "Archiving": "Archiving",
+  "Search documents": "Search documents",
   "No documents found for your filters.": "No documents found for your filters.",
   "You’ve not got any drafts at the moment.": "You’ve not got any drafts at the moment.",
   "Not found": "Not found",
@@ -275,6 +273,8 @@
   "Could not remove user": "Could not remove user",
   "Add people": "Add people",
   "This group has no members.": "This group has no members.",
+  "Recently viewed": "Recently viewed",
+  "Created by me": "Created by me",
   "Outline is designed to be fast and easy to use. All of your usual keyboard shortcuts work here, and there’s Markdown too.": "Outline is designed to be fast and easy to use. All of your usual keyboard shortcuts work here, and there’s Markdown too.",
   "Navigation": "Navigation",
   "New document in current collection": "New document in current collection",

shared/styles/globals.js

@@ -37,6 +37,21 @@ export default createGlobalStyle`
     text-rendering: optimizeLegibility;
   }
 
+  @media (min-width: ${(props) =>
+    props.theme.breakpoints.tablet}px) and (display-mode: standalone) {
+    body:after {
+      content: "";
+      display: block;
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      height: 1px;
+      background: ${(props) => props.theme.divider};
+      z-index: ${(props) => props.theme.depths.pwaSeparator};
+    }
+  }
+
   a {
     color: ${(props) => props.theme.link};
     text-decoration: none;

shared/styles/theme.js

@@ -114,6 +114,7 @@ export const base = {
     toasts: 5000,
     loadingIndicatorBar: 6000,
     popover: 9000,
+    pwaSeparator: 10000,
   },
 };