beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into multiple-tab-error-fix

Browse source
This commit is contained in:
Abhinav-grd 2021-04-29 14:37:06 +05:30
parent 67371e389d 0a80a56acc
commit ad1e89a269
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/pages/gallery/components/Collections.tsx
View file

@ -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"

5
src/pages/gallery/components/OptionIcon.tsx
View file

@ -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>
);