Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-03-24 13:51:34 +01:00
parent 14148b3e77 c55a47708f
commit beeb0cb6bf
11 changed files with 665 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Commesse/Content/Style.css
+1
View File
@@ -3,6 +3,7 @@
@import url('ExtraComp.css');
@import url('BtnReport.css');
@import url('JQClock.css');
@import url('font.css');
/* Move down content because we have a fixed navbar that is 50px tall */
body {
/*font-family: 'Open Sans Condensed', sans-serif;*/
GPW_Commesse/Content/Style.less
+1
View File
@@ -3,6 +3,7 @@
@import url('ExtraComp.css');
@import url('BtnReport.css');
@import url('JQClock.css');
@import url('font.css');
/* Move down content because we have a fixed navbar that is 50px tall */
body {
GPW_Commesse/Content/Style.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@import url('MasterPage.css');@import url('BuildBlocks.css');@import url('ExtraComp.css');@import url('BtnReport.css');@import url('JQClock.css');body{font-family:'Roboto Condensed',sans-serif;}input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}
@import url('MasterPage.css');@import url('BuildBlocks.css');@import url('ExtraComp.css');@import url('BtnReport.css');@import url('JQClock.css');@import url('font.css');body{font-family:'Roboto Condensed',sans-serif;}input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}
GPW_Commesse/Content/font-awesome.min.css
Vendored
+2 -1
View File
File diff suppressed because one or more lines are too long
GPW_Commesse/Content/fonts.css
+24
View File
@@ -0,0 +1,24 @@
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
src: url('OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
src: url('OpenSansCondensed.woff') format('woff');
}
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('Roboto.woff') format('woff');
}
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url('RobotoCondensed.woff') format('woff');
}
GPW_Commesse/Content/fonts.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff') format('woff');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('RobotoCondensed.woff') format('woff');}
GPW_Commesse/GPW_Commesse.csproj
+9 -1
View File
@@ -232,7 +232,15 @@
</Content>
<Content Include="Content\ExtraComp.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\font-awesome.min.css">
<DependentUpon>font-awesome.css</DependentUpon>
</Content>
<Content Include="Content\fonts.css">
<DependentUpon>fonts.less</DependentUpon>
</Content>
<Content Include="Content\fonts.min.css">
<DependentUpon>fonts.css</DependentUpon>
</Content>
<Content Include="Content\JQClock.css" />
<Content Include="Content\MasterPage.css" />
<Content Include="Content\Style.css">
GPW_Commesse/WebMasterPages/AjaxSimpleFull.Master
+2 -3
View File
@@ -28,7 +28,7 @@
<link href="~/Content/StyleCustom.css" rel="stylesheet" type="text/css" />
<script language="javascript" type="text/javascript">
<script lang="javascript" type="text/javascript">
$(document).ready(function () {
$("span.radioBtn input").checkboxradio({ icon: false });
$(".JQbutton").button();
@@ -51,8 +51,7 @@
</head>
<body class="body">
<form id="form1" runat="server">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true"
EnableCdn="false">
<asp:ScriptManager ID="sm" runat="server" EnablePartialRendering="true" EnableScriptGlobalization="true" EnableScriptLocalization="true" EnableCdn="false">
</asp:ScriptManager>
<div class="container-fluid">
<div class="row">
GPW_Commesse/WebUserControls/mod_commAttivitaDesk.ascx.cs
+615 -615
View File
File diff suppressed because it is too large Load Diff
GPW_Commesse/WebUserControls/mod_commUtLog.ascx
+3 -3
View File
@@ -15,11 +15,11 @@
<uc1:mod_menuTopFull ID="mod_menuTopFull1" runat="server" titolo="Gestione Commesse Utente" returnUrl="../HOME" />
</div>
<div>
<div class="filtro_1 py-1 px-2" style="height: 2em;">
<div class="divSx">
<div class="filtro_1 py-1 mx-0 row" style="height: 2em;">
<div class="col-6 text-left">
<uc2:mod_periodoAnalisi ID="mod_periodoAnalisi1" runat="server" realtimeUpdate="true" />
</div>
<div class="divDx">
<div class="col-6 text-right">
<asp:CheckBox runat="server" ID="chkShowBoth" Text="Sel globale" AutoPostBack="true" OnCheckedChanged="chkShowBoth_CheckedChanged" />
</div>
</div>
GPW_Commesse/bundleconfig.json
+6
View File
@@ -16,5 +16,11 @@
"inputFiles": [
"Content/BuildBlocks.css"
]
},
{
"outputFileName": "Content/font-awesome.min.css",
"inputFiles": [
"Content/font-awesome.css"
]
}
]