diff --git a/public/static/css/white.css b/public/static/css/white.css index 5b6f1ba..a000d40 100644 --- a/public/static/css/white.css +++ b/public/static/css/white.css @@ -194,7 +194,7 @@ font-size: 1.4rem; line-height: 2rem; display: block; - overflow-wrap: break-word; + word-break: break-all; } .theme-default #item-rows .hr { diff --git a/src/client/web/src/components/layout/rows.tsx b/src/client/web/src/components/layout/rows.tsx index 1657665..5a7bb44 100644 --- a/src/client/web/src/components/layout/rows.tsx +++ b/src/client/web/src/components/layout/rows.tsx @@ -1,7 +1,8 @@ import * as React from "react"; -import { List, Map, Set } from "immutable"; +import { List } from "immutable"; + +import { BiSortUp } from "@react-icons/all-files/bi/BiSortUp"; -import { RiArrowUpDownFill } from "@react-icons/all-files/ri/RiArrowUpDownFill"; import { Flexbox } from "./flexbox"; @@ -103,7 +104,7 @@ export class Rows extends React.Component {
, diff --git a/src/client/web/src/components/panel_files.tsx b/src/client/web/src/components/panel_files.tsx index 8fe2d04..853d019 100644 --- a/src/client/web/src/components/panel_files.tsx +++ b/src/client/web/src/components/panel_files.tsx @@ -12,7 +12,8 @@ import { RiCheckboxFill } from "@react-icons/all-files/ri/RiCheckboxFill"; import { RiMore2Fill } from "@react-icons/all-files/ri/RiMore2Fill"; import { BiTable } from "@react-icons/all-files/bi/BiTable"; import { BiListUl } from "@react-icons/all-files/bi/BiListUl"; -import { RiRefreshLine } from "@react-icons/all-files/ri/RiRefreshLine"; +import { RiRestartFill } from "@react-icons/all-files/ri/RiRestartFill"; +import { RiCheckboxBlankLine } from "@react-icons/all-files/ri/RiCheckboxBlankLine"; import { ErrorLogger } from "../common/log_error"; import { alertMsg, confirmMsg } from "../common/env"; @@ -468,10 +469,10 @@ export class FilesPanel extends React.Component { {`SHA1: `}
, - this.generateHash(itemPath)} size={"2rem"} - className="black-font" + className="grey3-font" />, ])} className="item-info" @@ -490,7 +491,7 @@ export class FilesPanel extends React.Component { this.select(item.name)} className="float-l"> {isSelected ? getIcon("RiCheckboxFill", "1.8rem", "cyan1") - : getIcon("RiCheckboxBlankFill", "1.8rem", "black1")} + : getIcon("RiCheckboxBlankLine", "1.8rem", "black1")} ) : ( @@ -505,7 +506,7 @@ export class FilesPanel extends React.Component { this.select(item.name)} className="float-l"> {isSelected ? getIcon("RiCheckboxFill", "1.8rem", "cyan1") - : getIcon("RiCheckboxBlankFill", "1.8rem", "black1")} + : getIcon("RiCheckboxBlankLine", "1.8rem", "black1")} ); @@ -577,6 +578,7 @@ export class FilesPanel extends React.Component { : `${dirPath}/${item.name}`; const selectedIconColor = isSelected ? "cyan1-font" : "grey0-font"; + const descIconColor = this.state.showDetail.has(item.name) ? "cyan1-font" : "grey0-font"; @@ -600,14 +602,22 @@ export class FilesPanel extends React.Component { ); + const checkIcon = isSelected ? ( + this.select(item.name)} + /> + ) : ( + this.select(item.name)} + /> + ); + const op = item.isDir ? ( -
- this.select(item.name)} - /> -
+
{checkIcon}
) : (
{ onClick={() => this.toggleDetail(item.name)} /> - this.select(item.name)} - /> + {checkIcon}
); @@ -633,13 +639,20 @@ export class FilesPanel extends React.Component { const compact = item.isDir ? ( - {`${pathTitle}: `} - {`${absDownloadURL} | `} {`${modTimeTitle}: `} {item.modTime} ) : ( - `${pathTitle}: ${absDownloadURL} | ${modTimeTitle}: ${item.modTime} | ${sizeTitle}: ${itemSize} | sha1: ${item.sha1}` + + {`${pathTitle}: `} + {`${absDownloadURL} | `} + {`${modTimeTitle}: `} + {`${item.modTime} | `} + {`${sizeTitle}: `} + {`${itemSize} | `} + {`SHA1: `} + {item.sha1} + ); const details = (
@@ -648,6 +661,9 @@ export class FilesPanel extends React.Component { {pathTitle} {absDownloadURL}
+ + +
{modTimeTitle} {item.modTime} @@ -658,24 +674,15 @@ export class FilesPanel extends React.Component {
-
-
- {pathTitle} -
- -
-
-
-
SHA1, - this.generateHash(itemPath)} size={"2rem"} - className={`black-font ${shareModeClass}`} + className={`grey3-font ${shareModeClass}`} />, ])} childrenStyles={List([{}, { justifyContent: "flex-end" }])} diff --git a/src/client/web/src/components/panel_sharings.tsx b/src/client/web/src/components/panel_sharings.tsx index 38679ec..6b78c9c 100644 --- a/src/client/web/src/components/panel_sharings.tsx +++ b/src/client/web/src/components/panel_sharings.tsx @@ -3,8 +3,7 @@ import { List, Map } from "immutable"; import QRCode from "react-qr-code"; import { RiShareBoxLine } from "@react-icons/all-files/ri/RiShareBoxLine"; -import { RiFolderSharedFill } from "@react-icons/all-files/ri/RiFolderSharedFill"; -import { RiEmotionSadLine } from "@react-icons/all-files/ri/RiEmotionSadLine"; +import { RiCloudOffFill } from "@react-icons/all-files/ri/RiCloudOffFill"; import { QRCodeIcon } from "./visual/qrcode"; import { getErrMsg } from "../common/utils"; @@ -137,7 +136,7 @@ export class SharingsPanel extends React.Component { , + ,

{this.props.msg.pkg.get("share.404.title")} diff --git a/src/client/web/src/components/panel_uploadings.tsx b/src/client/web/src/components/panel_uploadings.tsx index 1629aba..7650861 100644 --- a/src/client/web/src/components/panel_uploadings.tsx +++ b/src/client/web/src/components/panel_uploadings.tsx @@ -4,7 +4,7 @@ import FileSize from "filesize"; import { RiUploadCloudFill } from "@react-icons/all-files/ri/RiUploadCloudFill"; import { RiUploadCloudLine } from "@react-icons/all-files/ri/RiUploadCloudLine"; -import { RiEmotionSadLine } from "@react-icons/all-files/ri/RiEmotionSadLine"; +import { RiCloudOffFill } from "@react-icons/all-files/ri/RiCloudOffFill"; import { alertMsg } from "../common/env"; import { getErrMsg } from "../common/utils"; @@ -165,7 +165,7 @@ export class UploadingsPanel extends React.Component { , + ,

{this.props.msg.pkg.get("upload.404.title")} diff --git a/src/client/web/src/components/visual/icons.tsx b/src/client/web/src/components/visual/icons.tsx index 63229e1..23ec290 100644 --- a/src/client/web/src/components/visual/icons.tsx +++ b/src/client/web/src/components/visual/icons.tsx @@ -18,6 +18,7 @@ import { RiArrowUpDownFill } from "@react-icons/all-files/ri/RiArrowUpDownFill"; import { BiTable } from "@react-icons/all-files/bi/BiTable"; import { BiListUl } from "@react-icons/all-files/bi/BiListUl"; import { RiMore2Fill } from "@react-icons/all-files/ri/RiMore2Fill"; +import { RiCheckboxBlankLine } from "@react-icons/all-files/ri/RiCheckboxBlankLine"; import { colorClass } from "./colors"; @@ -44,6 +45,7 @@ const icons = Map({ BiTable: BiTable, BiListUl: BiListUl, RiMore2Fill: RiMore2Fill, + RiCheckboxBlankLine: RiCheckboxBlankLine, }); export function getIconWithProps(