Kleinere optische Anpassungen
This commit is contained in:
@@ -139,7 +139,7 @@ namespace FoodsharingSiegen.Server.Auth
|
|||||||
return new OperationResult();
|
return new OperationResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
return new OperationResult(new Exception("Invalid"));
|
return new OperationResult(new Exception("Benutzername oder Passwort falsch"));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
foreach (var interaction in Interactions)
|
foreach (var interaction in Interactions)
|
||||||
{
|
{
|
||||||
<div>
|
<div>
|
||||||
@interaction.User.Name (@interaction.Date.ToShortDateString())
|
<span title="@interaction.User.Memo">@interaction.User.Name</span> (@interaction.Date.ToShortDateString())
|
||||||
@if (!string.IsNullOrWhiteSpace(interaction.Info))
|
@if (!string.IsNullOrWhiteSpace(interaction.Info))
|
||||||
{
|
{
|
||||||
<span>(<i>@interaction.Info</i>)</span>
|
<span>(<i>@interaction.Info</i>)</span>
|
||||||
|
|||||||
@@ -11,12 +11,19 @@
|
|||||||
<ProjectReference Include="..\FoodsharingSiegen.Shared\FoodsharingSiegen.Shared.csproj" />
|
<ProjectReference Include="..\FoodsharingSiegen.Shared\FoodsharingSiegen.Shared.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<LibSassOutputStyle>expanded</LibSassOutputStyle>
|
||||||
|
<LibSassOutputLevel>verbose</LibSassOutputLevel>
|
||||||
|
<LibSassMessageLevel>High</LibSassMessageLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Blazorise.DataGrid" Version="1.0.2" />
|
<PackageReference Include="Blazorise.DataGrid" Version="1.0.2" />
|
||||||
<PackageReference Include="Blazorise.Snackbar" Version="1.0.2" />
|
<PackageReference Include="Blazorise.Snackbar" Version="1.0.2" />
|
||||||
<PackageReference Include="Blazorise.Icons.Material" Version="1.0.2" />
|
<PackageReference Include="Blazorise.Icons.Material" Version="1.0.2" />
|
||||||
<PackageReference Include="Blazorise.Components" Version="1.0.2" />
|
<PackageReference Include="Blazorise.Components" Version="1.0.2" />
|
||||||
<PackageReference Include="Blazorise.Material" Version="1.0.2" />
|
<PackageReference Include="Blazorise.Material" Version="1.0.2" />
|
||||||
|
<PackageReference Include="LibSassBuilder" Version="2.0.1" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.1" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.1">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
<PageTitle>Aktivitäten</PageTitle>
|
<PageTitle>Aktivitäten</PageTitle>
|
||||||
|
|
||||||
<h4>Aktivitäten</h4>
|
<h2>Aktivitäten</h2>
|
||||||
|
|
||||||
<DataGrid TItem="Audit"
|
<DataGrid TItem="Audit"
|
||||||
Data="@Audits"
|
Data="@Audits"
|
||||||
|
|||||||
@@ -8,7 +8,9 @@
|
|||||||
<PageTitle>Profil</PageTitle>
|
<PageTitle>Profil</PageTitle>
|
||||||
|
|
||||||
<div style="width: 100%; max-width: 500px;">
|
<div style="width: 100%; max-width: 500px;">
|
||||||
<h4>Mein Profil</h4>
|
|
||||||
|
<h2>Mein Profil</h2>
|
||||||
|
|
||||||
<Button Color="Color.Primary" Clicked="SaveProfile">Speichern</Button>
|
<Button Color="Color.Primary" Clicked="SaveProfile">Speichern</Button>
|
||||||
<Fields Class="my-3">
|
<Fields Class="my-3">
|
||||||
<Validations @ref="ValidationsRef">
|
<Validations @ref="ValidationsRef">
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<PageTitle>Einarbeitungen</PageTitle>
|
<PageTitle>Einarbeitungen</PageTitle>
|
||||||
|
|
||||||
<h4>Aktuelle Einarbeitungen</h4>
|
<h2>Aktuelle Einarbeitungen</h2>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
Color="Color.Primary"
|
Color="Color.Primary"
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
{
|
{
|
||||||
<hr />
|
<hr />
|
||||||
<h4>Aktuell:</h4>
|
<h4>Aktuell:</h4>
|
||||||
<div class="row">
|
<div class="row m-0">
|
||||||
<Repeater Items="@activeProspects">
|
<Repeater Items="@activeProspects">
|
||||||
<ProspectContainer Prospect="context" InteractionModal="InteractionModal" ProspectModal="ProspectModal" RemoveInteraction="@RemoveInteraction"></ProspectContainer>
|
<ProspectContainer Prospect="context" InteractionModal="InteractionModal" ProspectModal="ProspectModal" RemoveInteraction="@RemoveInteraction"></ProspectContainer>
|
||||||
</Repeater>
|
</Repeater>
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
{
|
{
|
||||||
<hr />
|
<hr />
|
||||||
<h4>Abgeschlossen:</h4>
|
<h4>Abgeschlossen:</h4>
|
||||||
<div class="row">
|
<div class="row m-0">
|
||||||
<Repeater Items="@completedProspects">
|
<Repeater Items="@completedProspects">
|
||||||
<ProspectContainer Prospect="context" InteractionModal="InteractionModal" ProspectModal="ProspectModal" RemoveInteraction="@RemoveInteraction"></ProspectContainer>
|
<ProspectContainer Prospect="context" InteractionModal="InteractionModal" ProspectModal="ProspectModal" RemoveInteraction="@RemoveInteraction"></ProspectContainer>
|
||||||
</Repeater>
|
</Repeater>
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
@bind-SelectedRow="SelectedUser"
|
@bind-SelectedRow="SelectedUser"
|
||||||
RowDoubleClicked="arg => UserDataGrid.Edit(arg.Item)"
|
RowDoubleClicked="arg => UserDataGrid.Edit(arg.Item)"
|
||||||
Editable
|
Editable
|
||||||
Responsive>
|
Responsive="true">
|
||||||
<DataGridColumns>
|
<DataGridColumns>
|
||||||
<DataGridCommandColumn TItem="User" Width="100px" CellClass="@(_ => "px-0 d-flex align-items-center justify-content-center")">
|
<DataGridCommandColumn TItem="User" Width="100px" CellClass="@(_ => "px-0 d-flex align-items-center justify-content-center")">
|
||||||
<NewCommandTemplate>
|
<NewCommandTemplate>
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
<div class="top-row ps-3 navbar navbar-dark">
|
<div class="top-row ps-3 navbar navbar-dark">
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<a class="navbar-brand" href="">Foodsharing Siegen</a>
|
<a class="navbar-brand" href="">Foodsharing Siegen</a>
|
||||||
<button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
|
|
||||||
<span class="navbar-toggler-icon"></span>
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.top-row {
|
.top-row {
|
||||||
height: 3.5rem;
|
height: 60px;
|
||||||
background-color: rgba(0, 0, 0, 0.4);
|
background-color: rgba(0, 0, 0, 0.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +54,6 @@
|
|||||||
.navbar-toggler {
|
.navbar-toggler {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.collapse {
|
.collapse {
|
||||||
/* Never collapse the sidebar for wide screens */
|
/* Never collapse the sidebar for wide screens */
|
||||||
display: block;
|
display: block;
|
||||||
|
|||||||
62
FoodsharingSiegen.Server/Shared/NavMenu.razor.scss
Normal file
62
FoodsharingSiegen.Server/Shared/NavMenu.razor.scss
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
.navbar-toggler {
|
||||||
|
background-color: rgba(255, 255, 255, 0.1);
|
||||||
|
}
|
||||||
|
|
||||||
|
.top-row {
|
||||||
|
height: 60px;
|
||||||
|
background-color: rgba(0,0,0,0.4);
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-brand {
|
||||||
|
font-size: 1.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.oi {
|
||||||
|
width: 2rem;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
vertical-align: text-top;
|
||||||
|
top: -2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-item {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
padding-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-item:first-of-type {
|
||||||
|
padding-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-item:last-of-type {
|
||||||
|
padding-bottom: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-item ::deep a {
|
||||||
|
color: #533a20;
|
||||||
|
border-radius: 4px;
|
||||||
|
height: 3rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
line-height: 3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-item ::deep a.active {
|
||||||
|
background-color: rgba(255,255,255,0.25);
|
||||||
|
color: #64ae24;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-item ::deep a:hover {
|
||||||
|
background-color: rgba(255,255,255,0.1);
|
||||||
|
color: #64ae24;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 641px) {
|
||||||
|
.navbar-toggler {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.collapse {
|
||||||
|
/* Never collapse the sidebar for wide screens */
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user