Merge branch 'master' into multiple-tab-error-fix
This commit is contained in:
commit
ad1e89a269
|
@ -55,7 +55,7 @@ const Chip = styled.button<{ active: boolean }>`
|
|||
border-radius: 8px;
|
||||
padding: 4px;
|
||||
padding-left: 24px;
|
||||
margin: 2px;
|
||||
margin: 3px;
|
||||
border: none;
|
||||
background-color: ${(props) =>
|
||||
props.active ? '#fff' : 'rgba(255, 255, 255, 0.3)'};
|
||||
|
@ -127,7 +127,7 @@ export default function Collections(props: CollectionProps) {
|
|||
>
|
||||
{item.name}
|
||||
{item.type != CollectionType.favorites &&
|
||||
item.owner.id === user?.id ? (
|
||||
item.owner.id === user?.id ? (
|
||||
<OverlayTrigger
|
||||
rootClose
|
||||
trigger="click"
|
||||
|
|
|
@ -16,16 +16,17 @@ const OptionIcon = ({ onClick }: Props) => {
|
|||
onClick();
|
||||
e.stopPropagation();
|
||||
}}
|
||||
style={{ marginBottom: "2px" }}
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
height="24px"
|
||||
height="20px"
|
||||
width="24px"
|
||||
viewBox="0 0 24 24"
|
||||
fill="#000000"
|
||||
>
|
||||
<path d="M0 0h24v24H0V0z" fill="none" />
|
||||
<path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
|
||||
<path fill="#666" d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
|
||||
</svg>
|
||||
</OptionIconWrapper>
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue