From 41a96e43319db8b8bfa77a28335979a26673f19b Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Wed, 2 May 2018 21:51:39 -0700 Subject: [PATCH] Remove Icons --- .../DocumentPreview/DocumentPreview.js | 2 +- app/components/Icon/BackIcon.js | 12 -- app/components/Icon/BlockQuoteIcon.js | 12 -- app/components/Icon/BoldIcon.js | 12 -- app/components/Icon/BulletedListIcon.js | 12 -- app/components/Icon/CheckboxIcon.js | 22 ---- app/components/Icon/CloseIcon.js | 15 --- app/components/Icon/CodeIcon.js | 12 -- app/components/Icon/CollapsedIcon.js | 12 -- app/components/Icon/CollectionIcon.js | 19 ---- app/components/Icon/DocumentIcon.js | 15 --- app/components/Icon/EditIcon.js | 12 -- app/components/Icon/GoToIcon.js | 15 --- app/components/Icon/Heading1Icon.js | 12 -- app/components/Icon/Heading2Icon.js | 12 -- app/components/Icon/HomeIcon.js | 12 -- app/components/Icon/HorizontalRuleIcon.js | 15 --- app/components/Icon/Icon.js | 46 -------- app/components/Icon/ImageIcon.js | 12 -- app/components/Icon/ItalicIcon.js | 12 -- app/components/Icon/KeyboardIcon.js | 12 -- app/components/Icon/LinkIcon.js | 12 -- app/components/Icon/MenuIcon.js | 12 -- app/components/Icon/MoreIcon.js | 15 --- app/components/Icon/NewDocumentIcon.js | 15 --- app/components/Icon/NextIcon.js | 15 --- app/components/Icon/OpenIcon.js | 12 -- app/components/Icon/OrderedListIcon.js | 12 -- app/components/Icon/PinIcon.js | 12 -- app/components/Icon/PlusIcon.js | 12 -- app/components/Icon/ProfileIcon.js | 12 -- app/components/Icon/SearchIcon.js | 12 -- app/components/Icon/SettingsIcon.js | 12 -- app/components/Icon/StarredIcon.js | 12 -- app/components/Icon/StrikethroughIcon.js | 12 -- app/components/Icon/TableIcon.js | 15 --- app/components/Icon/TodoListIcon.js | 12 -- app/components/Icon/TrashIcon.js | 12 -- app/components/Icon/UserIcon.js | 12 -- app/components/Icon/index.js | 3 - app/components/Modal/Modal.js | 2 +- app/components/Sidebar/Main.js | 7 +- app/components/Sidebar/Settings.js | 7 +- app/components/Sidebar/Sidebar.js | 4 +- .../Sidebar/components/Collections.js | 3 +- .../Sidebar/components/SidebarLink.js | 2 +- app/menus/CollectionMenu.js | 2 +- app/menus/DocumentMenu.js | 3 +- app/scenes/Collection/Collection.js | 6 +- app/scenes/Document/Document.js | 5 +- app/scenes/Document/components/Actions.js | 4 +- .../DocumentMove/components/PathToDocument.js | 4 +- app/scenes/Search/components/SearchField.js | 5 +- app/scenes/Settings/components/UserMenu.js | 2 +- package.json | 3 +- yarn.lock | 106 +++++++++++++++++- 56 files changed, 126 insertions(+), 575 deletions(-) delete mode 100644 app/components/Icon/BackIcon.js delete mode 100644 app/components/Icon/BlockQuoteIcon.js delete mode 100644 app/components/Icon/BoldIcon.js delete mode 100644 app/components/Icon/BulletedListIcon.js delete mode 100644 app/components/Icon/CheckboxIcon.js delete mode 100644 app/components/Icon/CloseIcon.js delete mode 100644 app/components/Icon/CodeIcon.js delete mode 100644 app/components/Icon/CollapsedIcon.js delete mode 100644 app/components/Icon/CollectionIcon.js delete mode 100644 app/components/Icon/DocumentIcon.js delete mode 100644 app/components/Icon/EditIcon.js delete mode 100644 app/components/Icon/GoToIcon.js delete mode 100644 app/components/Icon/Heading1Icon.js delete mode 100644 app/components/Icon/Heading2Icon.js delete mode 100644 app/components/Icon/HomeIcon.js delete mode 100644 app/components/Icon/HorizontalRuleIcon.js delete mode 100644 app/components/Icon/Icon.js delete mode 100644 app/components/Icon/ImageIcon.js delete mode 100644 app/components/Icon/ItalicIcon.js delete mode 100644 app/components/Icon/KeyboardIcon.js delete mode 100644 app/components/Icon/LinkIcon.js delete mode 100644 app/components/Icon/MenuIcon.js delete mode 100644 app/components/Icon/MoreIcon.js delete mode 100644 app/components/Icon/NewDocumentIcon.js delete mode 100644 app/components/Icon/NextIcon.js delete mode 100644 app/components/Icon/OpenIcon.js delete mode 100644 app/components/Icon/OrderedListIcon.js delete mode 100644 app/components/Icon/PinIcon.js delete mode 100644 app/components/Icon/PlusIcon.js delete mode 100644 app/components/Icon/ProfileIcon.js delete mode 100644 app/components/Icon/SearchIcon.js delete mode 100644 app/components/Icon/SettingsIcon.js delete mode 100644 app/components/Icon/StarredIcon.js delete mode 100644 app/components/Icon/StrikethroughIcon.js delete mode 100644 app/components/Icon/TableIcon.js delete mode 100644 app/components/Icon/TodoListIcon.js delete mode 100644 app/components/Icon/TrashIcon.js delete mode 100644 app/components/Icon/UserIcon.js delete mode 100644 app/components/Icon/index.js diff --git a/app/components/DocumentPreview/DocumentPreview.js b/app/components/DocumentPreview/DocumentPreview.js index e0be3355..a97d3ede 100644 --- a/app/components/DocumentPreview/DocumentPreview.js +++ b/app/components/DocumentPreview/DocumentPreview.js @@ -7,7 +7,7 @@ import styled from 'styled-components'; import { color } from 'shared/styles/constants'; import Flex from 'shared/components/Flex'; import Highlight from 'components/Highlight'; -import StarredIcon from 'components/Icon/StarredIcon'; +import { StarredIcon } from 'outline-icons'; import PublishingInfo from './components/PublishingInfo'; import DocumentMenu from 'menus/DocumentMenu'; diff --git a/app/components/Icon/BackIcon.js b/app/components/Icon/BackIcon.js deleted file mode 100644 index 42f2c6a9..00000000 --- a/app/components/Icon/BackIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function BackIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/BlockQuoteIcon.js b/app/components/Icon/BlockQuoteIcon.js deleted file mode 100644 index 7915974b..00000000 --- a/app/components/Icon/BlockQuoteIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function BlockQuoteIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/BoldIcon.js b/app/components/Icon/BoldIcon.js deleted file mode 100644 index fa5dd4e6..00000000 --- a/app/components/Icon/BoldIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function BoldIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/BulletedListIcon.js b/app/components/Icon/BulletedListIcon.js deleted file mode 100644 index 89fa741b..00000000 --- a/app/components/Icon/BulletedListIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function BulletedListIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/CheckboxIcon.js b/app/components/Icon/CheckboxIcon.js deleted file mode 100644 index 94d95b88..00000000 --- a/app/components/Icon/CheckboxIcon.js +++ /dev/null @@ -1,22 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function CheckboxIcon({ - checked, - ...rest -}: Props & { checked: boolean }) { - return ( - - {checked ? ( - - ) : ( - - )} - - ); -} diff --git a/app/components/Icon/CloseIcon.js b/app/components/Icon/CloseIcon.js deleted file mode 100644 index d21adb3d..00000000 --- a/app/components/Icon/CloseIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function CloseIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/CodeIcon.js b/app/components/Icon/CodeIcon.js deleted file mode 100644 index ea08486b..00000000 --- a/app/components/Icon/CodeIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function CodeIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/CollapsedIcon.js b/app/components/Icon/CollapsedIcon.js deleted file mode 100644 index 8e2a2455..00000000 --- a/app/components/Icon/CollapsedIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function CollapsedIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/CollectionIcon.js b/app/components/Icon/CollectionIcon.js deleted file mode 100644 index 25182419..00000000 --- a/app/components/Icon/CollectionIcon.js +++ /dev/null @@ -1,19 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function CollectionIcon({ - expanded, - ...rest -}: Props & { expanded?: boolean }) { - return ( - - {expanded ? ( - - ) : ( - - )} - - ); -} diff --git a/app/components/Icon/DocumentIcon.js b/app/components/Icon/DocumentIcon.js deleted file mode 100644 index 95df6e52..00000000 --- a/app/components/Icon/DocumentIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function DocumentIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/EditIcon.js b/app/components/Icon/EditIcon.js deleted file mode 100644 index cfe26540..00000000 --- a/app/components/Icon/EditIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function EditIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/GoToIcon.js b/app/components/Icon/GoToIcon.js deleted file mode 100644 index 04dbb626..00000000 --- a/app/components/Icon/GoToIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function GoToIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/Heading1Icon.js b/app/components/Icon/Heading1Icon.js deleted file mode 100644 index 1fddb107..00000000 --- a/app/components/Icon/Heading1Icon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function Heading1Icon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/Heading2Icon.js b/app/components/Icon/Heading2Icon.js deleted file mode 100644 index 37a269aa..00000000 --- a/app/components/Icon/Heading2Icon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function Heading2Icon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/HomeIcon.js b/app/components/Icon/HomeIcon.js deleted file mode 100644 index 47d51f01..00000000 --- a/app/components/Icon/HomeIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function HomeIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/HorizontalRuleIcon.js b/app/components/Icon/HorizontalRuleIcon.js deleted file mode 100644 index a0a663c2..00000000 --- a/app/components/Icon/HorizontalRuleIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function HorizontalRuleIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/Icon.js b/app/components/Icon/Icon.js deleted file mode 100644 index 60979273..00000000 --- a/app/components/Icon/Icon.js +++ /dev/null @@ -1,46 +0,0 @@ -// @flow -import React from 'react'; -import { color } from 'shared/styles/constants'; - -export type Props = { - className?: string, - light?: boolean, - black?: boolean, - primary?: boolean, - color?: string, - size?: number, - onClick?: Function, -}; - -type BaseProps = { - children?: React$Element<*>, -}; - -export default function Icon({ - children, - className, - onClick, - ...rest -}: Props & BaseProps) { - const size = rest.size ? rest.size + 'px' : '24px'; - - let fill = color.slateDark; - if (rest.color) fill = rest.color; - if (rest.light) fill = color.white; - if (rest.black) fill = color.black; - if (rest.primary) fill = color.primary; - - return ( - - {children} - - ); -} diff --git a/app/components/Icon/ImageIcon.js b/app/components/Icon/ImageIcon.js deleted file mode 100644 index 3901f9e0..00000000 --- a/app/components/Icon/ImageIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function ImageIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/ItalicIcon.js b/app/components/Icon/ItalicIcon.js deleted file mode 100644 index 0987bdda..00000000 --- a/app/components/Icon/ItalicIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function ItalicIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/KeyboardIcon.js b/app/components/Icon/KeyboardIcon.js deleted file mode 100644 index d11264b0..00000000 --- a/app/components/Icon/KeyboardIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function KeyboardIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/LinkIcon.js b/app/components/Icon/LinkIcon.js deleted file mode 100644 index 73d9257d..00000000 --- a/app/components/Icon/LinkIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function LinkIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/MenuIcon.js b/app/components/Icon/MenuIcon.js deleted file mode 100644 index 642c7e52..00000000 --- a/app/components/Icon/MenuIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function MenuIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/MoreIcon.js b/app/components/Icon/MoreIcon.js deleted file mode 100644 index cffcbe0f..00000000 --- a/app/components/Icon/MoreIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function MoreIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/NewDocumentIcon.js b/app/components/Icon/NewDocumentIcon.js deleted file mode 100644 index 65140ce8..00000000 --- a/app/components/Icon/NewDocumentIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function NewDocumentIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/NextIcon.js b/app/components/Icon/NextIcon.js deleted file mode 100644 index ab9144dc..00000000 --- a/app/components/Icon/NextIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function NextIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/OpenIcon.js b/app/components/Icon/OpenIcon.js deleted file mode 100644 index 4324f761..00000000 --- a/app/components/Icon/OpenIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function OpenIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/OrderedListIcon.js b/app/components/Icon/OrderedListIcon.js deleted file mode 100644 index 488520e5..00000000 --- a/app/components/Icon/OrderedListIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function OrderedListIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/PinIcon.js b/app/components/Icon/PinIcon.js deleted file mode 100644 index 0b759434..00000000 --- a/app/components/Icon/PinIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function PinIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/PlusIcon.js b/app/components/Icon/PlusIcon.js deleted file mode 100644 index 9301d2a8..00000000 --- a/app/components/Icon/PlusIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function PlusIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/ProfileIcon.js b/app/components/Icon/ProfileIcon.js deleted file mode 100644 index 7fc415b0..00000000 --- a/app/components/Icon/ProfileIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function ProfileIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/SearchIcon.js b/app/components/Icon/SearchIcon.js deleted file mode 100644 index d111fef9..00000000 --- a/app/components/Icon/SearchIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function SearchIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/SettingsIcon.js b/app/components/Icon/SettingsIcon.js deleted file mode 100644 index e00dca74..00000000 --- a/app/components/Icon/SettingsIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function SettingsIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/StarredIcon.js b/app/components/Icon/StarredIcon.js deleted file mode 100644 index 8c6da200..00000000 --- a/app/components/Icon/StarredIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function StarredIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/StrikethroughIcon.js b/app/components/Icon/StrikethroughIcon.js deleted file mode 100644 index f00c91ec..00000000 --- a/app/components/Icon/StrikethroughIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function StrikethroughIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/TableIcon.js b/app/components/Icon/TableIcon.js deleted file mode 100644 index fb5e527f..00000000 --- a/app/components/Icon/TableIcon.js +++ /dev/null @@ -1,15 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function TableIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/TodoListIcon.js b/app/components/Icon/TodoListIcon.js deleted file mode 100644 index 7cd7c198..00000000 --- a/app/components/Icon/TodoListIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function TodoListIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/TrashIcon.js b/app/components/Icon/TrashIcon.js deleted file mode 100644 index d76379fe..00000000 --- a/app/components/Icon/TrashIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function TrashIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/UserIcon.js b/app/components/Icon/UserIcon.js deleted file mode 100644 index c9341428..00000000 --- a/app/components/Icon/UserIcon.js +++ /dev/null @@ -1,12 +0,0 @@ -// @flow -import React from 'react'; -import Icon from './Icon'; -import type { Props } from './Icon'; - -export default function UserIcon(props: Props) { - return ( - - - - ); -} diff --git a/app/components/Icon/index.js b/app/components/Icon/index.js deleted file mode 100644 index 8e7b103e..00000000 --- a/app/components/Icon/index.js +++ /dev/null @@ -1,3 +0,0 @@ -// @flow -import Icon from './Icon'; -export default Icon; diff --git a/app/components/Modal/Modal.js b/app/components/Modal/Modal.js index 0a7c017b..5747e384 100644 --- a/app/components/Modal/Modal.js +++ b/app/components/Modal/Modal.js @@ -4,9 +4,9 @@ import { observer } from 'mobx-react'; import styled, { injectGlobal } from 'styled-components'; import breakpoint from 'styled-components-breakpoint'; import ReactModal from 'react-modal'; +import { CloseIcon } from 'outline-icons'; import { color } from 'shared/styles/constants'; import { fadeAndScaleIn } from 'shared/styles/animations'; -import CloseIcon from 'components/Icon/CloseIcon'; import Flex from 'shared/components/Flex'; type Props = { diff --git a/app/components/Sidebar/Main.js b/app/components/Sidebar/Main.js index fd1e2f14..d8d1cbd3 100644 --- a/app/components/Sidebar/Main.js +++ b/app/components/Sidebar/Main.js @@ -3,15 +3,12 @@ import React, { Component } from 'react'; import { withRouter } from 'react-router-dom'; import type { Location } from 'react-router-dom'; import { observer, inject } from 'mobx-react'; -import Flex from 'shared/components/Flex'; +import { HomeIcon, EditIcon, SearchIcon, StarredIcon } from 'outline-icons'; +import Flex from 'shared/components/Flex'; import AccountMenu from 'menus/AccountMenu'; import Sidebar, { Section } from './Sidebar'; import Scrollable from 'components/Scrollable'; -import HomeIcon from 'components/Icon/HomeIcon'; -import EditIcon from 'components/Icon/EditIcon'; -import SearchIcon from 'components/Icon/SearchIcon'; -import StarredIcon from 'components/Icon/StarredIcon'; import Collections from './components/Collections'; import SidebarLink from './components/SidebarLink'; import HeaderBlock from './components/HeaderBlock'; diff --git a/app/components/Sidebar/Settings.js b/app/components/Sidebar/Settings.js index 8f9534eb..87cb2608 100644 --- a/app/components/Sidebar/Settings.js +++ b/app/components/Sidebar/Settings.js @@ -1,14 +1,11 @@ // @flow import React, { Component } from 'react'; import { observer, inject } from 'mobx-react'; -import Flex from 'shared/components/Flex'; +import { ProfileIcon, SettingsIcon, CodeIcon, UserIcon } from 'outline-icons'; +import Flex from 'shared/components/Flex'; import Sidebar, { Section } from './Sidebar'; import Scrollable from 'components/Scrollable'; -import ProfileIcon from 'components/Icon/ProfileIcon'; -import SettingsIcon from 'components/Icon/SettingsIcon'; -import CodeIcon from 'components/Icon/CodeIcon'; -import UserIcon from 'components/Icon/UserIcon'; import Header from './components/Header'; import SidebarLink from './components/SidebarLink'; import HeaderBlock from './components/HeaderBlock'; diff --git a/app/components/Sidebar/Sidebar.js b/app/components/Sidebar/Sidebar.js index 1b4e654b..fb763b0c 100644 --- a/app/components/Sidebar/Sidebar.js +++ b/app/components/Sidebar/Sidebar.js @@ -5,12 +5,10 @@ import type { Location } from 'react-router-dom'; import styled from 'styled-components'; import breakpoint from 'styled-components-breakpoint'; import { observer, inject } from 'mobx-react'; +import { CloseIcon, MenuIcon } from 'outline-icons'; import Flex from 'shared/components/Flex'; import { color, layout } from 'shared/styles/constants'; -import CloseIcon from 'components/Icon/CloseIcon'; -import MenuIcon from 'components/Icon/MenuIcon'; - import AuthStore from 'stores/AuthStore'; import DocumentsStore from 'stores/DocumentsStore'; import UiStore from 'stores/UiStore'; diff --git a/app/components/Sidebar/components/Collections.js b/app/components/Sidebar/components/Collections.js index 4dfd25c7..721a0ecc 100644 --- a/app/components/Sidebar/components/Collections.js +++ b/app/components/Sidebar/components/Collections.js @@ -6,12 +6,11 @@ import type { Location } from 'react-router-dom'; import Flex from 'shared/components/Flex'; import styled from 'styled-components'; import { color } from 'shared/styles/constants'; +import { PlusIcon, CollectionIcon } from 'outline-icons'; import Header from './Header'; import SidebarLink from './SidebarLink'; import DropToImport from 'components/DropToImport'; -import PlusIcon from 'components/Icon/PlusIcon'; -import CollectionIcon from 'components/Icon/CollectionIcon'; import CollectionMenu from 'menus/CollectionMenu'; import CollectionsStore from 'stores/CollectionsStore'; diff --git a/app/components/Sidebar/components/SidebarLink.js b/app/components/Sidebar/components/SidebarLink.js index d141d1b0..6281b1e2 100644 --- a/app/components/Sidebar/components/SidebarLink.js +++ b/app/components/Sidebar/components/SidebarLink.js @@ -3,10 +3,10 @@ import React, { Component } from 'react'; import { observable, action } from 'mobx'; import { observer } from 'mobx-react'; import { NavLink } from 'react-router-dom'; +import { CollapsedIcon } from 'outline-icons'; import { color, fontWeight } from 'shared/styles/constants'; import styled from 'styled-components'; import Flex from 'shared/components/Flex'; -import CollapsedIcon from 'components/Icon/CollapsedIcon'; const activeStyle = { color: color.black, diff --git a/app/menus/CollectionMenu.js b/app/menus/CollectionMenu.js index 8702af9f..b627861e 100644 --- a/app/menus/CollectionMenu.js +++ b/app/menus/CollectionMenu.js @@ -2,13 +2,13 @@ import React, { Component } from 'react'; import { inject, observer } from 'mobx-react'; import styled from 'styled-components'; +import { MoreIcon } from 'outline-icons'; import getDataTransferFiles from 'utils/getDataTransferFiles'; import importFile from 'utils/importFile'; import Collection from 'models/Collection'; import UiStore from 'stores/UiStore'; import DocumentsStore from 'stores/DocumentsStore'; -import MoreIcon from 'components/Icon/MoreIcon'; import { DropdownMenu, DropdownMenuItem } from 'components/DropdownMenu'; type Props = { diff --git a/app/menus/DocumentMenu.js b/app/menus/DocumentMenu.js index d24200ae..8940cf04 100644 --- a/app/menus/DocumentMenu.js +++ b/app/menus/DocumentMenu.js @@ -2,9 +2,10 @@ import React, { Component } from 'react'; import { withRouter } from 'react-router-dom'; import { inject, observer } from 'mobx-react'; +import { MoreIcon } from 'outline-icons'; + import Document from 'models/Document'; import UiStore from 'stores/UiStore'; -import MoreIcon from 'components/Icon/MoreIcon'; import { documentMoveUrl } from 'utils/routeHelpers'; import { DropdownMenu, DropdownMenuItem } from 'components/DropdownMenu'; diff --git a/app/scenes/Collection/Collection.js b/app/scenes/Collection/Collection.js index 80bf0ead..e2ea994e 100644 --- a/app/scenes/Collection/Collection.js +++ b/app/scenes/Collection/Collection.js @@ -4,8 +4,9 @@ import { observable } from 'mobx'; import { observer, inject } from 'mobx-react'; import { withRouter, Link } from 'react-router-dom'; import styled from 'styled-components'; -import { newDocumentUrl } from 'utils/routeHelpers'; +import { CollectionIcon, NewDocumentIcon, PinIcon } from 'outline-icons'; +import { newDocumentUrl } from 'utils/routeHelpers'; import CollectionsStore from 'stores/CollectionsStore'; import DocumentsStore from 'stores/DocumentsStore'; import UiStore from 'stores/UiStore'; @@ -15,9 +16,6 @@ import Search from 'scenes/Search'; import CollectionMenu from 'menus/CollectionMenu'; import Actions, { Action, Separator } from 'components/Actions'; import CenteredContent from 'components/CenteredContent'; -import CollectionIcon from 'components/Icon/CollectionIcon'; -import NewDocumentIcon from 'components/Icon/NewDocumentIcon'; -import PinIcon from 'components/Icon/PinIcon'; import { ListPlaceholder } from 'components/LoadingPlaceholder'; import Button from 'components/Button'; import HelpText from 'components/HelpText'; diff --git a/app/scenes/Document/Document.js b/app/scenes/Document/Document.js index b35e8348..4f48cbe7 100644 --- a/app/scenes/Document/Document.js +++ b/app/scenes/Document/Document.js @@ -18,7 +18,6 @@ import { matchDocumentMove, } from 'utils/routeHelpers'; - import Document from 'models/Document'; import Actions from './components/Actions'; import DocumentMove from './components/DocumentMove'; @@ -236,8 +235,8 @@ class DocumentScene extends React.Component { /> )} = 0.0.5 < 1": version "0.0.5" resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708" @@ -7944,6 +7965,15 @@ react-dom@^16.1.0: object-assign "^4.1.1" prop-types "^15.6.0" +react-dom@^16.2.0: + version "16.3.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df" + dependencies: + fbjs "^0.8.16" + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.0" + react-dropzone@4.2.1: version "4.2.1" resolved "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.2.1.tgz#695e80bd0b065f1181e69f2d0f6d1d5cc72664c9" @@ -7964,12 +7994,22 @@ react-immutable-proptypes@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4" +react-is@^16.3.1: + version "16.3.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22" + react-keydown@^1.7.3: version "1.9.4" resolved "https://registry.yarnpkg.com/react-keydown/-/react-keydown-1.9.4.tgz#22718ac95edb64dd840dfc4350abf7e693ea0b7f" dependencies: core-js "^2.5.0" +react-keydown@^1.9.7: + version "1.9.7" + resolved "https://registry.yarnpkg.com/react-keydown/-/react-keydown-1.9.7.tgz#cd168d4b0194b6ef71bca47e5c1cbc5d24ab5498" + dependencies: + core-js "^2.5.0" + react-markdown@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/react-markdown/-/react-markdown-3.0.2.tgz#e6e25a9c141a5dbada2fb016513cc5398515205c" @@ -8003,6 +8043,12 @@ react-portal@^4.0.0: dependencies: prop-types "^15.5.8" +react-portal@^4.1.4: + version "4.1.5" + resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.1.5.tgz#6665d4d2a92d47d6f8b07a6529e26fc52d5cccde" + dependencies: + prop-types "^15.5.8" + react-proxy@^1.1.7: version "1.1.8" resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a" @@ -8517,9 +8563,34 @@ retry-as-promised@^2.3.1: bluebird "^3.4.6" debug "^2.6.9" -rich-markdown-editor@*: - version "0.0.1" - resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-0.0.1.tgz#e6c22cc8d0bff7304912773372fcc8ab8f44b461" +rich-markdown-editor@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-0.1.1.tgz#b35ab6d8a844da743c8146c47bcce2bac1d6617b" + dependencies: + "@tommoor/slate-drop-or-paste-images" "^0.8.1" + boundless-arrow-key-navigation "^1.1.0" + copy-to-clipboard "^3.0.8" + eslint-plugin-flowtype "^2.46.1" + eslint-plugin-prettier "^2.6.0" + immutable "^3.8.2" + outline-icons "^1.0.0" + react "^16.2.0" + react-dom "^16.2.0" + react-keydown "^1.9.7" + react-medium-image-zoom "^3.0.10" + react-portal "^4.1.4" + slate "^0.32.5" + slate-collapse-on-escape "^0.6.0" + slate-edit-code "^0.14.0" + slate-edit-list "^0.11.2" + slate-md-serializer "3.0.3" + slate-paste-linkify "^0.5.0" + slate-plain-serializer "0.5.4" + slate-prism "^0.5.0" + slate-react "^0.12.3" + slate-trailing-block "^0.5.0" + slug "^0.9.1" + styled-components "^3.2.3" right-align@^0.1.1: version "0.1.3" @@ -8941,7 +9012,7 @@ slide@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" -slug@0.9.1: +slug@0.9.1, slug@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/slug/-/slug-0.9.1.tgz#af08f608a7c11516b61778aa800dce84c518cfda" dependencies: @@ -9288,10 +9359,29 @@ styled-components@^2.2.3: stylis "3.x" supports-color "^3.2.3" +styled-components@^3.2.3: + version "3.2.6" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.2.6.tgz#99e6e75a746bdedd295a17e03dd1493055a1cc3b" + dependencies: + buffer "^5.0.3" + css-to-react-native "^2.0.3" + fbjs "^0.8.16" + hoist-non-react-statics "^2.5.0" + is-plain-object "^2.0.1" + prop-types "^15.5.4" + react-is "^16.3.1" + stylis "^3.5.0" + stylis-rule-sheet "^0.0.10" + supports-color "^3.2.3" + styled-normalize@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/styled-normalize/-/styled-normalize-2.2.1.tgz#c93a007c0339a69e3254eeef8cb6a5a96e5ca4eb" +stylis-rule-sheet@^0.0.10: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" + stylis@3.x: version "3.4.1" resolved "https://registry.npmjs.org/stylis/-/stylis-3.4.1.tgz#46896ff4c51fbb58e44815eae5e0b2180a1f1fcb" @@ -9300,6 +9390,10 @@ stylis@^3.2.1: version "3.2.15" resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.2.15.tgz#1800f829fdf3cf0d647ae6cdb5fb70a1fd81c3e2" +stylis@^3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"