Merge branch 'fix'

This commit is contained in:
Yuri Kuznetsov
2024-06-21 13:14:47 +03:00
3 changed files with 31 additions and 3 deletions
@@ -170,7 +170,7 @@ class ClientManager
$cssFileList = $this->metadata->get(['app', 'client', 'cssList'], []);
$linkList = $this->metadata->get(['app', 'client', 'linkList'], []);
$faviconAlternate = $this->metadata->get('app.client.favicon') ?? $this->faviconAlternate;
$faviconAlternate = $this->metadata->get('app.client.faviconAlternate') ?? $this->faviconAlternate;
[$favicon, $faviconType] = $this->getFaviconData();
$scriptsHtml = implode('',
@@ -397,7 +397,7 @@ class ClientManager
*/
private function getFaviconData(): array
{
$faviconSvgPath = $this->metadata->get('app.client.faviconSvg') ?? $this->favicon;
$faviconSvgPath = $this->metadata->get('app.client.favicon') ?? $this->favicon;
$faviconType = str_ends_with($faviconSvgPath, '.svg') ? 'image/svg+xml' : 'image/png';
return [$faviconSvgPath, $faviconType];
+25 -1
View File
@@ -155,10 +155,34 @@ img.image-preview {
}
@media screen and (max-width: (@screen-sm-min - 1px)) {
.header-title,
.header-title,
> h3 {
font-size: 21px;
}
.header-buttons {
> .btn {
max-width: 280px;
overflow: hidden;
text-overflow: ellipsis;
}
&:has(:nth-child(3)) {
> .btn {
max-width: 240px;
}
}
&:has(:nth-child(4)) {
> .btn {
max-width: 170px;
}
}
.dropdown-group:last-child {
float: right;
}
}
}
.page-header-row {
+4
View File
@@ -270,6 +270,10 @@ body[data-navbar="side"] {
> a {
width: 34px;
&:focus {
background-color: transparent;
}
}
}