diff --git a/package.json b/package.json index d314aefa..fe3d27ac 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "app", - "version": "5.6.58", + "version": "5.6.59", "description": "All-in-one bookmark manager", "author": "Rustem Mussabekov", "license": "MIT", diff --git a/src/co/bookmarks/export/popover.js b/src/co/bookmarks/export/popover.js index 64fcaead..0649f645 100644 --- a/src/co/bookmarks/export/popover.js +++ b/src/co/bookmarks/export/popover.js @@ -1,16 +1,15 @@ import React, { useRef, useMemo } from 'react' import t from '~t' import { useSelector } from 'react-redux' -import { query as getQuery, makeSelectMode, count as getCount } from '~data/selectors/bookmarks' +import { query as getQuery, makeSelectMode } from '~data/selectors/bookmarks' import { getUrlQuery } from '~data/helpers/bookmarks' import { API_ENDPOINT_URL } from '~data/constants/app' -import Popover, { Menu, MenuItem, MenuSeparator, MenuSection } from '~co/overlay/popover' +import Popover, { Menu, MenuItem, MenuSection } from '~co/overlay/popover' export default function BookmarksExportPopover({ spaceId = 0, pin, onClose }) { //space const query = useSelector(state=>getQuery(state, spaceId)) - const count = useSelector(state=>getCount(state, spaceId)) //select mode const getSelectMode = useRef(makeSelectMode()).current @@ -28,31 +27,35 @@ export default function BookmarksExportPopover({ spaceId = 0, pin, onClose }) { ) return ( - - {spaceId == 0 && !query.search && !selectMode.ids.length ? ( - - Download complete backup - - ) : (<> + {spaceId == 0 && !query.search && !selectMode.ids.length ? (<> - {t.s('export')}{' '} - {selectMode.ids.length > 0 ? selectMode.ids.length : count}{' '} - {t.s('bookmarks')} + Click “Get backup” to download all your
+ collections, bookmarks, tags, and highlights.

+ Or click “Download uploaded files” to download
+ only your uploaded files, if available.
- - HTML +
+ + + Get backup - - CSV + + Download uploaded files + ) : (<> + + The ZIP file will contain your bookmarks,
+ tags, highlights, and any uploaded files. +
- - Text + + Download {selectMode.ids.length ? 'selection' : 'collection'} )}
diff --git a/src/co/common/list/section.module.styl b/src/co/common/list/section.module.styl index 321dc911..7227d34b 100644 --- a/src/co/common/list/section.module.styl +++ b/src/co/common/list/section.module.styl @@ -1,5 +1,5 @@ .section { - height: var(--list-item-height) + min-height: var(--list-item-height) padding: 0 var(--padding-medium) //padding-top: var(--padding-mini) font-size: var(--secondary-font-size)