Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop
This commit is contained in:
@@ -38,9 +38,12 @@ namespace MP.INVE.Shared
|
||||
else
|
||||
{
|
||||
userName = "0";
|
||||
if (!NavManager.Uri.Contains("OperatoreLogin"))
|
||||
if (Height != 480 && Width != 320)
|
||||
{
|
||||
NavManager.NavigateTo("OperatoreLogin", true);
|
||||
if (!NavManager.Uri.Contains("OperatoreLogin"))
|
||||
{
|
||||
NavManager.NavigateTo("OperatoreLogin", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -56,10 +59,10 @@ namespace MP.INVE.Shared
|
||||
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
await getId();
|
||||
var dimension = await JSRuntime.InvokeAsync<WindowDimension>("getWindowDimensions");
|
||||
Height = dimension.Height;
|
||||
Width = dimension.Width;
|
||||
await getId();
|
||||
}
|
||||
|
||||
protected void UpdateNavDisplay()
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
<a class="navbar-brand" @onclick="() => ToggleCompress()">MP.INVE <i class="fas fa-caret-square-left"></i></a>
|
||||
<a class="navbar-brand" @onclick="() => ToggleCompress()">MP.INVE <i class="fas fa-caret-square-left compresser"></i></a>
|
||||
}
|
||||
<button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
|
||||
@@ -30,6 +30,7 @@ namespace MP.INVE.Shared
|
||||
collapseNavMenu = !collapseNavMenu;
|
||||
}
|
||||
protected string userName { get; set; } = "0";
|
||||
#if false
|
||||
protected async Task getId()
|
||||
{
|
||||
OperatoreDTO answ = new OperatoreDTO();
|
||||
@@ -50,12 +51,13 @@ namespace MP.INVE.Shared
|
||||
NavigationManager.NavigateTo("OperatoreLogin", true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
protected override async Task OnInitializedAsync()
|
||||
{
|
||||
// recupero elenco JQM
|
||||
//ElencoLink = await MDService.ElencoLink();
|
||||
await getId();
|
||||
//await getId();
|
||||
}
|
||||
|
||||
protected bool showText { get; set; } = true;
|
||||
|
||||
@@ -22,6 +22,14 @@ body {
|
||||
.textConsensed {
|
||||
font-family: 'Roboto Condensed', sans-serif;
|
||||
}
|
||||
@media (max-width: 320px) {
|
||||
.navbar-toggler {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
.compresser {
|
||||
display: none;
|
||||
}
|
||||
h1:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
@@ -15,6 +15,17 @@ html, body {
|
||||
font-family: 'Roboto Condensed', sans-serif;
|
||||
}
|
||||
|
||||
@media(max-width: 320px) {
|
||||
|
||||
.navbar-toggler {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
.compresser {
|
||||
display: none;
|
||||
}
|
||||
|
||||
h1:focus {
|
||||
outline: none;
|
||||
}
|
||||
@@ -96,6 +107,7 @@ a, .btn-link {
|
||||
height: 22rem;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.dcBox {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
@@ -120,12 +132,12 @@ a, .btn-link {
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
#blazor-error-ui .dismiss {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
right: 0.75rem;
|
||||
top: 0.5rem;
|
||||
}
|
||||
#blazor-error-ui .dismiss {
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
right: 0.75rem;
|
||||
top: 0.5rem;
|
||||
}
|
||||
|
||||
.blazor-error-boundary {
|
||||
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
|
||||
@@ -133,9 +145,9 @@ a, .btn-link {
|
||||
color: white;
|
||||
}
|
||||
|
||||
.blazor-error-boundary::after {
|
||||
content: "An error has occurred."
|
||||
}
|
||||
.blazor-error-boundary::after {
|
||||
content: "An error has occurred."
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -387,17 +399,21 @@ blue {
|
||||
color: purple;
|
||||
background-color: purple;
|
||||
}
|
||||
|
||||
.dc_yellow {
|
||||
color: yellow;
|
||||
background-color: yellow;
|
||||
}
|
||||
|
||||
.dc_gray {
|
||||
color: gray;
|
||||
}
|
||||
|
||||
.dc_red {
|
||||
color: red;
|
||||
}
|
||||
|
||||
.dc_green {
|
||||
color: green;
|
||||
background-color: green;
|
||||
}
|
||||
}
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user