diff --git a/Jenkinsfile b/Jenkinsfile
index 4176de86..b75daea7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=1367']) {
+ withEnv(['NEXT_BUILD_NUMBER=1369']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
diff --git a/MP-LAND/Content/OpenSans.woff b/MP-LAND/Content/OpenSans.woff
new file mode 100644
index 00000000..55b25f86
Binary files /dev/null and b/MP-LAND/Content/OpenSans.woff differ
diff --git a/MP-LAND/Content/OpenSansCondensed.woff b/MP-LAND/Content/OpenSansCondensed.woff
new file mode 100644
index 00000000..aedbd930
Binary files /dev/null and b/MP-LAND/Content/OpenSansCondensed.woff differ
diff --git a/MP-LAND/Content/Roboto.woff2 b/MP-LAND/Content/Roboto.woff2
new file mode 100644
index 00000000..de83f9cf
Binary files /dev/null and b/MP-LAND/Content/Roboto.woff2 differ
diff --git a/MP-LAND/Content/RobotoCondensed.woff2 b/MP-LAND/Content/RobotoCondensed.woff2
new file mode 100644
index 00000000..d7ab7afb
Binary files /dev/null and b/MP-LAND/Content/RobotoCondensed.woff2 differ
diff --git a/MP-LAND/Content/Site.css b/MP-LAND/Content/Site.css
index 9a845588..911c6a9e 100644
--- a/MP-LAND/Content/Site.css
+++ b/MP-LAND/Content/Site.css
@@ -1,6 +1,8 @@
-body {
+@import "font.css";
+body {
padding-top: 50px;
padding-bottom: 20px;
+ font-family: "Roboto Condensed";
}
/* Set padding to keep content from hitting the edges */
.body-content {
diff --git a/MP-LAND/Content/Site.less b/MP-LAND/Content/Site.less
index 7ed1281c..9634d554 100644
--- a/MP-LAND/Content/Site.less
+++ b/MP-LAND/Content/Site.less
@@ -1,6 +1,10 @@
-body {
+@import "font.css";
+
+body
+{
padding-top: 50px;
padding-bottom: 20px;
+ font-family: "Roboto Condensed";
}
/* Set padding to keep content from hitting the edges */
diff --git a/MP-LAND/Content/Site.min.css b/MP-LAND/Content/Site.min.css
index 0f36e43d..c407019b 100644
--- a/MP-LAND/Content/Site.min.css
+++ b/MP-LAND/Content/Site.min.css
@@ -1 +1 @@
-body{padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.text-white{color:#fff;}.text-gray{color:#696969;}.userCard{display:block;page-break-before:auto;page-break-inside:avoid;page-break-after:auto;}@page{margin:1cm;}@media print{.userCard{display:block;page-break-before:always;}}
\ No newline at end of file
+@import"font.css";body{padding-top:50px;padding-bottom:20px;font-family:"Roboto Condensed";}.body-content{padding-left:15px;padding-right:15px;}.dl-horizontal dt{white-space:normal;}input,select,textarea{max-width:280px;}.fullWidth{width:100%;}.text-white{color:#fff;}.text-gray{color:#696969;}.userCard{display:block;page-break-before:auto;page-break-inside:avoid;page-break-after:auto;}@page{margin:1cm;}@media print{.userCard{display:block;page-break-before:always;}}
\ No newline at end of file
diff --git a/MP-LAND/Content/fonts.css b/MP-LAND/Content/fonts.css
new file mode 100644
index 00000000..77b5c234
--- /dev/null
+++ b/MP-LAND/Content/fonts.css
@@ -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.woff2') format('woff2');
+}
+@font-face {
+ font-family: 'Roboto Condensed';
+ font-style: normal;
+ font-weight: 300;
+ src: url('RobotoCondensed.woff2') format('woff2');
+}
\ No newline at end of file
diff --git a/MP-LAND/Content/fonts.less b/MP-LAND/Content/fonts.less
new file mode 100644
index 00000000..1679aa26
--- /dev/null
+++ b/MP-LAND/Content/fonts.less
@@ -0,0 +1,27 @@
+@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.woff2') format('woff2');
+}
+
+@font-face {
+ font-family: 'Roboto Condensed';
+ font-style: normal;
+ font-weight: 300;
+ src: url('RobotoCondensed.woff2') format('woff2');
+}
diff --git a/MP-LAND/Content/fonts.min.css b/MP-LAND/Content/fonts.min.css
new file mode 100644
index 00000000..8b107467
--- /dev/null
+++ b/MP-LAND/Content/fonts.min.css
@@ -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.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');}
\ No newline at end of file
diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj
index 7f293d81..b801e672 100644
--- a/MP-LAND/MP-LAND.csproj
+++ b/MP-LAND/MP-LAND.csproj
@@ -304,6 +304,12 @@
+
+ fonts.less
+
+
+ fonts.css
+
@@ -359,6 +365,11 @@
+
+
+
+
+
diff --git a/MP-LAND/Views/Home/Index.cshtml b/MP-LAND/Views/Home/Index.cshtml
index 13cc6f7c..a52e66b9 100644
--- a/MP-LAND/Views/Home/Index.cshtml
+++ b/MP-LAND/Views/Home/Index.cshtml
@@ -6,11 +6,10 @@
MAPO - @ViewBag.Environment
Pannello di gestione della suite MAPO: l'integrazione di MES + SCADA + IOT + Gestione Commesse
-