diff --git a/app/actions/definitions/navigation.tsx b/app/actions/definitions/navigation.tsx index 003865a8f..825b2a0d0 100644 --- a/app/actions/definitions/navigation.tsx +++ b/app/actions/definitions/navigation.tsx @@ -9,6 +9,7 @@ import { ShapesIcon, KeyboardIcon, EmailIcon, + LogoutIcon, } from "outline-icons"; import * as React from "react"; import { @@ -138,6 +139,7 @@ export const openKeyboardShortcuts = createAction({ export const logout = createAction({ name: ({ t }) => t("Log out"), section: NavigationSection, + icon: , perform: () => stores.auth.logout(), }); diff --git a/app/components/CommandBarItem.tsx b/app/components/CommandBarItem.tsx index 7977d4d40..209e6ef71 100644 --- a/app/components/CommandBarItem.tsx +++ b/app/components/CommandBarItem.tsx @@ -1,7 +1,7 @@ import { ActionImpl } from "kbar"; import { ArrowIcon, BackIcon } from "outline-icons"; import * as React from "react"; -import styled, { css } from "styled-components"; +import styled, { css, useTheme } from "styled-components"; import Flex from "~/components/Flex"; import Key from "~/components/Key"; @@ -15,6 +15,7 @@ function CommandBarItem( { action, active, currentRootActionId }: Props, ref: React.RefObject ) { + const theme = useTheme(); const ancestors = React.useMemo(() => { if (!currentRootActionId) { return action.ancestors; @@ -47,7 +48,7 @@ function CommandBarItem( {ancestors.map((ancestor) => ( {ancestor.name} - + ))} {action.name} diff --git a/package.json b/package.json index cbc860b82..6dd8e9496 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "mobx-react": "^6.3.1", "natural-sort": "^1.0.0", "nodemailer": "^6.6.1", - "outline-icons": "^1.37.0", + "outline-icons": "^1.38.1", "oy-vey": "^0.10.0", "passport": "^0.4.1", "passport-google-oauth2": "^0.2.0", @@ -147,7 +147,7 @@ "react-window": "^1.8.6", "reakit": "^1.3.10", "regenerator-runtime": "^0.13.7", - "rich-markdown-editor": "^11.20.2", + "rich-markdown-editor": "^11.21.0", "semver": "^7.3.2", "sequelize": "^6.9.0", "sequelize-cli": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index 590b6d39a..2578631ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11184,10 +11184,10 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -outline-icons@^1.26.1, outline-icons@^1.37.0: - version "1.37.0" - resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.37.0.tgz#d189a07519d10da913fd4fc2942dd49db804fe82" - integrity sha512-rWgGbPIrAtRSPHx81NkuR9dKWO1yKbrvT0WcFq5XgetX+Jsri8wQxwt3unSVWVQlkK1AwJR3o5b/FT/b8ifj9w== +outline-icons@^1.38.1: + version "1.38.1" + resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.38.1.tgz#2f72e360549cb3dda5b3e7c17feaccaab1617da0" + integrity sha512-Lkdn8jvh3/hoS298hAdVgNZMxtDlx1zUJRFU4teESL7cyodFpFaG7WUBs6ZM+11j8uMisp/8PyPrZ5IPJwmrcg== oy-vey@^0.10.0: version "0.10.0" @@ -12986,10 +12986,10 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rich-markdown-editor@^11.20.2: - version "11.20.2" - resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-11.20.2.tgz#31fdb4ef007de99534149c1d7d5658e6668b659e" - integrity sha512-g2394voR9jfOjj2e8Y5mM/9FZtBV41iqBdqdLw/6nj+G1izFPWgUSjbjRV7y22ZRdaxeWSHKX+KuCQtYQeKqzg== +rich-markdown-editor@^11.21.0: + version "11.21.0" + resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-11.21.0.tgz#bd94e8831940cb11514ab1f891e5c494916406e2" + integrity sha512-gH06ZQnSS1Nqj7LZe6yF4DaQXM8rBoRPkomd+9dmO41MQlNRV7sCln7+brarz+hzis4I7yaAXaw3Jr81o1u6kA== dependencies: copy-to-clipboard "^3.0.8" fuzzy-search "^3.2.1" @@ -12998,7 +12998,7 @@ rich-markdown-editor@^11.20.2: markdown-it "^12.2.0" markdown-it-container "^3.0.0" markdown-it-emoji "^2.0.0" - outline-icons "^1.26.1" + outline-icons "^1.38.1" prosemirror-commands "^1.1.6" prosemirror-dropcursor "^1.3.3" prosemirror-gapcursor "^1.1.5"