From 3f5a9fdb3acfe9e0d971fef4e6e68e3258e2219b Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sun, 6 May 2018 14:01:28 -0700 Subject: [PATCH] Add icon to clarify menu functionality --- app/components/Sidebar/components/HeaderBlock.js | 11 ++++++++++- package.json | 2 +- yarn.lock | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/components/Sidebar/components/HeaderBlock.js b/app/components/Sidebar/components/HeaderBlock.js index 960f839ec..94077ad19 100644 --- a/app/components/Sidebar/components/HeaderBlock.js +++ b/app/components/Sidebar/components/HeaderBlock.js @@ -2,6 +2,7 @@ import * as React from 'react'; import styled from 'styled-components'; import { color } from 'shared/styles/constants'; +import { ExpandedIcon } from 'outline-icons'; import Flex from 'shared/components/Flex'; import TeamLogo from './TeamLogo'; @@ -16,13 +17,21 @@ function HeaderBlock({ teamName, subheading, logoUrl, ...rest }: Props) {
- {teamName} + + {teamName} + {subheading}
); } +const StyledExpandedIcon = styled(ExpandedIcon)` + position: relative; + top: 6px; + left: -4px; +`; + const Subheading = styled.div` padding-left: 10px; font-size: 11px; diff --git a/package.json b/package.json index 26dfb8d78..8eb00bf0e 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "nodemailer": "^4.4.0", "normalize.css": "^7.0.0", "normalizr": "2.0.1", - "outline-icons": "^1.0.2", + "outline-icons": "^1.1.0", "oy-vey": "^0.10.0", "pg": "^6.1.5", "pg-hstore": "2.3.2", diff --git a/yarn.lock b/yarn.lock index 23f615d2a..4d55d3ee2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7112,10 +7112,14 @@ osenv@^0.1.0, osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -outline-icons@^1.0.0, outline-icons@^1.0.2: +outline-icons@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.0.3.tgz#f0928a8bbc7e7ff4ea6762eee8fb2995d477941e" +outline-icons@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/outline-icons/-/outline-icons-1.1.0.tgz#08eb188a97a1aa8970a4dded7841c3d8b96b8577" + oy-vey@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/oy-vey/-/oy-vey-0.10.0.tgz#16160f837f0ea3d0340adfc2377ba93d1ed9ce76"