From bd60731edc4bb32323279002c4775ed0aaef6dc8 Mon Sep 17 00:00:00 2001 From: "zaccaria.majid" Date: Thu, 9 Feb 2023 17:57:51 +0100 Subject: [PATCH] avanzamento grafico --- StockMan.CORE/Components/ItemFamList.razor | 20 +++-- .../Components/ItemFamList.razor.css | 89 +++++++++++++++---- .../Components/ItemFamList.razor.less | 86 ++++++++++++++---- .../Components/ItemFamList.razor.min.css | 2 +- StockMan.CORE/Components/NewNavMenu.razor | 16 ++-- StockMan.CORE/Components/NewNavMenu.razor.css | 46 ++++++---- .../Components/NewNavMenu.razor.less | 52 +++++++---- .../Components/NewNavMenu.razor.min.css | 2 +- StockMan.CORE/Data/ItemFamSelectFilter.cs | 7 +- StockMan.CORE/Shared/MainLayout.razor.css | 2 +- StockMan.CORE/Shared/MainLayout.razor.less | 2 +- StockMan.CORE/Shared/MainLayout.razor.min.css | 2 +- StockMan.CORE/wwwroot/lib/menuCompression.js | 5 ++ 13 files changed, 241 insertions(+), 90 deletions(-) diff --git a/StockMan.CORE/Components/ItemFamList.razor b/StockMan.CORE/Components/ItemFamList.razor index 32aff3c..785c1ed 100644 --- a/StockMan.CORE/Components/ItemFamList.razor +++ b/StockMan.CORE/Components/ItemFamList.razor @@ -60,8 +60,9 @@ else *@
-
-
+ @*
+ +
*@
ID UNIVOCO
@@ -71,15 +72,13 @@ else
# ARTICOLI
-
+
+
@foreach (var item in ListRecord) {
-
- -
@item.Id
@@ -89,8 +88,13 @@ else
@item.NumItems
-
- + @*
+ +
*@ +
+ +
+
} diff --git a/StockMan.CORE/Components/ItemFamList.razor.css b/StockMan.CORE/Components/ItemFamList.razor.css index d2346ae..c90f846 100644 --- a/StockMan.CORE/Components/ItemFamList.razor.css +++ b/StockMan.CORE/Components/ItemFamList.razor.css @@ -1,6 +1,7 @@ .itemFamTable { width: 100%; margin-bottom: 1rem; + background-color: #f7fbff; } .itemFamTable tbody tr { background-color: #fff; @@ -17,43 +18,61 @@ } .intestazione { font-weight: bold; - background: rgba(189, 195, 199, 0.4); - padding: 1rem 1rem 0.5rem 0.5rem; - border-radius: 0.8rem 0.8rem 0 0; - color: #5c7aff; - box-shadow: 0 1px 3px 0px rgba(0, 0, 0, 0.4); + background-color: #ebf2fd; + padding: 0.5rem; + border-radius: 0.5rem; + color: #a2adbd; +} +.labelsStyle { + display: flex; + align-content: center; + flex-wrap: wrap; } .buttonCol { - width: 10%; + display: flex; + justify-content: space-between; + width: 17%; } .categoria { - width: 40%; + width: 25%; + display: flex; + align-content: center; + flex-wrap: wrap; } .numArt { width: 20%; + display: flex; + align-content: center; + flex-wrap: wrap; } .idUni { width: 20%; + display: flex; + align-content: center; + flex-wrap: wrap; } .contenuto { /*background-color: #fff;*/ /*border-radius: 0.5rem;*/ /*margin-top: 0.5rem; margin-bottom: 0.5rem;*/ - border-bottom: 0.1px solid #bdc3c7; + /*box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.4);*/ + box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px; + margin: 0.45rem 0 0 0; } .contenuto div { - padding: 1rem 1rem 0.5rem 0.5rem; - border-right: 0.1px solid #bdc3c7; - border-left: 0.1px solid #bdc3c7; + padding: 0.5rem; } .contenuto { - background: linear-gradient(to left, transparent 50%, rgba(92, 122, 255, 0.5) 50%) right; + border-radius: 0.5rem; + background: linear-gradient(to left, white 50%, rgba(92, 122, 255, 0.5) 50%) right; background-size: 200%; transition: 1s cubic-bezier(0.5, 0.25, 0, 1); } .but2 { - width: 10%; + display: flex; + justify-content: space-between; + width: 17%; text-align: end; } .button1, @@ -61,14 +80,52 @@ margin-inline: 0.5rem; border: none; border-radius: 0.2rem; - box-shadow: 1px 1px 3px 0px rgba(0, 0, 0, 0.4); + /*box-shadow: 1px 1px 3px 0px rgba(0, 0, 0, 0.4);*/ padding: 0.4rem; } .button1 { - background-color: #48a9a6; - color: #fff; + /*transform: rotate(0);*/ + transition: 0.5s; + background-color: transparent; + color: #95a5a6; +} +.button1:hover { + transform: rotate(-90deg); } .button2 { background-color: #982649; color: #fff; +} +.buttonNew { + margin-inline: 0.5rem; + border: none; + border-radius: 0.2rem; + /*box-shadow: 1px 1px 3px 0px rgba(0, 0, 0, 0.4);*/ + padding: 0.4rem; + /*transform: rotate(0);*/ + transition: 0.5s; + background-color: transparent; + color: #95a5a6; + background-color: #27ae60; + color: #fff; +} +.butAddDiv { + text-align: end; +} +.searchBar { + background-color: transparent; + border: none; + border-bottom: 1px solid #D1D1D1; + width: 75%; + transition: border cubic-bezier(0.49, 0.17, 0.43, 0.26) 0.3s; +} +.searchBar:focus { + outline: none; + border-color: #3547d4; +} +.hoverOptions { + background-color: #FF0000; + height: 100%; + width: 100%; + display: none; } \ No newline at end of file diff --git a/StockMan.CORE/Components/ItemFamList.razor.less b/StockMan.CORE/Components/ItemFamList.razor.less index e238fee..907db9b 100644 --- a/StockMan.CORE/Components/ItemFamList.razor.less +++ b/StockMan.CORE/Components/ItemFamList.razor.less @@ -4,6 +4,7 @@ .itemFamTable { width: 100%; margin-bottom: 1rem; + background-color: #f7fbff; } .itemFamTable tbody tr { @@ -23,27 +24,38 @@ .intestazione { font-weight: bold; - background: rgba(189, 195, 199, 0.4); - padding: 1rem 1rem 0.5rem 0.5rem; - border-radius: 0.8rem 0.8rem 0 0; - color: rgb(92, 122, 255); - box-shadow: 0 1px 3px 0px rgba(0, 0, 0, 0.4); + background-color: #ebf2fd; + padding: 0.5rem; + border-radius: 0.5rem; + color: #a2adbd; + //box-shadow: 0 1px 3px 0px rgba(0, 0, 0, 0.4); +} + +.labelsStyle { + display: flex; + align-content: center; + flex-wrap: wrap; } .buttonCol { - width: 10%; + display: flex; + justify-content: space-between; + width: 17%; } .categoria { - width: 40%; + width: 25%; + .labelsStyle; } .numArt { width: 20%; + .labelsStyle; } .idUni { width: 20%; + .labelsStyle; } .contenuto { @@ -51,17 +63,21 @@ /*border-radius: 0.5rem;*/ /*margin-top: 0.5rem; margin-bottom: 0.5rem;*/ - border-bottom: 0.1px solid rgb(189, 195, 199); + //border-bottom: 0.1px solid rgb(189, 195, 199); + /*box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.4);*/ + box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px; + margin: 0.45rem 0 0 0; } .contenuto div { - padding: 1rem 1rem 0.5rem 0.5rem; - border-right: 0.1px solid rgb(189, 195, 199); - border-left: 0.1px solid rgb(189, 195, 199); + padding: 0.5rem; + //border-right: 0.1px solid rgb(189, 195, 199); + //border-left: 0.1px solid rgb(189, 195, 199); } + .contenuto { - //border-radius: 0 0 0.5rem 0.5rem; - background: linear-gradient(to left, transparent 50%, rgba(92, 122, 255, 0.5) 50%) right; + border-radius: 0.5rem; + background: linear-gradient(to left, white 50%, rgba(92, 122, 255, 0.5) 50%) right; background-size: 200%; transition: 1s cubic-bezier(0.5,0.25,0,1); } @@ -79,16 +95,54 @@ margin-inline: 0.5rem; border: none; border-radius: 0.2rem; - box-shadow: 1px 1px 3px 0px rgba(0, 0, 0, 0.4); + /*box-shadow: 1px 1px 3px 0px rgba(0, 0, 0, 0.4);*/ padding: 0.4rem; } .button1 { - background-color: rgb(72, 169, 166); - color: #fff; + /*transform: rotate(0);*/ + transition: 0.5s; + background-color: transparent; + color: rgb(149, 165, 166); +} + +.button1:hover{ + transform: rotate(-90deg); } .button2 { background-color: rgb(152, 38, 73); color: #fff; } + +.buttonNew { + .button1; + background-color: rgb(39, 174, 96); + color: #fff; +} + +.butAddDiv { + text-align: end; +} + +.searchBar { + background-color: transparent; + border: none; + border-bottom: 1px solid #D1D1D1; + width: 75%; + transition: border cubic-bezier(0.49, 0.17, 0.43, 0.26) 0.3s; +} + + +.searchBar:focus { + outline: none; + border-color: #3547d4; +} + + +.hoverOptions { + background-color: #FF0000; + height: 100%; + width: 100%; + display: none; +} \ No newline at end of file diff --git a/StockMan.CORE/Components/ItemFamList.razor.min.css b/StockMan.CORE/Components/ItemFamList.razor.min.css index 990a452..22ab209 100644 --- a/StockMan.CORE/Components/ItemFamList.razor.min.css +++ b/StockMan.CORE/Components/ItemFamList.razor.min.css @@ -1 +1 @@ -.itemFamTable{width:100%;margin-bottom:1rem;}.itemFamTable tbody tr{background-color:#fff;}.itemFamTable tr{padding-top:.5rem;margin-top:.5rem;border-radius:1rem;}.intestazione,.contenuto{display:flex;justify-content:space-between;}.intestazione{font-weight:bold;background:rgba(189,195,199,.4);padding:1rem 1rem .5rem .5rem;border-radius:.8rem .8rem 0 0;color:#5c7aff;box-shadow:0 1px 3px 0 rgba(0,0,0,.4);}.buttonCol{width:10%;}.categoria{width:40%;}.numArt{width:20%;}.idUni{width:20%;}.contenuto{border-bottom:.1px solid #bdc3c7;}.contenuto div{padding:1rem 1rem .5rem .5rem;border-right:.1px solid #bdc3c7;border-left:.1px solid #bdc3c7;}.contenuto{background:linear-gradient(to left,transparent 50%,rgba(92,122,255,.5) 50%) right;background-size:200%;transition:1s cubic-bezier(.5,.25,0,1);}.but2{width:10%;text-align:end;}.button1,.button2{margin-inline:.5rem;border:0;border-radius:.2rem;box-shadow:1px 1px 3px 0 rgba(0,0,0,.4);padding:.4rem;}.button1{background-color:#48a9a6;color:#fff;}.button2{background-color:#982649;color:#fff;} \ No newline at end of file +.itemFamTable{width:100%;margin-bottom:1rem;background-color:#f7fbff;}.itemFamTable tbody tr{background-color:#fff;}.itemFamTable tr{padding-top:.5rem;margin-top:.5rem;border-radius:1rem;}.intestazione,.contenuto{display:flex;justify-content:space-between;}.intestazione{font-weight:bold;background-color:#ebf2fd;padding:.5rem;border-radius:.5rem;color:#a2adbd;}.labelsStyle{display:flex;align-content:center;flex-wrap:wrap;}.buttonCol{display:flex;justify-content:space-between;width:17%;}.categoria{width:25%;display:flex;align-content:center;flex-wrap:wrap;}.numArt{width:20%;display:flex;align-content:center;flex-wrap:wrap;}.idUni{width:20%;display:flex;align-content:center;flex-wrap:wrap;}.contenuto{box-shadow:rgba(149,157,165,.2) 0 8px 24px;margin:.45rem 0 0 0;}.contenuto div{padding:.5rem;}.contenuto{border-radius:.5rem;background:linear-gradient(to left,#fff 50%,rgba(92,122,255,.5) 50%) right;background-size:200%;transition:1s cubic-bezier(.5,.25,0,1);}.but2{display:flex;justify-content:space-between;width:17%;text-align:end;}.button1,.button2{margin-inline:.5rem;border:0;border-radius:.2rem;padding:.4rem;}.button1{transition:.5s;background-color:transparent;color:#95a5a6;}.button1:hover{transform:rotate(-90deg);}.button2{background-color:#982649;color:#fff;}.buttonNew{margin-inline:.5rem;border:0;border-radius:.2rem;padding:.4rem;transition:.5s;background-color:transparent;color:#95a5a6;background-color:#27ae60;color:#fff;}.butAddDiv{text-align:end;}.searchBar{background-color:transparent;border:0;border-bottom:1px solid #d1d1d1;width:75%;transition:border cubic-bezier(.49,.17,.43,.26) .3s;}.searchBar:focus{outline:0;border-color:#3547d4;}.hoverOptions{background-color:#f00;height:100%;width:100%;display:none;} \ No newline at end of file diff --git a/StockMan.CORE/Components/NewNavMenu.razor b/StockMan.CORE/Components/NewNavMenu.razor index 5c45992..250436f 100644 --- a/StockMan.CORE/Components/NewNavMenu.razor +++ b/StockMan.CORE/Components/NewNavMenu.razor @@ -52,16 +52,20 @@
} } -
- @foreach (var link in NavMenuLinksChild) - { +
+
@if (!isComp) { -
- @link.NOME + @foreach (var link in NavMenuLinksChild) + { +
+ @link.NOME +
+ } +
} - } +
} else diff --git a/StockMan.CORE/Components/NewNavMenu.razor.css b/StockMan.CORE/Components/NewNavMenu.razor.css index 171591a..6559d1c 100644 --- a/StockMan.CORE/Components/NewNavMenu.razor.css +++ b/StockMan.CORE/Components/NewNavMenu.razor.css @@ -1,12 +1,10 @@ .navMenu { background-color: #FF0000; - margin: 0.8rem 0.4rem 0.8rem 0.8rem; padding: 1rem; width: 18rem; - height: 97vh; + height: 100%; position: sticky; - border-radius: 1.5rem; - background-color: #022b3a; + background-color: #3547d3; box-shadow: 3px 3px 10px 0px #D1D1D1; transition: 0.35s; color: #fff; @@ -49,14 +47,13 @@ position: absolute; bottom: 0; left: 0; - background-color: #4c75a3; + background-color: #f6faff; width: 100%; - height: 10%; - border-radius: 0 0 0.8rem 0.8rem; display: flex; justify-content: space-evenly; align-content: center; flex-wrap: wrap; + color: #000; } .bot div { display: flex; @@ -66,7 +63,7 @@ } .bot h6 { padding-top: 2rem; - color: #fff; + color: #000; } .bot div { background-color: rgba(52, 73, 94, 0.5); @@ -94,15 +91,20 @@ height: 0%; transition: 1s; } -.linkChildren div { +.linkChildItem { background-color: rgba(179, 157, 219, 0.2); transition: background-color 200ms ease-out 100ms; } -.linkChildren div:hover { - background-color: #a288e3; +.last { + background-color: rgba(179, 157, 219, 0.2); + transition: background-color 200ms ease-out 100ms; + border-radius: 0.5rem; } -.linkChildren div:hover a { - color: #fff; +.linkChildItem:hover { + background-color: #f6faff; +} +.linkChildItem:hover a { + color: #000; } .navLinkItem { text-decoration: none; @@ -131,17 +133,17 @@ display: flex; width: 100%; border-radius: 1rem 1rem 0 0; - background-color: #a288e3; + background-color: #f6faff; justify-content: space-between; - color: #fff; + color: #000; } .navLinkItem:hover { - background-color: rgba(179, 157, 219, 0.2); - color: #a288e3; + background-color: rgba(246, 250, 255, 0.5); + color: #000; } .navLinkItemComp:hover { - background-color: rgba(179, 157, 219, 0.2); - color: #7e57c2; + background-color: rgba(246, 250, 255, 0.5); + color: #000; } .navLinkChildrenText { text-decoration: none; @@ -166,4 +168,10 @@ align-content: center; font-weight: bold; padding-top: 0.5rem; +} +.chiusura { + width: 100%; + height: 0.5rem; + background-color: rgba(179, 157, 219, 0.2); + border-radius: 0 0 0.5rem 0.5rem; } \ No newline at end of file diff --git a/StockMan.CORE/Components/NewNavMenu.razor.less b/StockMan.CORE/Components/NewNavMenu.razor.less index 8aec71b..25735bc 100644 --- a/StockMan.CORE/Components/NewNavMenu.razor.less +++ b/StockMan.CORE/Components/NewNavMenu.razor.less @@ -1,12 +1,12 @@ .navMenu { background-color: #FF0000; - margin: 0.8rem 0.4rem 0.8rem 0.8rem; + //margin: 0.8rem 0.4rem 0.8rem 0.8rem; padding: 1rem; width: 18rem; - height: 97vh; + height: 100%; position: sticky; - border-radius: 1.5rem; - background-color: rgb(2, 43, 58); + //border-radius: 1.5rem; + background-color: #3547d3; box-shadow: 3px 3px 10px 0px #D1D1D1; transition: 0.35s; color: #fff; @@ -60,14 +60,15 @@ position: absolute; bottom: 0; left: 0; - background-color: rgb(76, 117, 163); + background-color: #f6faff; width: 100%; - height: 10%; - border-radius: 0 0 0.8rem 0.8rem; + //height: 10%; + //border-radius: 0 0 0.8rem 0.8rem; display: flex; justify-content: space-evenly; align-content: center; flex-wrap: wrap; + color: #000; } .bot div { @@ -79,7 +80,7 @@ .bot h6 { padding-top: 2rem; - color: #fff; + color: #000; } .bot div { @@ -112,19 +113,26 @@ transition: 1s; } -.linkChildren div { +.linkChildItem { background-color: rgba(179, 157, 219, 0.2); transition: background-color 200ms ease-out 100ms; } -.linkChildren div:hover { - background-color: rgb(162, 136, 227); +.last { + background-color: rgba(179, 157, 219, 0.2); + transition: background-color 200ms ease-out 100ms; + border-radius: 0.5rem; +} + +.linkChildItem:hover { + background-color: rgb(246,250,255); a { - color: #fff; + color: #000; } } + .navLinkItem { text-decoration: none; padding: 0.5rem 1rem 0.5rem 1rem; @@ -154,18 +162,18 @@ display: flex; width: 100%; border-radius: 1rem 1rem 0 0; - background-color: rgb(162, 136, 227); + background-color: rgb(246,250,255); justify-content: space-between; - color: #fff; + color: #000; } .navLinkItem:hover { - background-color: rgba(179, 157, 219, 0.2); - color: rgb(162, 136, 227); + background-color: rgba(246,250,255,0.5); + color: #000; } .navLinkItemComp:hover { - background-color: rgba(179, 157, 219, 0.2); - color: rgb(126, 87, 194); + background-color: rgba(246,250,255,0.5); + color: #000; } .navLinkChildrenText { @@ -192,3 +200,11 @@ font-weight: bold; padding-top: 0.5rem; } + + +.chiusura { + width: 100%; + height: 0.5rem; + background-color: rgba(179, 157, 219, 0.2); + border-radius: 0 0 0.5rem 0.5rem; +} \ No newline at end of file diff --git a/StockMan.CORE/Components/NewNavMenu.razor.min.css b/StockMan.CORE/Components/NewNavMenu.razor.min.css index 93f7db2..2baf11d 100644 --- a/StockMan.CORE/Components/NewNavMenu.razor.min.css +++ b/StockMan.CORE/Components/NewNavMenu.razor.min.css @@ -1 +1 @@ -.navMenu{background-color:#f00;margin:.8rem .4rem .8rem .8rem;padding:1rem;width:18rem;height:97vh;position:sticky;border-radius:1.5rem;background-color:#022b3a;box-shadow:3px 3px 10px 0 #d1d1d1;transition:.35s;color:#fff;}#myBtn{transition:.25s;border:0;background:none;padding:0;}.title{text-align:center;display:flex;justify-content:space-between;transition:1s;margin-bottom:1rem;}.titleComp{margin-bottom:1rem;}.icon{margin-top:.5rem;padding:.8rem;background-color:#d9d9d9;border-radius:50%;}.title h4{margin-top:.7rem;}.links{align-content:center;text-align:center;display:grid;height:100%;}.decoration{text-decoration:none;}.bot{position:absolute;bottom:0;left:0;background-color:#4c75a3;width:100%;height:10%;border-radius:0 0 .8rem .8rem;display:flex;justify-content:space-evenly;align-content:center;flex-wrap:wrap;}.bot div{display:flex;justify-content:space-evenly;align-content:center;flex-wrap:wrap;}.bot h6{padding-top:2rem;color:#fff;}.bot div{background-color:rgba(52,73,94,.5);height:3rem;width:3rem;margin:1rem;display:flex;justify-content:space-evenly;align-content:center;flex-wrap:wrap;font-size:1.5rem;}.navLinkIcon{padding:0;margin:0;}.navLinkIcon,.navLinkText{width:50%;transition:.25s;}.linkChildren{align-content:start;display:none;height:0%;transition:1s;}.linkChildren div{background-color:rgba(179,157,219,.2);transition:background-color 200ms ease-out 100ms;}.linkChildren div:hover{background-color:#a288e3;}.linkChildren div:hover a{color:#fff;}.navLinkItem{text-decoration:none;padding:.5rem 1rem .5rem 1rem;border-radius:1rem;transition:background-color 300ms ease-out 100ms;display:flex;width:100%;justify-content:space-between;margin-top:.2rem;}.navLinkItemComp{text-decoration:none;padding:.5rem 1rem .5rem 1rem;border-radius:1rem;transition:background-color 300ms ease-out 100ms;display:flex;width:100%;justify-content:space-between;margin-top:.2rem;}.navLinkItemActive{text-decoration:none;padding:.5rem 1rem .5rem 1rem;transition:background-color 300ms ease-out 100ms;display:flex;width:100%;border-radius:1rem 1rem 0 0;background-color:#a288e3;justify-content:space-between;color:#fff;}.navLinkItem:hover{background-color:rgba(179,157,219,.2);color:#a288e3;}.navLinkItemComp:hover{background-color:rgba(179,157,219,.2);color:#7e57c2;}.navLinkChildrenText{text-decoration:none;color:#fff;}.navLinkItem i,.navLinkItemActive i{width:25%;text-align:center;display:flex;justify-content:center;align-content:center;flex-wrap:wrap;font-size:1rem;}.navLinkItem h6,.navLinkItemActive h6{width:75%;text-align:center;display:flex;flex-wrap:wrap;align-content:center;font-weight:bold;padding-top:.5rem;} \ No newline at end of file +.navMenu{background-color:#f00;padding:1rem;width:18rem;height:100%;position:sticky;background-color:#3547d3;box-shadow:3px 3px 10px 0 #d1d1d1;transition:.35s;color:#fff;}#myBtn{transition:.25s;border:0;background:none;padding:0;}.title{text-align:center;display:flex;justify-content:space-between;transition:1s;margin-bottom:1rem;}.titleComp{margin-bottom:1rem;}.icon{margin-top:.5rem;padding:.8rem;background-color:#d9d9d9;border-radius:50%;}.title h4{margin-top:.7rem;}.links{align-content:center;text-align:center;display:grid;height:100%;}.decoration{text-decoration:none;}.bot{position:absolute;bottom:0;left:0;background-color:#f6faff;width:100%;display:flex;justify-content:space-evenly;align-content:center;flex-wrap:wrap;color:#000;}.bot div{display:flex;justify-content:space-evenly;align-content:center;flex-wrap:wrap;}.bot h6{padding-top:2rem;color:#000;}.bot div{background-color:rgba(52,73,94,.5);height:3rem;width:3rem;margin:1rem;display:flex;justify-content:space-evenly;align-content:center;flex-wrap:wrap;font-size:1.5rem;}.navLinkIcon{padding:0;margin:0;}.navLinkIcon,.navLinkText{width:50%;transition:.25s;}.linkChildren{align-content:start;display:none;height:0%;transition:1s;}.linkChildItem{background-color:rgba(179,157,219,.2);transition:background-color 200ms ease-out 100ms;}.last{background-color:rgba(179,157,219,.2);transition:background-color 200ms ease-out 100ms;border-radius:.5rem;}.linkChildItem:hover{background-color:#f6faff;}.linkChildItem:hover a{color:#000;}.navLinkItem{text-decoration:none;padding:.5rem 1rem .5rem 1rem;border-radius:1rem;transition:background-color 300ms ease-out 100ms;display:flex;width:100%;justify-content:space-between;margin-top:.2rem;}.navLinkItemComp{text-decoration:none;padding:.5rem 1rem .5rem 1rem;border-radius:1rem;transition:background-color 300ms ease-out 100ms;display:flex;width:100%;justify-content:space-between;margin-top:.2rem;}.navLinkItemActive{text-decoration:none;padding:.5rem 1rem .5rem 1rem;transition:background-color 300ms ease-out 100ms;display:flex;width:100%;border-radius:1rem 1rem 0 0;background-color:#f6faff;justify-content:space-between;color:#000;}.navLinkItem:hover{background-color:rgba(246,250,255,.5);color:#000;}.navLinkItemComp:hover{background-color:rgba(246,250,255,.5);color:#000;}.navLinkChildrenText{text-decoration:none;color:#fff;}.navLinkItem i,.navLinkItemActive i{width:25%;text-align:center;display:flex;justify-content:center;align-content:center;flex-wrap:wrap;font-size:1rem;}.navLinkItem h6,.navLinkItemActive h6{width:75%;text-align:center;display:flex;flex-wrap:wrap;align-content:center;font-weight:bold;padding-top:.5rem;}.chiusura{width:100%;height:.5rem;background-color:rgba(179,157,219,.2);border-radius:0 0 .5rem .5rem;} \ No newline at end of file diff --git a/StockMan.CORE/Data/ItemFamSelectFilter.cs b/StockMan.CORE/Data/ItemFamSelectFilter.cs index 233a7d5..e4ecccb 100644 --- a/StockMan.CORE/Data/ItemFamSelectFilter.cs +++ b/StockMan.CORE/Data/ItemFamSelectFilter.cs @@ -36,8 +36,11 @@ return clonedData; } - public override bool Equals(object obj) + public override bool Equals(object? obj) { + if (obj == null) + return false; + if (!(obj is ItemFamSelectFilter item)) return false; @@ -51,7 +54,7 @@ return false; if (CurrPage != item.CurrPage) - return false; + return false; return true; } diff --git a/StockMan.CORE/Shared/MainLayout.razor.css b/StockMan.CORE/Shared/MainLayout.razor.css index b42c13d..cf7abc2 100644 --- a/StockMan.CORE/Shared/MainLayout.razor.css +++ b/StockMan.CORE/Shared/MainLayout.razor.css @@ -5,7 +5,7 @@ } main { flex: 1; - /*background-color: rgba(236, 240, 241, 0.5);*/ + background-color: #f7fbff; width: 100%; /*margin: 0.5rem 0.5rem 0.5rem 0.2rem; border-radius: 1rem; diff --git a/StockMan.CORE/Shared/MainLayout.razor.less b/StockMan.CORE/Shared/MainLayout.razor.less index 186a328..5262815 100644 --- a/StockMan.CORE/Shared/MainLayout.razor.less +++ b/StockMan.CORE/Shared/MainLayout.razor.less @@ -7,7 +7,7 @@ main { flex: 1; - /*background-color: rgba(236, 240, 241, 0.5);*/ + background-color: #f7fbff; width: 100%; /*margin: 0.5rem 0.5rem 0.5rem 0.2rem; border-radius: 1rem; diff --git a/StockMan.CORE/Shared/MainLayout.razor.min.css b/StockMan.CORE/Shared/MainLayout.razor.min.css index ce1f4bf..b96e4cd 100644 --- a/StockMan.CORE/Shared/MainLayout.razor.min.css +++ b/StockMan.CORE/Shared/MainLayout.razor.min.css @@ -1 +1 @@ -.page{position:relative;display:flex;flex-direction:column;}main{flex:1;width:100%;}.page{flex-direction:row;} \ No newline at end of file +.page{position:relative;display:flex;flex-direction:column;}main{flex:1;background-color:#f7fbff;width:100%;}.page{flex-direction:row;} \ No newline at end of file diff --git a/StockMan.CORE/wwwroot/lib/menuCompression.js b/StockMan.CORE/wwwroot/lib/menuCompression.js index ba2a165..f799406 100644 --- a/StockMan.CORE/wwwroot/lib/menuCompression.js +++ b/StockMan.CORE/wwwroot/lib/menuCompression.js @@ -1,10 +1,14 @@  function openNav() { document.getElementById("mySidebar").style.width = "18rem"; + document.getElementById("mySidebar").style.margin = "0"; + document.getElementById("mySidebar").style.borderRadius = "0"; } function closeNav() { document.getElementById("mySidebar").style.width = "5rem"; + document.getElementById("mySidebar").style.margin = "0.5rem 0 0.5rem 0"; + document.getElementById("mySidebar").style.borderRadius = "0 0.5rem 0.5rem 0"; } function doShowChildren(id) { @@ -20,6 +24,7 @@ function doHideChildren(id) { function selectItem(id) { console.log(id); document.getElementById(id).style.backgroundPosition = "left"; + document.getElementsByClassName("hoverOptions").style.display = "block"; } function unSelectItem(id) {