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

FIX COLORAZIONE!!!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-06-04 18:29:35 +02:00
parent 63e0a7137a
commit d21bf9902b
8 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Admin/Content/Style.css
+1
View File
@@ -203,6 +203,7 @@ body {
text-align: left;
width: 100%;
height: 100%;
/*background: linear-gradient(#009036, #8cbd59, #00762c);*/
background-color: #009036;
background-image: url(../images/verde.png);
color: Yellow;
MP-Admin/Content/Style.less
+3 -3
View File
@@ -246,9 +246,9 @@ body {
text-align: left;
width: 100%;
height: 100%;
background: linear-gradient():(#009036, #8cbd59, #00762c);
/*background-color: #009036;*/
/*background-image: url(../images/verde.png);*/
/*background: linear-gradient(#009036, #8cbd59, #00762c);*/
background-color: #009036;
background-image: url(../images/verde.png);
color: Yellow;
}
MP-Site/Content/Style.css
+5
View File
@@ -265,6 +265,7 @@ body {
width: 100%;
height: 100%;
background-color: #009036;
background-image: url(../images/verde.png);
color: #fffab6;
}
.sVe a {
@@ -286,6 +287,7 @@ body {
width: 100%;
height: 100%;
background-color: #ffec00;
background-image: url(../images/giallo.png);
}
.sGi a {
text-decoration: none;
@@ -306,6 +308,7 @@ body {
width: 100%;
height: 100%;
background-color: #e2001a;
background-image: url(../images/rosso.png);
color: Yellow;
}
.sRo a {
@@ -327,6 +330,7 @@ body {
width: 100%;
height: 100%;
background-color: #3690FF;
background-image: url(../images/blu.png);
color: #ffb6fa;
}
.sBl a {
@@ -348,6 +352,7 @@ body {
width: 100%;
height: 100%;
background-color: #bcbcbc;
background-image: url(../images/grigio.png);
}
.statoMacchine {
font-size: 10pt;
MP-Site/Content/Style.less
+5
View File
@@ -293,6 +293,7 @@ body {
width: 100%;
height: 100%;
background-color: #009036;
background-image: url(../images/verde.png);
color: #fffab6;
a {
@@ -318,6 +319,7 @@ body {
width: 100%;
height: 100%;
background-color: #ffec00;
background-image: url(../images/giallo.png);
a {
text-decoration: none;
@@ -342,6 +344,7 @@ body {
width: 100%;
height: 100%;
background-color: #e2001a;
background-image: url(../images/rosso.png);
color: Yellow;
a {
@@ -367,6 +370,7 @@ body {
width: 100%;
height: 100%;
background-color: #3690FF;
background-image: url(../images/blu.png);
color: #ffb6fa;
a {
@@ -392,6 +396,7 @@ body {
width: 100%;
height: 100%;
background-color: #bcbcbc;
background-image: url(../images/grigio.png);
}
.statoMacchine {
MP-Site/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Site/MP-Site.csproj
+11 -6
View File
@@ -135,7 +135,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.AspNet.Web.Optimization.WebForms, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.2\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -182,7 +182,7 @@
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.1.1.2\lib\net40\System.Web.Optimization.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
@@ -605,8 +605,12 @@
<Content Include="Content\fonts.min.css">
<DependentUpon>fonts.css</DependentUpon>
</Content>
<Content Include="Content\Style.css" />
<Content Include="Content\Style.min.css" />
<Content Include="Content\Style.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
<Content Include="Content\Style.min.css">
<DependentUpon>Style.css</DependentUpon>
</Content>
<Content Include="Default.aspx" />
<Content Include="diagApp.aspx" />
<Content Include="erroreComunicazione.aspx" />
@@ -617,6 +621,7 @@
<Content Include="favicon.ico" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="Global.asax" />
<Content Include="images\blu.png" />
<Content Include="images\empty.png" />
<Content Include="images\LogoMapoNoText.png" />
<Content Include="images\logoSteamware.png" />
@@ -997,11 +1002,11 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets" Condition="Exists('..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets')" />
<Import Project="..\packages\BuildWebCompiler.1.11.326\build\BuildWebCompiler.targets" Condition="Exists('..\packages\BuildWebCompiler.1.11.326\build\BuildWebCompiler.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildWebCompiler.1.11.375\build\BuildWebCompiler.targets'))" />
<Error Condition="!Exists('..\packages\BuildWebCompiler.1.11.326\build\BuildWebCompiler.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildWebCompiler.1.11.326\build\BuildWebCompiler.targets'))" />
</Target>
</Project>
MP-Site/Web.config
+2 -2
View File
@@ -117,8 +117,8 @@
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" />
</controls>
<add assembly="Microsoft.AspNet.Web.Optimization.WebForms" namespace="Microsoft.AspNet.Web.Optimization.WebForms" tagPrefix="webopt" /></controls>
</pages>
<webServices>
<protocols>
MP-Site/packages.config
+3 -3
View File
@@ -4,15 +4,15 @@
<package id="AjaxMin" version="5.14.5506.26202" targetFramework="net4" />
<package id="Antlr" version="3.5.0.2" targetFramework="net462" />
<package id="bootstrap" version="4.1.1" targetFramework="net462" />
<package id="BuildWebCompiler" version="1.11.375" targetFramework="net462" />
<package id="BuildWebCompiler" version="1.11.326" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
<package id="elmah.corelibrary" version="1.2.2" targetFramework="net462" />
<package id="FontAwesome" version="4.7.0" targetFramework="net462" />
<package id="jQuery" version="3.3.1" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.2" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.2" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="2.2.6" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />