diff --git a/src/component/app.tsx b/src/component/app.tsx index 392358d65..dfcc63a7e 100644 --- a/src/component/app.tsx +++ b/src/component/app.tsx @@ -35,7 +35,7 @@ const PatternsPane = styledComponents.div` overflow: scroll; border-top: 2px solid ${colors.grey70.toString()}; box-sizing: border-box; - padding: 18px 0; + padding: 18px 0; `; const ProjectPane = styledComponents.div` diff --git a/src/lsg/patterns/element/index.tsx b/src/lsg/patterns/element/index.tsx index 788bab33a..500521c49 100644 --- a/src/lsg/patterns/element/index.tsx +++ b/src/lsg/patterns/element/index.tsx @@ -44,12 +44,14 @@ const StyledElement = styled.div` const StyledElementLabel = styled.div` position: relative; display: flex; - min-height: 20px; - padding: 0 ${getSpace(Size.L)}px; + padding: 9px ${getSpace(Size.L)}px; border-radius: 3px; cursor: pointer; align-items: center; - color: ${colors.black.toString()}; + color: ${colors.black.toString()}; + position: relative; + z-index: 10; + ${(props: StyledElementLabelProps) => props.active ? ` @@ -66,7 +68,11 @@ const StyledElementLabel = styled.div` `; const StyledPlaceholder = styled.div` - height: 10px; + position: relative; + z-index: 15; + height: 10px; + margin-top: -5px; + margin-bottom: -5px; border-radius: 3px; ${(props: StyledPlaceholder) => props.highlightPlaceholder @@ -78,14 +84,16 @@ const StyledPlaceholder = styled.div` const StyledElementChild = styled.div` flex-basis: 100%; - padding-left: ${getSpace(Size.S)}px; + padding-left: ${getSpace(Size.L)}px; ${(props: StyledElementChildProps) => (props.open ? 'display: block;' : 'display: none;')}; `; const StyledIcon = styled(Icon)` position: absolute; - left: ${getSpace(Size.L) / 2}px; - fill: ${colors.grey70.toString()}; + left: ${getSpace(Size.XS)}px; + fill: ${colors.grey36.toString()}; + width: 12px; + height: 12px; `; const Element: React.StatelessComponent = props => { @@ -131,7 +139,7 @@ const Element: React.StatelessComponent = props => { {children && ( diff --git a/src/lsg/patterns/icons/index.tsx b/src/lsg/patterns/icons/index.tsx index bf7797d29..66cc89c31 100644 --- a/src/lsg/patterns/icons/index.tsx +++ b/src/lsg/patterns/icons/index.tsx @@ -3,7 +3,9 @@ import * as React from 'react'; import styled from 'styled-components'; export enum IconName { - Robo + Arrow, + ArrowFill, + Robo } export interface IconRegistryProps { names: typeof IconName; @@ -34,7 +36,13 @@ interface IconRegistrySymbolProps { } const icons: { readonly [key: string]: JSX.Element[][] | JSX.Element[] } = { - [IconName.Robo]: [ + [IconName.Arrow]: [ + [] + ], + [IconName.ArrowFill]: [ + [] + ], + [IconName.Robo]: [ [] ] }; diff --git a/src/lsg/patterns/space/index.tsx b/src/lsg/patterns/space/index.tsx index e4b1d4da1..432cbba84 100644 --- a/src/lsg/patterns/space/index.tsx +++ b/src/lsg/patterns/space/index.tsx @@ -22,6 +22,7 @@ export enum Size { // Explicity set enum values to indicate that they will be used later on as // array indicies. None = 0, + XXS = 3, XS = 6, S = 12, M = 15,