diff --git a/Jenkinsfile b/Jenkinsfile index df4e00d..5da8241 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=369']) { + withEnv(['NEXT_BUILD_NUMBER=370']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'B2BCONDOMINI' diff --git a/PUB/Content/OpenSans.woff b/PUB/Content/OpenSans.woff new file mode 100644 index 0000000..55b25f8 Binary files /dev/null and b/PUB/Content/OpenSans.woff differ diff --git a/PUB/Content/OpenSansCondensed.woff b/PUB/Content/OpenSansCondensed.woff new file mode 100644 index 0000000..aedbd93 Binary files /dev/null and b/PUB/Content/OpenSansCondensed.woff differ diff --git a/PUB/Content/RobotoCondensed.woff2 b/PUB/Content/RobotoCondensed.woff2 new file mode 100644 index 0000000..e90965b Binary files /dev/null and b/PUB/Content/RobotoCondensed.woff2 differ diff --git a/PUB/Content/RobotoCondensedExt.woff2 b/PUB/Content/RobotoCondensedExt.woff2 new file mode 100644 index 0000000..4cf1ad3 Binary files /dev/null and b/PUB/Content/RobotoCondensedExt.woff2 differ diff --git a/PUB/Content/Site.css b/PUB/Content/Site.css index cc4f0a1..79e989e 100644 --- a/PUB/Content/Site.css +++ b/PUB/Content/Site.css @@ -1,5 +1,8 @@ -/* Move down content because we have a fixed navbar that is 50px tall */ +/*Import fonts!*/ +@import url('fonts.min.css'); +/* Move down content because we have a fixed navbar that is 50px tall */ body { + font-family: 'Roboto', sans-serif; padding-top: 50px; padding-bottom: 20px; background: url('../images/Condomini_01.jpeg') no-repeat center center fixed; @@ -15,6 +18,9 @@ body { padding-right: 15px; font-size: 0.7em; } +.fontCond { + font-family: 'Roboto Condensed', sans-serif; +} /* gestione icone */ .icona { font-size: 2em; @@ -76,7 +82,7 @@ body { } .table th, .table td { - padding: 0.10rem; + padding: 0.1rem; } /* Responsive: Portrait tablets and up */ @media screen and (min-width: 426px) { @@ -118,7 +124,7 @@ body { } .table th, .table td { - padding: 0.20rem; + padding: 0.2rem; } } @media screen and (min-width: 1024px) { @@ -141,18 +147,18 @@ body { @media screen and (min-width: 1366px) { .body-content { padding: 0; - font-size: 1.0em; + font-size: 1em; } .navbar-nav, .nav-footer { - font-size: 1.0em; + font-size: 1em; } .status-row-text { font-size: 0.8em; } .table th, .table td { - padding: 0.30rem; + padding: 0.3rem; } } @media screen and (min-width: 1440px) { @@ -182,10 +188,10 @@ body { font-size: 1.2em; } .status-row-text { - font-size: 1.0em; + font-size: 1em; } .table th, .table td { - padding: 0.40rem; + padding: 0.4rem; } } \ No newline at end of file diff --git a/PUB/Content/Site.less b/PUB/Content/Site.less index 0de2a71..f6d208b 100644 --- a/PUB/Content/Site.less +++ b/PUB/Content/Site.less @@ -1,5 +1,9 @@ -/* Move down content because we have a fixed navbar that is 50px tall */ +/*Import fonts!*/ +@import url('./fonts.min.css'); + +/* Move down content because we have a fixed navbar that is 50px tall */ body { + font-family: 'Roboto', sans-serif; padding-top: 50px; padding-bottom: 20px; background: url('../images/Condomini_01.jpeg') no-repeat center center fixed; @@ -17,6 +21,10 @@ body { font-size: 0.7em; } +.fontCond { + font-family: 'Roboto Condensed', sans-serif; +} + /* gestione icone */ .icona { font-size: 2em; diff --git a/PUB/Content/Site.min.css b/PUB/Content/Site.min.css index 3643452..212d444 100644 --- a/PUB/Content/Site.min.css +++ b/PUB/Content/Site.min.css @@ -1 +1 @@ -body{padding-top:50px;padding-bottom:20px;background:url('../images/Condomini_01.jpeg') no-repeat center center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;}.body-content{padding-left:15px;padding-right:15px;font-size:.7em;}.icona{font-size:2em;}.titolo{font-size:1.2em;font-weight:bold;}.bs4-aspnet-pager a,.bs4-aspnet-pager span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd;}.bs4-aspnet-pager span{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7;}.bs4-aspnet-pager tr>td:first-child>a,.bs4-aspnet-pager tr>td:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px;}.bs4-aspnet-pager tr>td:last-child>a,.bs4-aspnet-pager tr>td:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px;}.bs4-aspnet-pager a:hover,.bs4-aspnet-pager span:hover,.bs4-aspnet-pager a:focus,.bs4-aspnet-pager span:focus{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd;}.bs4-aspnet-pager td{padding:0;}.status-row-text{font-size:.5em;}.nav-footer{font-size:.4em;}.table th,.table td{padding:.1rem;}@media screen and (min-width:426px){.jumbotron{margin-top:20px;}.body-content{padding:0;font-size:.7em;}.navbar-nav{font-size:.7em;}.nav-footer{font-size:.6em;}.status-row-text{font-size:.55em;}.table th,.table td{padding:.15rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;font-size:.8em;}.navbar-nav,.nav-footer{font-size:.8em;}.status-row-text{font-size:.6em;}.table th,.table td{padding:.2rem;}}@media screen and (min-width:1024px){.body-content{padding:0;font-size:.9em;}.navbar-nav,.nav-footer{font-size:.9em;}.status-row-text{font-size:.7em;}.table th,.table td{padding:.25rem;}}@media screen and (min-width:1366px){.body-content{padding:0;font-size:1em;}.navbar-nav,.nav-footer{font-size:1em;}.status-row-text{font-size:.8em;}.table th,.table td{padding:.3rem;}}@media screen and (min-width:1440px){.body-content{padding:0;font-size:1.1em;}.navbar-nav,.nav-footer{font-size:1.1em;}.status-row-text{font-size:.9em;}.table th,.table td{padding:.35rem;}}@media screen and (min-width:1920px){.body-content{padding:0;font-size:1.2em;}.navbar-nav,.nav-footer{font-size:1.2em;}.status-row-text{font-size:1em;}.table th,.table td{padding:.4rem;}} \ No newline at end of file +@import url('fonts.min.css');body{font-family:'Roboto',sans-serif;padding-top:50px;padding-bottom:20px;background:url('../images/Condomini_01.jpeg') no-repeat center center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover;}.body-content{padding-left:15px;padding-right:15px;font-size:.7em;}.fontCond{font-family:'Roboto Condensed',sans-serif;}.icona{font-size:2em;}.titolo{font-size:1.2em;font-weight:bold;}.bs4-aspnet-pager a,.bs4-aspnet-pager span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd;}.bs4-aspnet-pager span{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7;}.bs4-aspnet-pager tr>td:first-child>a,.bs4-aspnet-pager tr>td:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px;}.bs4-aspnet-pager tr>td:last-child>a,.bs4-aspnet-pager tr>td:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px;}.bs4-aspnet-pager a:hover,.bs4-aspnet-pager span:hover,.bs4-aspnet-pager a:focus,.bs4-aspnet-pager span:focus{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd;}.bs4-aspnet-pager td{padding:0;}.status-row-text{font-size:.5em;}.nav-footer{font-size:.4em;}.table th,.table td{padding:.1rem;}@media screen and (min-width:426px){.jumbotron{margin-top:20px;}.body-content{padding:0;font-size:.7em;}.navbar-nav{font-size:.7em;}.nav-footer{font-size:.6em;}.status-row-text{font-size:.55em;}.table th,.table td{padding:.15rem;}}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;font-size:.8em;}.navbar-nav,.nav-footer{font-size:.8em;}.status-row-text{font-size:.6em;}.table th,.table td{padding:.2rem;}}@media screen and (min-width:1024px){.body-content{padding:0;font-size:.9em;}.navbar-nav,.nav-footer{font-size:.9em;}.status-row-text{font-size:.7em;}.table th,.table td{padding:.25rem;}}@media screen and (min-width:1366px){.body-content{padding:0;font-size:1em;}.navbar-nav,.nav-footer{font-size:1em;}.status-row-text{font-size:.8em;}.table th,.table td{padding:.3rem;}}@media screen and (min-width:1440px){.body-content{padding:0;font-size:1.1em;}.navbar-nav,.nav-footer{font-size:1.1em;}.status-row-text{font-size:.9em;}.table th,.table td{padding:.35rem;}}@media screen and (min-width:1920px){.body-content{padding:0;font-size:1.2em;}.navbar-nav,.nav-footer{font-size:1.2em;}.status-row-text{font-size:1em;}.table th,.table td{padding:.4rem;}} \ No newline at end of file diff --git a/PUB/Content/fonts.css b/PUB/Content/fonts.css new file mode 100644 index 0000000..acdc1ba --- /dev/null +++ b/PUB/Content/fonts.css @@ -0,0 +1,28 @@ +@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'); +} +/* latin-ext */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('RobotoCondensedExt.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('RobotoCondensed.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215; +} \ No newline at end of file diff --git a/PUB/Content/fonts.less b/PUB/Content/fonts.less new file mode 100644 index 0000000..55b0827 --- /dev/null +++ b/PUB/Content/fonts.less @@ -0,0 +1,29 @@ +@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'); +} +/* latin-ext */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('RobotoCondensedExt.woff2') format('woff2'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+20A0-20AB, U+20AD-20CF, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto Condensed'; + font-style: normal; + font-weight: 400; + src: url('RobotoCondensed.woff2') format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2212, U+2215; +} \ No newline at end of file diff --git a/PUB/Content/fonts.min.css b/PUB/Content/fonts.min.css new file mode 100644 index 0000000..27ca6bc --- /dev/null +++ b/PUB/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 Condensed';font-style:normal;font-weight:400;src:url('RobotoCondensedExt.woff2') format('woff2');unicode-range:U+100-24F,U+259,U+1E00-1EFF,U+20A0-20AB,U+20AD-20CF,U+2C60-2C7F,U+A720-A7FF;}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;src:url('RobotoCondensed.woff2') format('woff2');unicode-range:U+0-FF,U+131,U+152-153,U+2BB-2BC,U+2C6,U+2DA,U+2DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2212,U+2215;} \ No newline at end of file diff --git a/PUB/PUB.csproj b/PUB/PUB.csproj index d612014..3fa1871 100644 --- a/PUB/PUB.csproj +++ b/PUB/PUB.csproj @@ -168,6 +168,17 @@ + + fonts.less + + + + fonts.css + + + + + diff --git a/PUB/Web.config b/PUB/Web.config index c260128..7eab7c7 100644 --- a/PUB/Web.config +++ b/PUB/Web.config @@ -91,12 +91,16 @@ - - + + + + + - + + @@ -147,20 +151,31 @@ + + + + + + + + - - - + + + + + - + - + + @@ -173,7 +188,7 @@ - --> + --> @@ -181,10 +196,10 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/PUB/WebUserContols/mod_statusRowPAM.ascx b/PUB/WebUserContols/mod_statusRowPAM.ascx index 5a9b577..a8e6b5d 100644 --- a/PUB/WebUserContols/mod_statusRowPAM.ascx +++ b/PUB/WebUserContols/mod_statusRowPAM.ascx @@ -7,7 +7,7 @@
-
+
Dashboard amministratore
diff --git a/PUB/WebUserContols/mod_statusRowPAZ.ascx b/PUB/WebUserContols/mod_statusRowPAZ.ascx index 09252af..3120543 100644 --- a/PUB/WebUserContols/mod_statusRowPAZ.ascx +++ b/PUB/WebUserContols/mod_statusRowPAZ.ascx @@ -7,7 +7,7 @@
-
+
Dashboard fornitore
diff --git a/PUB/WebUserContols/mod_statusRowPBO.ascx b/PUB/WebUserContols/mod_statusRowPBO.ascx index 24dd280..0450df6 100644 --- a/PUB/WebUserContols/mod_statusRowPBO.ascx +++ b/PUB/WebUserContols/mod_statusRowPBO.ascx @@ -1,13 +1,13 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_statusRowPBO.ascx.cs" Inherits="PUB.WebUserContols.mod_statusRowPBO" %> -
+
-
+
Dashboard BackOffice
@@ -100,9 +100,7 @@
-
-
-
+
@@ -117,9 +115,7 @@
- -
-
+
@@ -133,9 +129,7 @@
- -
-
+
@@ -149,9 +143,7 @@
- -
-
+
@@ -165,9 +157,7 @@
- -
-
+
@@ -182,11 +172,7 @@
- -
- - - +
diff --git a/PUB/compilerconfig.json b/PUB/compilerconfig.json index 81a6a34..702fda2 100644 --- a/PUB/compilerconfig.json +++ b/PUB/compilerconfig.json @@ -2,5 +2,9 @@ { "outputFile": "Content/Site.css", "inputFile": "Content/Site.less" + }, + { + "outputFile": "Content/fonts.css", + "inputFile": "Content/fonts.less" } ] \ No newline at end of file