wip - fix small issues
This commit is contained in:
parent
c27626f46e
commit
d964ba2598
10 changed files with 178 additions and 14 deletions
|
@ -21,7 +21,7 @@
|
|||
<Found Context="routeData">
|
||||
<AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
|
||||
<NotAuthorized>
|
||||
<text>Venligst login</text>
|
||||
<text>Login nødvendig</text>
|
||||
</NotAuthorized>
|
||||
<Authorizing>
|
||||
<text>Checker autorisation ...</text>
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
{
|
||||
<PageTitle>@Report.ReportData.Name</PageTitle>
|
||||
<div class="row">
|
||||
<div class="col d-none text-center align-content-center">
|
||||
<div class="col text-center align-content-center">
|
||||
<h3>@Report.ReportData.Name</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
{
|
||||
<PageTitle>@_report.ReportData.Name</PageTitle>
|
||||
<div class="row">
|
||||
<div class="col d-none text-center align-content-center">
|
||||
<div class="col text-center align-content-center">
|
||||
<h3>@_report.ReportData.Name</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -20,11 +20,14 @@
|
|||
|
||||
<div class="page">
|
||||
<div class="sidebar d-print-none">
|
||||
<NavMenu />
|
||||
<NavMenu/>
|
||||
</div>
|
||||
<main>
|
||||
<div class="top-row px-4 d-print-none">
|
||||
<TopbarNavigation />
|
||||
<TopbarNavigation/>
|
||||
</div>
|
||||
<div class="nav-icon-only d-print-none">
|
||||
<NavIconOnly />
|
||||
</div>
|
||||
<div class="content px-4 d-print-none">
|
||||
@Body
|
||||
|
|
|
@ -8,6 +8,10 @@ main {
|
|||
flex: 1;
|
||||
}
|
||||
|
||||
.nav-icon-only {
|
||||
background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%);
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%);
|
||||
}
|
||||
|
@ -40,6 +44,7 @@ main {
|
|||
}
|
||||
|
||||
@media (max-width: 1024px) {
|
||||
|
||||
.top-row:not(.auth) {
|
||||
display: none;
|
||||
}
|
||||
|
@ -53,12 +58,31 @@ main {
|
|||
}
|
||||
}
|
||||
|
||||
@media (max-width: 1024px){
|
||||
.nav-icon-only {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.top-row {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1025px) {
|
||||
.page {
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
.nav-icon-only {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.sidebar {
|
||||
display: block;
|
||||
width: 200px;
|
||||
height: 100vh;
|
||||
position: sticky;
|
||||
|
@ -66,6 +90,7 @@ main {
|
|||
}
|
||||
|
||||
.top-row {
|
||||
display: block;
|
||||
position: sticky;
|
||||
top: 0;
|
||||
z-index: 1;
|
||||
|
|
96
Wonky.Client/Shared/NavIconOnly.razor
Normal file
96
Wonky.Client/Shared/NavIconOnly.razor
Normal file
|
@ -0,0 +1,96 @@
|
|||
@*
|
||||
// Copyright (C) 2022 FCS Frede's Computer Services.
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Affero General Public License as
|
||||
// published by the Free Software Foundation, either version 3 of the
|
||||
// License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Affero General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Affero General Public License
|
||||
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
|
||||
//
|
||||
*@
|
||||
|
||||
@inject IWebAssemblyHostEnvironment HostEnvironment
|
||||
@using Wonky.Client.Components;
|
||||
|
||||
<div class="nav-icon-only">
|
||||
<nav class="flex-column">
|
||||
<AuthorizeView>
|
||||
<NotAuthorized>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/" Match="NavLinkMatch.All">
|
||||
<span class="oi oi-dashboard"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/login">
|
||||
<span class="oi oi-lock-locked"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
</NotAuthorized>
|
||||
</AuthorizeView>
|
||||
<AuthorizeView Roles="Admin">
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/admin/users/advisers">
|
||||
<span class="oi oi-people" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/admin/users/office">
|
||||
<span class="oi oi-people" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/price-catalog">
|
||||
<span class="oi oi-spreadsheet" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
</AuthorizeView>
|
||||
<AuthorizeView Roles="Adviser">
|
||||
<Authorized>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/home">
|
||||
<span class="oi oi-calendar" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/companies">
|
||||
<span class="oi oi-file" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/price-catalog">
|
||||
<span class="oi oi-spreadsheet" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/activity-today">
|
||||
<span class="oi oi-dashboard" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/sales-reports">
|
||||
<span class="oi oi-document" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/info">
|
||||
<span class="oi oi-question-mark" aria-hidden="true"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
|
||||
<div class="nav-item px-3">
|
||||
<NavLink class="nav-link ps-2" href="/logout">
|
||||
<span class="oi oi-lock-unlocked"></span>
|
||||
</NavLink>
|
||||
</div>
|
||||
</Authorized>
|
||||
</AuthorizeView>
|
||||
</nav>
|
||||
</div>
|
38
Wonky.Client/Shared/NavIconOnly.razor.css
Normal file
38
Wonky.Client/Shared/NavIconOnly.razor.css
Normal file
|
@ -0,0 +1,38 @@
|
|||
.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: #d7d7d7;
|
||||
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: white;
|
||||
}
|
||||
|
||||
.nav-item ::deep a:hover {
|
||||
background-color: rgba(255,255,255,0.1);
|
||||
color: white;
|
||||
}
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
"appInfo": {
|
||||
"name": "Wonky Client",
|
||||
"version": "0.8.135",
|
||||
"isBeta": true,
|
||||
"version": "0.8.136",
|
||||
"isBeta": false,
|
||||
"sandBox": false,
|
||||
"image": "grumpy-coder.png"
|
||||
},
|
||||
"apiConfig": {
|
||||
"innoBaseUrl": "https://staging.innotec.dk",
|
||||
"innoBaseUrl": "https://production.innotec.dk",
|
||||
"glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
|
||||
"glsId": "",
|
||||
"virkUrl": "api/v2/services/virk",
|
||||
|
|
|
@ -138,9 +138,12 @@ footer.version {
|
|||
https://developer.mozilla.org/en-US/docs/Web/CSS/break-before
|
||||
firefox still needs this
|
||||
*/
|
||||
page-break-before: always;
|
||||
page-break-after: always;
|
||||
page-break-inside: avoid;
|
||||
|
||||
break-after: page;
|
||||
break-inside: avoid;
|
||||
|
||||
}
|
||||
|
||||
/* printer classes */
|
||||
|
@ -159,11 +162,10 @@ footer.version {
|
|||
color-adjust: exact;
|
||||
}
|
||||
.report-page {
|
||||
/* deprecated properties */
|
||||
page-break-before: always;
|
||||
/* deprecated style properties */
|
||||
page-break-after: always;
|
||||
page-break-inside: avoid;
|
||||
/* new properties */
|
||||
/* new style properties */
|
||||
break-after: page;
|
||||
break-inside: avoid;
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<meta name="theme-color" content="#000">
|
||||
<base href="/" />
|
||||
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="css/app-135.css" rel="stylesheet" />
|
||||
<link href="css/app-136.css" rel="stylesheet" />
|
||||
<link href="Wonky.Client.styles.css" rel="stylesheet" />
|
||||
<link href="_content/Blazored.Toast/blazored-toast.min.css" rel="stylesheet" />
|
||||
</head>
|
||||
|
|
Loading…
Reference in a new issue