diff --git a/Client/SZUAbsolventenverein.Theme.Website.Client.csproj b/Client/SZUAbsolventenverein.Theme.Website.Client.csproj index fdbc6af..3a8fbbb 100644 --- a/Client/SZUAbsolventenverein.Theme.Website.Client.csproj +++ b/Client/SZUAbsolventenverein.Theme.Website.Client.csproj @@ -13,14 +13,18 @@ - - - + - ..\..\oqtane.framework-dev\Oqtane.Server\bin\Debug\net9.0\Oqtane.Client.dll - ..\..\oqtane.framework-dev\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll + + + + + + + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Client.dll + ..\..\oqtane.framework\Oqtane.Server\bin\Debug\net9.0\Oqtane.Shared.dll diff --git a/Client/Themes/MenuVertical.razor b/Client/Themes/MenuVertical.razor new file mode 100644 index 0000000..4ff1f74 --- /dev/null +++ b/Client/Themes/MenuVertical.razor @@ -0,0 +1,16 @@ +@namespace Oqtane.Themes.Controls +@inherits MenuBase + +@if (MenuPages.Any()) +{ + + + +
+ +
+} diff --git a/Client/Themes/Theme1.razor b/Client/Themes/Theme1.razor index 292be92..885f0c7 100644 --- a/Client/Themes/Theme1.razor +++ b/Client/Themes/Theme1.razor @@ -2,25 +2,13 @@ @inherits ThemeBase @inject ISettingService SettingService -
-
- -
-
@code { public override string Name => "Theme1"; diff --git a/Client/Themes/ThemeSettings.razor b/Client/Themes/ThemeSettings.razor index d5dfe6b..5e0da34 100644 --- a/Client/Themes/ThemeSettings.razor +++ b/Client/Themes/ThemeSettings.razor @@ -1,4 +1,4 @@ -@namespace SZUAbsolventenverein.Theme.Website + ich pr@namespace SZUAbsolventenverein.Theme.Website @inherits ModuleBase @implements Oqtane.Interfaces.ISettingsControl @inject ISettingService SettingService diff --git a/Client/Themes/icon.jpg b/Client/Themes/icon.jpg new file mode 100644 index 0000000..7d3f143 Binary files /dev/null and b/Client/Themes/icon.jpg differ diff --git a/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css b/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css index 7fe4709..b8d6076 100644 --- a/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css +++ b/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/Theme.css @@ -5,44 +5,46 @@ html, body { } .navigation { - max-width: 80vw; /* oder max-width: 100%; */ + max-width: 80vw; /* oder max-width: 100%;*/ margin: 0 auto; - position: fixed; + position: fixed; top: 0; z-index: 1000; background-color: #bbb; padding: 1rem 0; - box-shadow: 0 2px 4px rgba(0,0,0,0.1); - width: 80vw; /* Wichtig! */ - left: 50%; /* horizontale Zentrierung mit transform */ - transform: translateX(-50%); + box-shadow: 0 2px 4px rgba(0,0,0,0.1); + width: 80vw; /* Wichtig!*/ + /*left: 50%; /* horizontale Zentrierung mit transform*/ + /*transform: translateX(-50%);*/ border: 3px solid #75767B; border-top: none; border-bottom: none; } + + body { padding-top: 100px; /* Höhe der fixierten Navigation kompensieren */ } -.navigation .app-logo .img-fluid { +.app-logo .img-fluid { max-height: 60px; } -.navigation .app-menu { +.app-menu { display: flex; - gap: 1rem; + gap: 1rem; } -.navigation .nav-item a { +.nav-item a { color: black; font-weight: normal; text-decoration: none; } - .navigation .nav-item a.active { - font-weight: bold; - } +.nav-item a.active { + font-weight: bold; +} /* Footer */ .footer { @@ -57,7 +59,7 @@ body { .wrapper { - max-width: 80vw; /* max. 80% der Viewport-Breite */ + max-width: 80vw; /* max. 80% der Viewport-Breite */ margin: 0 auto; /* horizontal zentrieren */ display: flex; flex-direction: column; @@ -68,7 +70,7 @@ main.flex-fill { flex: 1 0 auto; /* Flex-grow 1, flex-shrink 0, flex-basis auto */ display: flex; flex-direction: column; - min-height: 0; /* Wichtig für flexbox overflow */ + min-height: 0; /* Wichtig für flexbox overflow*/ } .content { @@ -179,6 +181,48 @@ main.flex-fill { outline: none; } - +.hamburger { + width: 40px; + height: 28px; + position: relative; + cursor: pointer; +} + + .hamburger span { + position: absolute; + left: 0; + width: 100%; + height: 4px; + background: #e5e7eb; + border-radius: 2px; + transition: transform 0.25s ease, opacity 0.25s ease; + } + + .hamburger span:nth-child(1) { + top: 0; + } + + .hamburger span:nth-child(2) { + top: 12px; + } + + .hamburger span:nth-child(3) { + bottom: 0; + } + + /* Animation beim Klick (wird aktiv, wenn .active hinzugefügt wird) */ + .hamburger.active span:nth-child(1) { + transform: translateY(12px) rotate(45deg); + } + + .hamburger.active span:nth-child(2) { + opacity: 0; + } + + .hamburger.active span:nth-child(3) { + transform: translateY(-12px) rotate(-45deg); + } + + diff --git a/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/icon.png b/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/icon.png new file mode 100644 index 0000000..7d1104c Binary files /dev/null and b/Client/wwwroot/Themes/SZUAbsolventenverein.Theme.Website/icon.png differ diff --git a/Package/debug.cmd b/Package/debug.cmd index 51f43c7..4bab04e 100644 --- a/Package/debug.cmd +++ b/Package/debug.cmd @@ -2,6 +2,6 @@ set TargetFramework=%1 set ProjectName=%2 -XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.dll" "..\..\oqtane.framework-dev\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y -XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.pdb" "..\..\oqtane.framework-dev\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y -XCOPY "..\Client\wwwroot\*" "..\..\oqtane.framework-dev\Oqtane.Server\wwwroot\" /Y /S /I \ No newline at end of file +XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.dll" "..\..\oqtane.framework\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y +XCOPY "..\Client\bin\Debug\%TargetFramework%\%ProjectName%.Client.Oqtane.pdb" "..\..\oqtane.framework\Oqtane.Server\bin\Debug\%TargetFramework%\" /Y +XCOPY "..\Client\wwwroot\*" "..\..\oqtane.framework\Oqtane.Server\wwwroot\" /Y /S /I \ No newline at end of file diff --git a/Package/debug.sh b/Package/debug.sh index 9706cd8..e2e18ae 100644 --- a/Package/debug.sh +++ b/Package/debug.sh @@ -3,6 +3,6 @@ TargetFramework=$1 ProjectName=$2 -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../../oqtane.framework-dev/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../../oqtane.framework-dev/Oqtane.Server/bin/Debug/$TargetFramework/" -cp -rf "../Server/wwwroot/"* "../../oqtane.framework-dev/Oqtane.Server/wwwroot/" \ No newline at end of file +cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.dll" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -f "../Client/bin/Debug/$TargetFramework/$ProjectName$.Client.Oqtane.pdb" "../../oqtane.framework/Oqtane.Server/bin/Debug/$TargetFramework/" +cp -rf "../Server/wwwroot/"* "../../oqtane.framework/Oqtane.Server/wwwroot/" \ No newline at end of file diff --git a/Package/icon.png b/Package/icon.png index 7422cf2..7d1104c 100644 Binary files a/Package/icon.png and b/Package/icon.png differ diff --git a/Package/release.cmd b/Package/release.cmd index 37d6da0..ed871cb 100644 --- a/Package/release.cmd +++ b/Package/release.cmd @@ -3,5 +3,5 @@ set TargetFramework=%1 set ProjectName=%2 del "*.nupkg" -"..\..\oqtane.framework-dev\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName% -XCOPY "*.nupkg" "..\..\oqtane.framework-dev\Oqtane.Server\wwwroot\Packages\" /Y \ No newline at end of file +"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName% +XCOPY "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\wwwroot\Packages\" /Y \ No newline at end of file diff --git a/Package/release.sh b/Package/release.sh index f948175..0fd258f 100644 --- a/Package/release.sh +++ b/Package/release.sh @@ -1,5 +1,5 @@ TargetFramework=$1 ProjectName=$2 -"..\..\oqtane.framework-dev\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName% -cp -f "*.nupkg" "..\..\oqtane.framework-dev\Oqtane.Server\Packages\" \ No newline at end of file +"..\..\oqtane.framework\oqtane.package\nuget.exe" pack %ProjectName%.nuspec -Properties targetframework=%TargetFramework%;projectname=%ProjectName% +cp -f "*.nupkg" "..\..\oqtane.framework\Oqtane.Server\Packages\" \ No newline at end of file diff --git a/SZUAbsolventenverein.Theme.Website.sln b/SZUAbsolventenverein.Theme.Website.sln index 87a62d2..12d9460 100644 --- a/SZUAbsolventenverein.Theme.Website.sln +++ b/SZUAbsolventenverein.Theme.Website.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.13.35825.156 d17.13 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework-dev\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Server", "..\oqtane.framework\Oqtane.Server\Oqtane.Server.csproj", "{3AB6FCC9-EFEB-4C0E-A2CF-8103914C5196}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SZUAbsolventenverein.Theme.Website.Client", "Client\SZUAbsolventenverein.Theme.Website.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" EndProject