Egalware/C.TRACK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continuo fix css e selettore

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-13 19:17:31 +01:00
parent cc89c24958
commit e7ca7aaa52
6 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-MAG/App_Start/BundleConfig.cs
+2
View File
@@ -42,6 +42,8 @@ namespace MP_MAG
bundles.Add(new StyleBundle("~/Content/css").Include(
"~/Content/bootstrap.css",
"~/Content/fontawesome.css",
"~/Content/fonts.css",
"~/Content/site.css"));
// abilito bundle "forzato"!
MP-MAG/Content/Site.css
+1
View File
@@ -1,5 +1,6 @@
/* Move down content because we have a fixed navbar that is 50px tall */
body {
/*font-family: 'Roboto', sans-serif;*/
font-family: 'Roboto Condensed', sans-serif;
/*font-family: 'Open Sans Condensed', sans-serif;*/
padding-top: 50px;
MP-MAG/Content/Site.less
+1
View File
@@ -1,5 +1,6 @@
/* Move down content because we have a fixed navbar that is 50px tall */
body {
/*font-family: 'Roboto', sans-serif;*/
font-family: 'Roboto Condensed', sans-serif;
/*font-family: 'Open Sans Condensed', sans-serif;*/
padding-top: 50px;
MP-MAG/MP-MAG.csproj
+45 -2
View File
@@ -274,6 +274,9 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
<Compile Include="BaseUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\PrintQueueConfController.cs" />
<Compile Include="Controllers\PrintQueueController.cs" />
@@ -289,6 +292,13 @@
<Compile Include="Site.Master.designer.cs">
<DependentUpon>Site.Master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_barcode.ascx.cs">
<DependentUpon>cmp_barcode.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_barcode.ascx.designer.cs">
<DependentUpon>cmp_barcode.ascx</DependentUpon>
</Compile>
<Compile Include="SMART\elencoLotti.aspx.cs">
<DependentUpon>elencoLotti.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -296,6 +306,27 @@
<Compile Include="SMART\elencoLotti.aspx.designer.cs">
<DependentUpon>elencoLotti.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\prtFiniti.aspx.cs">
<DependentUpon>prtFiniti.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SMART\prtFiniti.aspx.designer.cs">
<DependentUpon>prtFiniti.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\prtPedane.aspx.cs">
<DependentUpon>prtPedane.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SMART\prtPedane.aspx.designer.cs">
<DependentUpon>prtPedane.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\prtSemilav.aspx.cs">
<DependentUpon>prtSemilav.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SMART\prtSemilav.aspx.designer.cs">
<DependentUpon>prtSemilav.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\selector.aspx.cs">
<DependentUpon>selector.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -338,6 +369,13 @@
<Compile Include="WebUserControls\cmp_numRow.ascx.designer.cs">
<DependentUpon>cmp_numRow.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_prtSemilav.ascx.cs">
<DependentUpon>cmp_prtSemilav.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_prtSemilav.ascx.designer.cs">
<DependentUpon>cmp_prtSemilav.ascx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="App_Readme\Elmah.txt" />
@@ -366,7 +404,7 @@
<Content Include="Content\regular.css" />
<Content Include="Content\regular.min.css" />
<Content Include="Content\Site.css">
<DependentUpon>Site.less</DependentUpon>
<DependentUpon>site.less</DependentUpon>
</Content>
<Content Include="Content\Site.min.css">
<DependentUpon>Site.css</DependentUpon>
@@ -460,7 +498,11 @@
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="Boundle.config" />
<Content Include="Reports\queueConf.json" />
<Content Include="WebUserControls\cmp_barcode.ascx" />
<Content Include="SMART\elencoLotti.aspx" />
<Content Include="SMART\prtFiniti.aspx" />
<Content Include="SMART\prtPedane.aspx" />
<Content Include="SMART\prtSemilav.aspx" />
<Content Include="webfonts\fa-brands-400.svg" />
<Content Include="webfonts\fa-regular-400.svg" />
<Content Include="webfonts\fa-solid-900.svg" />
@@ -469,6 +511,7 @@
<Content Include="WebUserControls\cmp_footer.ascx" />
<Content Include="WebUserControls\cmp_menuTop.ascx" />
<Content Include="WebUserControls\cmp_numRow.ascx" />
<Content Include="WebUserControls\cmp_prtSemilav.ascx" />
<None Include="compilerconfig.json" />
<None Include="compilerconfig.json.defaults">
<DependentUpon>compilerconfig.json</DependentUpon>
@@ -567,7 +610,7 @@
<DependentUpon>Web.config</DependentUpon>
</Content>
<Content Include="Areas\HelpPage\Views\_ViewStart.cshtml" />
<None Include="Content\Site.less" />
<None Include="Content\site.less" />
<Content Include="Views\Web.config" />
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Home\Index.cshtml" />
MP-MAG/SMART/selector.aspx
+4 -4
View File
@@ -13,17 +13,17 @@
<div class="col-12">
<a href="elencoLotti" class="shortcut">
<i class="fa-2x fas fa-list"></i>
<span class="shortcut-label">Elenco Lotti</span>
<span class="shortcut-label">RICERCA LOTTI</span>
</a>
<a href="prntSemilav" class="shortcut">
<a href="prtSemilav" class="shortcut">
<i class="fa-2x fas fa-print"></i>
<span class="shortcut-label">SEMILAVORATI</span>
</a>
<a href="prntFiniti" class="shortcut">
<a href="prtFiniti" class="shortcut">
<i class="fa-2x fas fa-print"></i>
<span class="shortcut-label">FINITI</span>
</a>
<a href="prntPedane" class="shortcut">
<a href="prtPedane" class="shortcut">
<i class="fa-2x fas fa-print"></i>
<span class="shortcut-label">PEDANE</span>
</a>
MP-MAG/Site.Master
+2 -2
View File
@@ -23,7 +23,7 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="~/Content/fontawesome-all.min.css" rel="stylesheet" />
@@ -59,7 +59,7 @@
<div class="container-flow body-content">
<asp:UpdatePanel ID="updPanel" runat="server">
<ContentTemplate>
<div class="containter m-0">
<div class="containter">
<asp:ContentPlaceHolder ID="MainContent" runat="server">
</asp:ContentPlaceHolder>
</div>