diff --git a/app/lib/components/ToolArea/ToolArea.jsx b/app/lib/components/ToolArea/ToolArea.jsx index 82f9725..925bd31 100644 --- a/app/lib/components/ToolArea/ToolArea.jsx +++ b/app/lib/components/ToolArea/ToolArea.jsx @@ -23,7 +23,8 @@ class ToolArea extends React.Component toolAreaOpen, unreadMessages, unreadFiles, - toggleToolArea + toggleToolArea, + closeToolArea } = this.props; const VisibleTab = { @@ -43,11 +44,17 @@ class ToolArea extends React.Component />
+
({ @@ -101,7 +109,8 @@ const mapStateToProps = (state) => ({ const mapDispatchToProps = { setToolTab : stateActions.setToolTab, - toggleToolArea : stateActions.toggleToolArea + toggleToolArea : stateActions.toggleToolArea, + closeToolArea : stateActions.closeToolArea }; const ToolAreaContainer = connect( diff --git a/app/lib/components/ToolArea/ToolAreaButton.jsx b/app/lib/components/ToolArea/ToolAreaButton.jsx index a0a3dd3..c33047c 100644 --- a/app/lib/components/ToolArea/ToolAreaButton.jsx +++ b/app/lib/components/ToolArea/ToolAreaButton.jsx @@ -27,7 +27,7 @@ class ToolAreaButton extends React.Component className={classnames('button toolarea-button', { on : toolAreaOpen })} - data-tip='Toggle tool area' + data-tip='Open tool box' data-type='dark' onClick={() => toggleToolArea()} /> diff --git a/app/resources/images/arrow_right.svg b/app/resources/images/arrow_right.svg new file mode 100644 index 0000000..a0e5f30 --- /dev/null +++ b/app/resources/images/arrow_right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/stylus/components/ToolArea.styl b/app/stylus/components/ToolArea.styl index a2a8fd8..7fb18d2 100644 --- a/app/stylus/components/ToolArea.styl +++ b/app/stylus/components/ToolArea.styl @@ -5,7 +5,6 @@ left: 0; right: 0; bottom: 0; - background: rgba(0, 0, 0, 0.6); display: none; &.open { @@ -14,7 +13,8 @@ +desktop() { &.open { - display: none; + background: rgba(0, 0, 0, 0.3); + display: block; } } } @@ -33,6 +33,36 @@ .toolarea-shade.open { display: block; } + > .button { + background-position: center; + background-size: 100%; + background-repeat: no-repeat; + background-color: rgba(#aef); + cursor: pointer; + border-radius: 15%; + padding: 1px; + + +desktop() { + height: 36px; + width: 18px; + } + + +mobile() { + height: 32px; + width: 16px; + } + &.toolarea-close-button { + background-image: url('/resources/images/arrow_right.svg'); + position: absolute; + top: 50%; + left: -22px; + display: none; + &.on { + display: block; + } + } + } + } @media (min-width: 600px) { @@ -128,6 +158,10 @@ background-image: url('/resources/images/icon_tool_area_black.svg'); } } + + &.toolarea-close-button { + background-image: url('/resources/images/arrow_right.svg'); + } } > .badge {