Merge branch 'master' into dev
This commit is contained in:
@ -21,7 +21,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function humanfilesize($size, $unit="") {
|
function humanfilesize($size, $unit = "") {
|
||||||
if ((!$unit && $size >= 1 << 30) || $unit == "GB")
|
if ((!$unit && $size >= 1 << 30) || $unit == "GB")
|
||||||
return number_format($size / (1 << 30),2)."GB";
|
return number_format($size / (1 << 30),2)."GB";
|
||||||
if ((!$unit && $size >= 1 << 20) || $unit == "MB")
|
if ((!$unit && $size >= 1 << 20) || $unit == "MB")
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
if ($page > 1)
|
if ($page > 1)
|
||||||
printf("<a href='%s&page=1'><<</a> <a href='%s&page=%d'><</a> ",
|
printf("<a href='%s&page=1'><<</a> <a href='%s&page=%d'><</a> ",
|
||||||
$_SERVER['REQUEST_URI'], $_SERVER['REQUEST_URI'], $page - 1);
|
$_SERVER['REQUEST_URI'], $_SERVER['REQUEST_URI'], $page - 1);
|
||||||
for ($i = $page; $i <= ($res[1]["pages"] > $page + 10 ? $page + 10 : $res[1]["pages"]); $i++)
|
for ($i = $page; $i <= ($res[1]["pages"] > $page + 9 ? $page + 9 : $res[1]["pages"]); $i++)
|
||||||
printf("<a href='%s&page=%d'>%d</a> ", $_SERVER['REQUEST_URI'], $i, $i);
|
printf("<a href='%s&page=%d'>%d</a> ", $_SERVER['REQUEST_URI'], $i, $i);
|
||||||
if ($page != $res[1]["pages"])
|
if ($page != $res[1]["pages"])
|
||||||
printf("<a href='%s&page=%s'>></a> <a href='%s&page=%s'>>></a> ",
|
printf("<a href='%s&page=%s'>></a> <a href='%s&page=%s'>>></a> ",
|
||||||
|
@ -224,9 +224,18 @@ h1, #header {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* wallpaper preview borders */
|
/* wallpaper preview borders */
|
||||||
#sfw { border: 3px solid var(--sfw-color-1); }
|
#sfw {
|
||||||
#sketchy { border: 3px solid var(--sketchy-color-1); }
|
border: 3px solid var(--sfw-color-1);
|
||||||
#nsfw { border: 3px solid var(--nsfw-color-1); }
|
background-color: var(--sfw-color-2);
|
||||||
|
}
|
||||||
|
#sketchy {
|
||||||
|
border: 3px solid var(--sketchy-color-1);
|
||||||
|
background-color: var(--sketchy-color-2);
|
||||||
|
}
|
||||||
|
#nsfw {
|
||||||
|
border: 3px solid var(--nsfw-color-1);
|
||||||
|
background-color: var(--nsfw-color-2);
|
||||||
|
}
|
||||||
|
|
||||||
/* search category buttons */
|
/* search category buttons */
|
||||||
input[type=checkbox] { display: none; }
|
input[type=checkbox] { display: none; }
|
||||||
|
Reference in New Issue
Block a user