diff --git a/public/static/css/color.css b/public/static/css/color.css index 8c3c39f..9f1022e 100644 --- a/public/static/css/color.css +++ b/public/static/css/color.css @@ -54,6 +54,10 @@ color: #27ae60; } +.green2-font { + color: #15cd3d; +} + .white-font { color: #fff; } @@ -94,6 +98,11 @@ background-color: #2980b9; } +.blue2-bg { + background-color: #2f45c5; +} + + .cyan0-bg { background-color: #1abc9c; } @@ -130,6 +139,10 @@ background-color: #e67e22; } +.yellow3-bg { + background-color: #15cd3d;; +} + .yellow3-bg { background-color: #d35400; } @@ -142,6 +155,10 @@ background-color: #27ae60; } +.green2-bg { + background-color: #15cd3d; +} + .white-bg { background-color: #fff; } diff --git a/public/static/css/style.css b/public/static/css/style.css index c6d783f..0e5c21f 100644 --- a/public/static/css/style.css +++ b/public/static/css/style.css @@ -12,10 +12,48 @@ z-index: 10; } +.flex-list-container { + display: flex; + flex-direction: row; + flex-wrap: nowrap; + align-items: center; + justify-content: flex-start; +} + +.flex-list-item { + flex: 1; + display: flex; + align-items: center; + justify-content: flex-start; +} + +.flex-list-item-l { + flex: 50%; + display: flex; + align-items: center; + justify-content: flex-start; +} + +.flex-list-item-r { + flex: 50%; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.flex-list-container .item-name { + line-height: 3rem; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + overflow-wrap: break-word; + display: block; +} + .container-center { margin: 2rem auto auto auto; width: 96%; - max-width: 960px; + max-width: 800px; z-index: 9; } @@ -101,6 +139,11 @@ margin-right: 1rem; } +#item-list .vbar { + overflow: hidden; + margin: 1.5rem 1rem; +} + #item-list .item-name-cell { max-width: 30%; } @@ -511,6 +554,14 @@ select { line-height: 3rem; } +.vbar { + border-radius: 0.3rem; + height: 6rem; + width: 0.6rem; + display: inline-block; + /* line-height: 4rem; */ +} + input.white-square { border: solid 2px #fff; background: transparent; @@ -570,13 +621,12 @@ div.hr { display: inline-block; } -div.hr { - height: 1px; - background-color: #95a5a6; - margin: 1rem auto 1rem auto; -} - -.tail { +#tail { font-size: 1.2rem; text-align: center; + margin: 4rem auto; } + +.breadcrumb { + font-size: 1.4rem; +} \ No newline at end of file diff --git a/src/client/web/src/components/browser.tsx b/src/client/web/src/components/browser.tsx index 825a876..8319e19 100644 --- a/src/client/web/src/components/browser.tsx +++ b/src/client/web/src/components/browser.tsx @@ -301,8 +301,65 @@ export class Browser extends React.Component { , ]; + // const ops = ( + // + // ); + const ops = ( - +
+
+ + + + + + + + +
+ +
+ +
+ + +
+
); const itemList = this.props.items.map((item: MetadataResp) => { @@ -313,71 +370,61 @@ export class Browser extends React.Component { : `${dirPath}/${item.name}`; return item.isDir ? ( - - - - - - this.gotoChild(item.name)} - > - {item.name} +
+ + + + this.gotoChild(item.name)}> + {item.name} + +
+ {item.modTime.slice(0, item.modTime.indexOf("T"))} +
- - -- - - {item.modTime.slice(0, item.modTime.indexOf("T"))} - - +
+ - - + +
) : ( - - - - - - - {item.name} - - - {FileSize(item.size, { round: 0 })} - - {item.modTime.slice(0, item.modTime.indexOf("T"))} - - +
+ + + + + {item.name} + +
+ {FileSize(item.size, { round: 0 })} /  + {item.modTime.slice(0, item.modTime.indexOf("T"))} +
+
+
+ - - + +
); }); @@ -386,30 +433,34 @@ export class Browser extends React.Component { const fileName = pathParts[pathParts.length - 1]; return ( - - - - - -
{fileName}
+
+ + +
+ {fileName} +
+ {FileSize(uploading.uploaded, { round: 0 })} +  / {FileSize(uploading.size, { round: 0 })} +
+
+
+
- - {FileSize(uploading.uploaded, { round: 0 })} - {FileSize(uploading.size, { round: 0 })} - +
+
); }); @@ -420,66 +471,53 @@ export class Browser extends React.Component {
-
{breadcrumb}
+
+ + Location: + + {breadcrumb} +
{this.props.uploadings.size === 0 ? null : (
- - - - - - - - - - {uploadingList} - - - - - - - - -
- - NameUploadedSize
+
+ + + Uploading Files + + +
+ {uploadingList}
)}
- - - - - - - - - - - {itemList} - - - - - - - - - -
- - NameFile SizeMod Time - -
+
+ + + Name + {/* File Size + Mod Time */} + + + + +
+ {itemList}
diff --git a/src/client/web/src/components/root_frame.tsx b/src/client/web/src/components/root_frame.tsx index e90c542..9e68a0a 100644 --- a/src/client/web/src/components/root_frame.tsx +++ b/src/client/web/src/components/root_frame.tsx @@ -82,7 +82,7 @@ export class RootFrame extends React.Component { /> -
+
Quickshare - sharing in simple way.