Egalware/ScheMe-SP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update versione e fine fix grafico (con correzione path typescrypt x compilazione)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-02-05 09:49:38 +01:00
parent 2288585888
commit 1dad4467db
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1120']) {
withEnv(['NEXT_BUILD_NUMBER=1130']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'ScheMe-SP'
ScheMe-SP.sln
+1 -1
View File
@@ -94,4 +94,4 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4EAEC3CE-9EF3-460C-91B3-EA78B3521821}
EndGlobalSection
EndGlobal
EndGlobal
ScheMe-SP/WebUserControls/mod_bottom.ascx
+7 -7
View File
@@ -1,15 +1,15 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_bottom.ascx.cs" Inherits="ScheMe.WebUserControls.mod_bottom" %>
<footer class="bottomnav">
<div runat="server" id="divFooterMenu" class="container-fluid text-center bg-light fixed-bottom mw-100">
<div runat="server" id="divFooterMenu" class="container-fluid text-center bg-light fixed-bottom mw-100 " style="padding: 0;">
<div class="row no-gutters">
<div class="col">
<a href="Accettazione" class='btn btn-square btn-lg btn-block <%: liClass("Accettazione") %>'>
<div class="row">
<div class="col-12 col-2">
<div class="col-2">
<i class="fa fa-users fa-lg" aria-hidden="true"></i>
</div>
<div class="col-12 col-8 text-center">
<div class="col-10 text-center">
Accettazione
</div>
</div>
@@ -18,10 +18,10 @@
<div class="col">
<a href="Valutazioni" class='btn btn-square btn-lg btn-block <%: liClass("Valutazioni") %>'>
<div class="row">
<div class="col-12 col-2">
<div class="col-2">
<i class="fa fa-universal-access fa-lg" aria-hidden="true"></i>
</div>
<div class="col-12 col-8 text-center">
<div class="col-10 text-center">
Valutazioni
</div>
</div>
@@ -30,10 +30,10 @@
<div class="col">
<a href="Allegati" class='btn btn-square btn-lg btn-block <%: liClass("Allegati") %>'>
<div class="row">
<div class="col-12 col-2">
<div class="col-2">
<i class="fa fa-files-o fa-lg" aria-hidden="true"></i>
</div>
<div class="col-12 col-8 text-center">
<div class="col-10 text-center">
Allegati
</div>
</div>
ScheMe-SP/WebUserControls/mod_top.ascx
+2 -2
View File
@@ -2,8 +2,8 @@
<asp:Timer ID="Timer1" runat="server"></asp:Timer>
<nav class="navbar navbar-expand-lg navbar-light justify-content-between" style="padding: 0.1em 0.5em; background-color: #e3f2fd;">
<a class="navbar-dark uppercase btn btn-dark text-center" href="Default" style="margin: 0 0.5em 0 0; padding: 0.25em;">
<nav class="navbar navbar-expand-lg navbar-light justify-content-between" style="padding: 0.1em 0.7em; background-color: #eee; margin-bottom:0.3em;">
<a class="navbar-dark uppercase btn btn-light text-center" href="Default" style="margin: 0 0.5em 0 0; padding: 0.3em;">
<div style="float: left;">
<i class="fa fa-user-md fa-lg" aria-hidden="true"></i>
<div class="d-block d-sm-none smallest">