Skip to content
This repository was archived by the owner on Sep 7, 2020. It is now read-only.

Commit 96514c6

Browse files
committed
Revert "feat: use feather icons"
This reverts commit 1d74e8c.
1 parent 1d74e8c commit 96514c6

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

src/Chat/Twilio/ChannelView.tsx

+16-17
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import {
2626
OtherChannelHeader,
2727
} from '../components/ChannelView'
2828
import { UserDescriptor } from 'twilio-chat/lib/userdescriptor'
29-
import { XSquare, Maximize2, Minimize2 } from 'react-feather'
3029

3130
type AuthorMap = { [key: string]: User }
3231
type AuthorNicks = { [key: string]: string | undefined }
@@ -361,7 +360,7 @@ export const ChannelView = ({
361360
onCloseChannel(otherChannel)
362361
}}
363362
>
364-
<XSquare />
363+
X
365364
</MinimizeButton>
366365
</OtherChannelHeader>
367366
))}
@@ -373,35 +372,35 @@ export const ChannelView = ({
373372
Chat: <strong>#{selectedChannel}</strong>
374373
</Title>
375374
<span>
376-
{!isMinimized && (
375+
{joinedChannels.length > 1 && (
377376
<MinimizeButton
378-
onClick={() => {
379-
memoMinimized(true)
377+
onClick={e => {
378+
e.stopPropagation()
379+
onSwitchChannel(
380+
joinedChannels.find(c => c !== selectedChannel) as string,
381+
)
382+
onCloseChannel(selectedChannel)
380383
}}
381384
>
382-
<Minimize2 />
385+
X
383386
</MinimizeButton>
384387
)}
385-
{isMinimized && (
388+
{!isMinimized && (
386389
<MinimizeButton
387390
onClick={() => {
388-
memoMinimized(false)
391+
memoMinimized(true)
389392
}}
390393
>
391-
<Maximize2 />
394+
_
392395
</MinimizeButton>
393396
)}
394-
{joinedChannels.length > 1 && (
397+
{isMinimized && (
395398
<MinimizeButton
396-
onClick={e => {
397-
e.stopPropagation()
398-
onSwitchChannel(
399-
joinedChannels.find(c => c !== selectedChannel) as string,
400-
)
401-
onCloseChannel(selectedChannel)
399+
onClick={() => {
400+
memoMinimized(false)
402401
}}
403402
>
404-
<XSquare />
403+
+
405404
</MinimizeButton>
406405
)}
407406
</span>

src/Chat/components/ChannelView.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,12 @@ export const Button = styled.button`
4444
margin: 0.5rem;
4545
`
4646

47-
export const MinimizeButton = styled.button`
47+
export const MinimizeButton = styled(Button)`
4848
width: 30px;
49-
height: 30px;
50-
border: 0;
51-
padding: 0;
49+
border-color: #fff;
5250
${Header} & {
5351
color: inherit;
5452
}
55-
background-color: transparent;
5653
cursor: pointer;
5754
`
5855

0 commit comments

Comments
 (0)