From 5bd3ddbe4f17e6129edc62426e340cd467c01e29 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 17 May 2021 14:36:46 +0200 Subject: [PATCH] fixcss --- MP.Stats/Components/SearchMod.razor | 2 +- MP.Stats/MP.Stats.csproj | 13 ++++++ MP.Stats/Pages/Index.razor | 19 +++++--- MP.Stats/Pages/Scarti.razor | 58 ++++++++++++------------ MP.Stats/Pages/Scarti.razor.cs | 1 + MP.Stats/Pages/_Host.cshtml | 6 +-- MP.Stats/Shared/NavMenu.razor | 2 +- MP.Stats/compilerconfig.json | 10 +++++ MP.Stats/compilerconfig.json.defaults | 63 +++++++++++++++++++++++++++ MP.Stats/wwwroot/css/fonts.min.css | 1 + MP.Stats/wwwroot/css/site.min.css | 1 + 11 files changed, 135 insertions(+), 41 deletions(-) create mode 100644 MP.Stats/compilerconfig.json create mode 100644 MP.Stats/compilerconfig.json.defaults create mode 100644 MP.Stats/wwwroot/css/fonts.min.css create mode 100644 MP.Stats/wwwroot/css/site.min.css diff --git a/MP.Stats/Components/SearchMod.razor b/MP.Stats/Components/SearchMod.razor index 0aab3cec..efebcbba 100644 --- a/MP.Stats/Components/SearchMod.razor +++ b/MP.Stats/Components/SearchMod.razor @@ -3,7 +3,7 @@ @inject MessageService MessageService
- +
diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 4ccf0775..52359c8b 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -5,6 +5,15 @@ MP.Stats + + + + + + <_ContentIncludedByDefault Remove="compilerconfig.json" /> + <_ContentIncludedByDefault Remove="wwwroot\css\fonts.min.css" /> + + @@ -13,6 +22,10 @@ + + + + PreserveNewest diff --git a/MP.Stats/Pages/Index.razor b/MP.Stats/Pages/Index.razor index 4cf3b8ee..91a38f96 100644 --- a/MP.Stats/Pages/Index.razor +++ b/MP.Stats/Pages/Index.razor @@ -3,6 +3,8 @@ @using MP.Stats.Components @using MP.Stats.Data +@inject MessageService MessageService +
@@ -22,14 +24,14 @@
-
@Anno
+
Main Topics
- - + + + @**@ - - + @**@
@@ -37,6 +39,9 @@
@code { - - private int Anno { get; set; } = DateTime.Today.Year; + protected override Task OnInitializedAsync() + { + MessageService.ShowSearch = false; + return base.OnInitializedAsync(); + } } \ No newline at end of file diff --git a/MP.Stats/Pages/Scarti.razor b/MP.Stats/Pages/Scarti.razor index e5b7ed07..c6503e13 100644 --- a/MP.Stats/Pages/Scarti.razor +++ b/MP.Stats/Pages/Scarti.razor @@ -8,43 +8,43 @@
@if (currRecord != null) { - @**@ + @**@ } @if (ListRecords == null) { -

Loading...

+

Loading...

} else { - - - - @**@ - - - - - - - - - - - @foreach (var record in ListRecords) +
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
+ + + @**@ + + + + + + + + + + + @foreach (var record in ListRecords) { - - @**@ - - - - - - - - + + @**@ + + + + + + + + } - -
MacchinaDataODL/CommessaArticoloDescrizioneQtaOperatore
 @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
 @record.IdxMacchina@record.DataOra@record.IdxOdl | @record.KeyRichiesta@record.CodArticolo@record.Descrizione@record.CodArticolo@record.MatrOpr
+ + }
diff --git a/MP.Stats/Pages/Scarti.razor.cs b/MP.Stats/Pages/Scarti.razor.cs index 75b83121..2a8a3d36 100644 --- a/MP.Stats/Pages/Scarti.razor.cs +++ b/MP.Stats/Pages/Scarti.razor.cs @@ -48,6 +48,7 @@ namespace MP.Stats.Pages protected override async Task OnInitializedAsync() { + numRecord = 10; MessageService.ShowSearch = true; MessageService.EA_SearchUpdated += OnSeachUpdated; ListRecords = await StatService.ScartiGetAll(numRecord, MessageService.SearchVal); diff --git a/MP.Stats/Pages/_Host.cshtml b/MP.Stats/Pages/_Host.cshtml index 9d3af208..65bfed2c 100644 --- a/MP.Stats/Pages/_Host.cshtml +++ b/MP.Stats/Pages/_Host.cshtml @@ -12,11 +12,11 @@ - MP-STATS + MP.STATS - + @@ -34,4 +34,4 @@ - + \ No newline at end of file diff --git a/MP.Stats/Shared/NavMenu.razor b/MP.Stats/Shared/NavMenu.razor index 68368d26..a2d36f59 100644 --- a/MP.Stats/Shared/NavMenu.razor +++ b/MP.Stats/Shared/NavMenu.razor @@ -19,7 +19,7 @@
  • - User Action Log + User ActionLog
  • diff --git a/MP.Stats/compilerconfig.json b/MP.Stats/compilerconfig.json new file mode 100644 index 00000000..e33c7792 --- /dev/null +++ b/MP.Stats/compilerconfig.json @@ -0,0 +1,10 @@ +[ + { + "outputFile": "wwwroot/css/fonts.css", + "inputFile": "wwwroot/css/fonts.less" + }, + { + "outputFile": "wwwroot/css/site.css", + "inputFile": "wwwroot/css/site.less" + } +] \ No newline at end of file diff --git a/MP.Stats/compilerconfig.json.defaults b/MP.Stats/compilerconfig.json.defaults new file mode 100644 index 00000000..b3519312 --- /dev/null +++ b/MP.Stats/compilerconfig.json.defaults @@ -0,0 +1,63 @@ +{ + "compilers": { + "less": { + "autoPrefix": "", + "cssComb": "none", + "ieCompat": true, + "strictMath": false, + "strictUnits": false, + "relativeUrls": true, + "rootPath": "", + "sourceMapRoot": "", + "sourceMapBasePath": "", + "sourceMap": false + }, + "sass": { + "autoPrefix": "", + "includePath": "", + "indentType": "space", + "indentWidth": 2, + "outputStyle": "nested", + "Precision": 5, + "relativeUrls": true, + "sourceMapRoot": "", + "lineFeed": "", + "sourceMap": false + }, + "stylus": { + "sourceMap": false + }, + "babel": { + "sourceMap": false + }, + "coffeescript": { + "bare": false, + "runtimeMode": "node", + "sourceMap": false + }, + "handlebars": { + "root": "", + "noBOM": false, + "name": "", + "namespace": "", + "knownHelpersOnly": false, + "forcePartial": false, + "knownHelpers": [], + "commonjs": "", + "amd": false, + "sourceMap": false + } + }, + "minifiers": { + "css": { + "enabled": true, + "termSemicolons": true, + "gzip": false + }, + "javascript": { + "enabled": true, + "termSemicolons": true, + "gzip": false + } + } +} \ No newline at end of file diff --git a/MP.Stats/wwwroot/css/fonts.min.css b/MP.Stats/wwwroot/css/fonts.min.css new file mode 100644 index 00000000..38cafa99 --- /dev/null +++ b/MP.Stats/wwwroot/css/fonts.min.css @@ -0,0 +1 @@ +@font-face{font-family:'Lato';font-style:normal;font-weight:400;src:url('../fonts/lato-v17-latin-regular.eot?');src:local(''),url('../fonts/lato-v17-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/lato-v17-latin-regular.woff2') format('woff2'),url('../fonts/lato-v17-latin-regular.woff') format('woff'),url('../fonts/lato-v17-latin-regular.ttf') format('truetype'),url('../fonts/lato-v17-latin-regular.svg#Lato') format('svg');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('../fonts/roboto-v27-latin-regular.eot?');src:local(''),url('../fonts/roboto-v27-latin-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/roboto-v27-latin-regular.woff2') format('woff2'),url('../fonts/roboto-v27-latin-regular.woff') format('woff'),url('../fonts/roboto-v27-latin-regular.ttf') format('truetype'),url('../fonts/roboto-v27-latin-regular.svg#Roboto') format('svg');} \ No newline at end of file diff --git a/MP.Stats/wwwroot/css/site.min.css b/MP.Stats/wwwroot/css/site.min.css new file mode 100644 index 00000000..fbf5f09d --- /dev/null +++ b/MP.Stats/wwwroot/css/site.min.css @@ -0,0 +1 @@ +@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');@import url('fonts.min.css');h1,h2,h3,h4,h5,h6,b{font-family:'Roboto',sans-serif;}html,body{font-family:'Lato',sans-serif;}a,.btn-link{color:#0366d6;}.btn-primary{color:#fff;background-color:#1b6ec2;border-color:#1861ac;}.content{padding-top:1.1rem;}.valid.modified:not([type=checkbox]){outline:1px solid #26b050;}.invalid{outline:1px solid #f00;}.validation-message{color:#f00;}#blazor-error-ui{background:#ffffe0;bottom:0;box-shadow:0 -1px 2px rgba(0,0,0,.2);display:none;left:0;padding:.6rem 1.25rem .7rem 1.25rem;position:fixed;width:100%;z-index:1000;}#blazor-error-ui .dismiss{cursor:pointer;position:absolute;right:.75rem;top:.5rem;}.shortcuts{text-align:center;}.shortcuts .shortcut-icon{font-size:2rem;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:.25rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:.5rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}} \ No newline at end of file