Compare commits

..

No commits in common. "e8272ecca0436daeb808a1b947dec421ab022f6b" and "8279ec5f88970da096f31a63aa6ee4039140eda1" have entirely different histories.

5 changed files with 8 additions and 28 deletions

View File

@ -32,8 +32,10 @@
*/ */
function getFileListRecursive($dir, $displayDir=null) { function getFileListRecursive($dir, $displayDir=null) {
$filesAndDirs = scandir($dir); $filesAndDirs = scandir($dir);
error_log(json_encode($filesAndDirs));
$files = []; $files = [];
foreach ($filesAndDirs as $file) { foreach ($filesAndDirs as $file) {
error_log("getFileListRecursive: ".$dir);
if ($file == "." || $file == "..") { continue; } if ($file == "." || $file == "..") { continue; }
if (is_dir($dir . $file)) { if (is_dir($dir . $file)) {
$sub_files = getFileListRecursive($dir . $file . '/', $displayDir . $file . '/'); $sub_files = getFileListRecursive($dir . $file . '/', $displayDir . $file . '/');

View File

@ -39,7 +39,6 @@ async function setStagingPath() {
} }
else { else {
showServerError("setStagingPath", response.status, text); showServerError("setStagingPath", response.status, text);
throw new Error("Can not get staging path");
} }
} }
@ -56,8 +55,6 @@ async function setFileList() {
// fileList.sort(); // fileList.sort();
} }
else { else {
showServerError("setFileList", response.status, text);
throw new Error("Can not get file list");
} }
} }

View File

@ -13,11 +13,9 @@ $button-bg: $bg !default
$button-bg-hl: $bg-hl !default $button-bg-hl: $bg-hl !default
$button-fg: $fg !default $button-fg: $fg !default
$button-fg-hl: $fg-hl !default $button-fg-hl: $fg-hl !default
// use variables when they have to be overwriteable by inline style blocks
$monofont: "UbuntuMono", monospace $monofont: "UbuntuMono", monospace
$footer-height: 20px
$footer-padding-y: 2px
$footer-padding-x: 12px
* *
font-family: "Ubuntu", Verdana, sans-serif font-family: "Ubuntu", Verdana, sans-serif
@ -49,13 +47,9 @@ main
footer footer
width: 100% width: 100%
padding: $footer-padding-y $footer-padding-x padding: 0.2rem 1rem
font-size: $footer-height - $footer-padding-y * 2
background: $fg background: $fg
color: $bg color: $bg
height: 20px
overflow-x: scroll
overflow-y: hidden
* *
color: $bg color: $bg
.statusline .statusline
@ -169,13 +163,12 @@ button:hover
.main-box .main-box
background: $bg2 background: $bg1
.current-file .current-file
width: 100% width: 100%
height: 300px height: 300px
position: relative position: relative
overflow: scroll overflow: scroll
background: $bg1
.imgsort2 .imgsort2
font-size: 3rem font-size: 3rem
@ -203,7 +196,6 @@ button:hover
flex-direction: row flex-direction: row
.main-box .main-box
width: 75% width: 75%
max-height: calc(100vh - $footer-height)
.imgsort2 .imgsort2
font-size: 5rem font-size: 5rem
line-height: 300px line-height: 300px
@ -213,8 +205,6 @@ button:hover
display: flex display: flex
flex-direction: column flex-direction: column
width: 25% width: 25%
max-height: calc(100vh - $footer-height)
overflow: scroll
.current-file .current-file
height: 100% height: 100%

View File

@ -31,13 +31,9 @@ main * {
footer { footer {
width: 100%; width: 100%;
padding: 2px 12px; padding: 0.2rem 1rem;
font-size: 16px;
background: #3c3836; background: #3c3836;
color: #f9f5d7; color: #f9f5d7;
height: 20px;
overflow-x: scroll;
overflow-y: hidden;
} }
footer * { footer * {
color: #f9f5d7; color: #f9f5d7;
@ -180,7 +176,7 @@ button:hover {
} }
.main-box { .main-box {
background: #d5c4a1; background: #ebdbb2;
} }
.current-file { .current-file {
@ -188,7 +184,6 @@ button:hover {
height: 300px; height: 300px;
position: relative; position: relative;
overflow: scroll; overflow: scroll;
background: #ebdbb2;
} }
.current-file .imgsort2 { .current-file .imgsort2 {
font-size: 3rem; font-size: 3rem;
@ -215,7 +210,6 @@ button:hover {
} }
.main-box { .main-box {
width: 75%; width: 75%;
max-height: calc(100vh - 20px);
} }
.imgsort2 { .imgsort2 {
font-size: 5rem; font-size: 5rem;
@ -226,8 +220,6 @@ button:hover {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 25%; width: 25%;
max-height: calc(100vh - 20px);
overflow: scroll;
} }
.current-file { .current-file {
height: 100%; height: 100%;

View File

@ -1 +0,0 @@
{"version":3,"sourceRoot":"","sources":["sass/main.sass","sass/gruvbox_light.sass"],"names":[],"mappings":"AAqBA;EACE;EACA,OCLI;;;ADQN;EACE;EACA;;;AAEF;EACE,kBCxBS;ED0BT;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA,YCnCI;EDoCJ,OC/CS;EDgDT;EACA;EACA;;AACA;EACE,OCpDO;;;ADqDX;EACE,aA7C0B;EA8C1B;;AACA;EACE,aAhDwB;;;AAmD5B;EACE,OCrDI;;;ADuDN;EACE,aAvD0B;;;AAyD5B;EACE;EACA,YCzDI;ED0DJ,OCtEI;EDuEJ;EACA;EACA,cC/DS;EDgET;;;AAKF;EACE,OCpEI;EDqEJ,aAvE0B;EAwE1B;;;AAEF;EACE,OC1DU;;;AD4DZ;EACE;EACA;EACA;;;AAEF;EACE,OCjFI;EDkFJ,kBC7FS;ED8FT;EACA;EACA;EACA;EACA,aAzF0B;EA0F1B;;AACA;EACE;;;AACJ;EACE,OC/FI;EDgGJ,kBCtGI;;;ADwGN;EACE;EACA;;AACA;EACE;;AACA;EACE;;AACF;EACE;EACA;EACA;;AACF;EACE;EACA;;AACF;EACE;;;AAMN;EACE;;;AACF;EACE;;;AACF;EACE;;;AACF;EACE;;;AACF;EACE;;;AAGF;EACE;EACA;EACA;;;AACF;EACE;EACA,cC7HU;ED8HV;EACA;EACA;;AACA;EACE;EACA;EACA;;;AACJ;EACE,YCxJI;;;ADyJN;EACE,YCzJI;;;AD2JN;EACE;EACA,OC9JI;;;ADiKN;EACE,YCjKI;;;ADkKN;EACE;EACA;EACA;EACA;EACA,YCxKI;;AD0KJ;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;EACE;IACE;IACA;;EACF;IACE;IACA;;EACF;IACE;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA;IACA;;EAEF;IACE;IACA","file":"style.css"}