Skip to content

Commit 61abb4c

Browse files
committed
fix: update styles and structure for header, navbar, and main layout; improve notification display and sidebar functionality
1 parent ef61bc7 commit 61abb4c

9 files changed

Lines changed: 236 additions & 228 deletions

File tree

src/lib/component/Header.svelte

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,26 @@
33
</svelte:head>
44

55
<!-- Header -->
6-
<div class="{themeSettings.headerWidthOption === 'FULL_SIZE' ? 'container-fluid' : 'container'} position-relative"
7-
class:bg-white={!themeSettings.headerBgColor}
8-
id="header" style="{themeSettings.headerHeight ? `height: ${themeSettings.headerHeight}px;` : ''}">
6+
<div
7+
class="rounded {themeSettings.headerWidthOption === 'FULL_SIZE'
8+
? 'container-fluid'
9+
: 'container'} position-relative"
10+
class:bg-white={!themeSettings.headerBgColor}
11+
id="header"
12+
style="height: {themeSettings.headerHeight || '256'}px;">
913
<img
1014
alt={$_("components.header.alt")}
11-
class="{(themeSettings.logoHeight || themeSettings.logoWidth) ? '' : 'img-fluid'} p-3 position-absolute {logoPositionClasses}"
12-
class:d-none="{themeSettings.logoVisibility === false}"
13-
height="{themeSettings.logoHeight || 'auto'}"
15+
class="{themeSettings.logoHeight || themeSettings.logoWidth
16+
? ''
17+
: 'img-fluid'} p-3 position-absolute {logoPositionClasses}"
18+
class:d-none={themeSettings.logoVisibility === false}
19+
height={themeSettings.logoHeight || "auto"}
1420
src="/api/websiteLogo?hash={$session.siteInfo.websiteLogoHash}"
15-
style="{!themeSettings.logoHeight && !themeSettings.logoWidth ? 'height: 100%; width: 100%; object-fit: contain;' : ''} "
21+
style="{!themeSettings.logoHeight && !themeSettings.logoWidth
22+
? 'height: 100%; width: 100%; object-fit: contain;'
23+
: ''} "
1624
title={$session.siteInfo.websiteName}
17-
width="{themeSettings.logoWidth || 'auto'}" />
25+
width={themeSettings.logoWidth || "auto"} />
1826
</div>
1927

2028
<!-- Header End -->
@@ -26,7 +34,9 @@
2634
const session = getContext("session");
2735
const themeSettings = getContext("themeSettings");
2836
29-
$: logoPosition = themeSettings.logoPosition ? themeSettings.logoPosition : "CENTER";
37+
$: logoPosition = themeSettings.logoPosition
38+
? themeSettings.logoPosition
39+
: "CENTER";
3040
$: logoPositionClasses = getLogoPositionClasses(logoPosition);
3141
3242
function getLogoPositionClasses(logoPosition) {

src/lib/component/Main.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- Main Container -->
22
<main class="container">
3-
<div class="row">
3+
<div class="row g-3">
44
{#if sidebarEnabled && sidebarPosition === 'LEFT'}
55
<svelte:component this="{$sidebar}"
66
{...{ ...$sidebarProps, side: sidebarPosition === 'LEFT' ? 'left' : 'right' }} />

0 commit comments

Comments
 (0)