Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2023-10-12 11:35:19 +02:00
parent 5ee18d0c95 e7569af88f
commit 9b827635c5
8 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/Components/MachineBlock.razor
+6 -5
View File
@@ -104,9 +104,10 @@ else
</div>
</div>
</div>*@
<div class="card shadow" @onclick="ShowDetail">
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top" alt="@RecMSE.CodMacchina" style="height: 119px; object-fit: cover">
<div class="m-1 bg-black">
<div class="card shadow" @onclick="ShowDetail" style="border-radius: 15px">
@*<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">*@
<img src="@ImgUrlMacc(RecMSE.Url)" class="card-img-top imgFitToSize" alt="@RecMSE.CodMacchina">
<div class="bg-black">
<div class="card-img-overlay p-0 d-flex flex-row-reverse align-items-start rCTop">
<div class="labelTopDx px-2 w-100">
<div class="text-center fs-2 fw-bold">
@@ -115,8 +116,8 @@ else
</div>
</div>
</div>
<div class="card-body p-2" style="background-color: #212427">
<div class="@RecMSE.Semaforo p-2" style="border-radius: 15px">
<div class="card-body p-1" style="background-color: #212427; border-radius: 0 0 15px 15px">
<div class="@RecMSE.Semaforo p-1" style="border-radius: 15px">
<div class="d-flex justify-content-center fs-5">
<span><b>@RecMSE.DescrizioneStato</b>: &nbsp; @(formatDurata(RecMSE.Durata))</span>
</div>
MP-TAB-SERV/Components/MachineBlock.razor.cs
+4 -2
View File
@@ -60,7 +60,8 @@ namespace MP_TAB_SERV.Components
string answ = "";
if (string.IsNullOrEmpty(url.ToString()))
{
url = "Steamware.png";
//url = "Steamware.png";
url = "SIMDP1.png";
}
// verifico esistenza macchina SMALL...
@@ -76,7 +77,8 @@ namespace MP_TAB_SERV.Components
// altrimenti metto default Steamware
if (!File.Exists(fullPath))
{
answ = "images/macchine/Steamware.png";
//answ = "images/macchine/Steamware.png";
answ = "images/macchine/SIMDP1.png";
}
return answ;
MP-TAB-SERV/Components/MachineBlock.razor.css
+20 -9
View File
@@ -26,14 +26,15 @@
color: #FFFFFF;
background: #2200DE;
background: rgba(33, 36, 39, 0.7);
-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
border-radius: 15px 15px 0 0;
/*-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;*/
}
/* area semafori*/
.sVe {
@@ -74,4 +75,14 @@
color: #fff;
/*padding: 0px 4px 0px 4px;*/
}
/*end semafori */
/*end semafori */
.imgFitToSize {
height: 7.5rem;
object-fit: cover;
border-radius: 15px 15px 0 0;
}
@media (max-width: 640.98px) {
.imgFitToSize {
height: 5rem;
}
}
MP-TAB-SERV/Components/MachineBlock.razor.less
+13 -2
View File
@@ -28,14 +28,15 @@
color: #FFFFFF;
background: #2200DE;
background: rgba(33,36,39,.7);
-webkit-border-top-right-radius: inherit;
border-radius: 15px 15px 0 0;
/*-webkit-border-top-right-radius: inherit;
border-top-right-radius: inherit;
-webkit-border-top-left-radius: inherit;
border-top-left-radius: inherit;
-webkit-border-bottom-left-radius: inherit;
border-bottom-left-radius: inherit;
-webkit-border-bottom-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-right-radius: 0;*/
}
/* area semafori*/
@@ -83,5 +84,15 @@
}
/*end semafori */
.imgFitToSize {
height: 7.5rem;
object-fit: cover;
border-radius: 15px 15px 0 0;
}
@media (max-width: 640.98px){
.imgFitToSize{
height: 5rem;
}
}
MP-TAB-SERV/Components/MachineBlock.razor.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.7);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-top-left-radius:inherit;border-top-left-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.sVe{text-align:left;background:#009036;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}
.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);min-width:8em;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#fff;background:#2200de;background:rgba(33,36,39,.7);border-radius:15px 15px 0 0;}.sVe{text-align:left;background:#009036;background:#198754;color:#fff;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);color:#fff;}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);color:#fff;}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#fff;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);color:#fff;}.imgFitToSize{height:7.5rem;object-fit:cover;border-radius:15px 15px 0 0;}@media(max-width:640.98px){.imgFitToSize{height:5rem;}}
MP-TAB-SERV/Pages/_Layout.cshtml
+3 -1
View File
@@ -6,7 +6,9 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<meta name="mobile-web-app-capable" content="yes" />
<base href="~/" />
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
<link rel="stylesheet" href="lib/font-awesome/css/all.min.css" />
MP-TAB-SERV/Shared/MainLayout.razor
+1 -1
View File
@@ -33,7 +33,7 @@
</div>
</div>
<article class="content d-flex">
<article class="content pt-1 d-flex">
<div class="" id="mainBody">
@Body
</div>
MP-TAB-SERV/wwwroot/images/macchine/SIMDP1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 122 KiB