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

v105: aggiunta font roboto!

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-01-26 11:14:46 +01:00
parent 8f12254b32
commit df12f7ac70
8 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/MedAP/v15/.suo
BIN
View File
Binary file not shown.
Jenkinsfile
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=104']) {
withEnv(['NEXT_BUILD_NUMBER=105']) {
// env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2017-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2017-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MedAP'
MedAP/Content/Site.css
+1
View File
@@ -2,6 +2,7 @@
body {
padding-top: 50px;
padding-bottom: 20px;
font-family: 'Roboto Condensed', sans-serif;
}
/* Wrapping element */
/* Set some basic padding to keep content from hitting the edges */
MedAP/Content/Site.less
+1
View File
@@ -2,6 +2,7 @@
body {
padding-top: 50px;
padding-bottom: 20px;
font-family: 'Roboto Condensed', sans-serif;
}
/* Wrapping element */
MedAP/Content/Site.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MedAP/Site.Master
+1 -1
View File
@@ -21,7 +21,7 @@
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">
</head>
<body>
<form runat="server">
MedAP/SitePrint.Master
+1
View File
@@ -20,6 +20,7 @@
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link href="https://fonts.googleapis.com/css?family=Roboto+Condensed" rel="stylesheet">
</head>
<body>
<form runat="server">
MedAP/WebUserControl/mod_fattura.ascx
+15 -9
View File
@@ -6,14 +6,20 @@
<asp:FormView ID="frmView" runat="server" DataSourceID="odsTestata" Width="100%">
<ItemTemplate>
<div class="row">
<div class="col-xs-5 text-center" style="min-width: 300px; ">
<img src="Images/Logo01.png?h=120&w=480" alt="Logo" class="img-responsive pull-right" />
<h1><%# SteamWare.memLayer.ML.cdv("FATT_H1") %></h1>
<div class="col-xs-5 text-center">
<div class="row">
<div class="col-xs-12">
<img src="Images/Logo01.png?h=120&w=480" alt="Logo" class="img-responsive pull-right" />
</div>
<div class="col-xs-12" >
<h1 class="mTZero mBZero"><%# SteamWare.memLayer.ML.cdv("FATT_H1") %></h1>
</div>
</div>
<p>
<%# SteamWare.memLayer.ML.cdv("FATT_P1") %><br />
<%# SteamWare.memLayer.ML.cdv("FATT_P2") %><br />
<%# SteamWare.memLayer.ML.cdv("FATT_P3") %><br />
<%# SteamWare.memLayer.ML.cdv("FATT_P4") %>
<%# SteamWare.memLayer.ML.cdv("FATT_P1") %><br />
<%# SteamWare.memLayer.ML.cdv("FATT_P2") %><br />
<%# SteamWare.memLayer.ML.cdv("FATT_P3") %><br />
<%# SteamWare.memLayer.ML.cdv("FATT_P4") %>
</p>
<div class="text-left">
<strong style="font-size: 2em;">
@@ -68,7 +74,7 @@
<asp:Label ID="Label6" runat="server" Text='<%# Eval("pIva") %>' /></strong>
</div>
</div>
<div class="row" style="padding: 0.5em 0; border-bottom: 2px solid black; min-height: 800px;">
<div class="row" style="padding: 0.5em 0; border-bottom: 2px solid black; min-height: 70em;">
<div class="col-xs-12" style="font-size: 1.2em;">
<uc1:mod_fatturaRows runat="server" ID="mod_fatturaRows" idxDoc='<%# Eval("idxDoc") %>' />
</div>
@@ -108,7 +114,7 @@
<uc1:mod_fatturaFoot runat="server" ID="mod_fatturaFoot" idxDoc='<%# Eval("idxDoc") %>' />
</div>
</div>
</div>
</div>
<div class="panel-footer">
<div class="row text-right">
<div class="col-xs-4">