diff --git a/MP-LAND/MP-LAND.csproj b/MP-LAND/MP-LAND.csproj
index 9c6a704d..8212b7bd 100644
--- a/MP-LAND/MP-LAND.csproj
+++ b/MP-LAND/MP-LAND.csproj
@@ -236,11 +236,11 @@
..\packages\WebGrease.1.6.0\lib\WebGrease.dll
True
-
- ..\packages\ZXing.Net.0.16.5\lib\net461\zxing.dll
+
+ ..\packages\ZXing.Net.0.16.6\lib\net461\zxing.dll
-
- ..\packages\ZXing.Net.0.16.5\lib\net461\zxing.presentation.dll
+
+ ..\packages\ZXing.Net.0.16.6\lib\net461\zxing.presentation.dll
diff --git a/MP-LAND/packages.config b/MP-LAND/packages.config
index 75f3ee45..073e39aa 100644
--- a/MP-LAND/packages.config
+++ b/MP-LAND/packages.config
@@ -64,5 +64,5 @@
-
+
\ No newline at end of file
diff --git a/MP-MON/Content/Site.css b/MP-MON/Content/Site.css
new file mode 100644
index 00000000..2a7b417e
--- /dev/null
+++ b/MP-MON/Content/Site.css
@@ -0,0 +1,253 @@
+/*Import fonts!*/
+@import url('fonts.min.css');
+/* Gestione blocchi base */
+body {
+ font-family: 'Open Sans', sans-serif;
+ background-color: #5d5d5d;
+ padding: 25px 0 20px 0;
+}
+body .ui-body-a,
+body .ui-body-c,
+body .ui-overlay-c {
+ text-shadow: 0 0 0;
+}
+.logoImg {
+ height: 40px;
+}
+/* Set padding to keep content from hitting the edges */
+.body-content {
+ padding: 0.1em 0.2em;
+ margin-top: 1.6em;
+}
+/* Override the default bootstrap behavior where horizontal description lists
+ will truncate terms that are too long to fit in the left column
+*/
+.dl-horizontal dt {
+ white-space: normal;
+}
+@media all and (min-width: 425px) {
+ .mainHead {
+ font-size: 1.3em;
+ }
+ body {
+ font-size: 0.8em;
+ }
+ .logoImg {
+ height: 30px;
+ }
+}
+@media all and (min-width: 768px) {
+ .mainHead {
+ font-size: 1.4em;
+ }
+ body {
+ font-size: 1em;
+ }
+ .logoImg {
+ height: 35px;
+ }
+}
+@media all and (min-width: 1024px) {
+ .mainHead {
+ font-size: 1.5em;
+ }
+ body {
+ font-size: 1.2em;
+ }
+ .logoImg {
+ height: 40px;
+ }
+}
+@media all and (min-width: 1440px) {
+ .mainHead {
+ font-size: 1.6em;
+ }
+ body {
+ font-size: 1.4em;
+ }
+ .logoImg {
+ height: 40px;
+ }
+}
+@media all and (min-width: 1600px) {
+ .mainHead {
+ font-size: 1.6em;
+ }
+ body {
+ font-size: 1.6em;
+ }
+ .logoImg {
+ height: 40px;
+ }
+}
+@media all and (min-width: 2000px) {
+ .mainHead {
+ font-size: 1.6em;
+ }
+ body {
+ font-size: 2.4em;
+ }
+ .logoImg {
+ height: 60px;
+ }
+}
+@media all and (min-width: 2600px) {
+ .mainHead {
+ font-size: 1.6em;
+ }
+ body {
+ font-size: 3.2em;
+ }
+ .logoImg {
+ height: 80px;
+ }
+}
+@media all and (max-width: 425px) {
+ .mainHead {
+ font-size: 1em;
+ }
+ body {
+ font-size: 0.7em;
+ }
+ .logoImg {
+ height: 25px;
+ }
+}
+/* Set width on the form input elements since they're 100% wide by default */
+input,
+select,
+textarea {
+ max-width: 280px;
+}
+.deleted {
+ text-decoration: line-through;
+}
+.padZL {
+ padding-left: 0.2em;
+}
+.padZR {
+ padding-right: 0.2em;
+}
+.padZRL {
+ padding-left: 0.2em;
+ padding-right: 0.2em;
+}
+.colAlt {
+ color: #C93;
+}
+.fontSmall {
+ font-size: 0.66em;
+}
+.fontSmaller {
+ font-size: 0.5em;
+}
+.fontBig {
+ font-size: 2em;
+}
+.tNote {
+ color: #8a8a8a;
+ font-style: italic;
+}
+.tNoWrap {
+ white-space: nowrap;
+}
+.navbar {
+ min-height: 0;
+ /*z-index: 0; // commentare quando in prod?!?*/
+ color: #696969;
+ background-color: #000;
+}
+/*------------------------------------------------------------------
+[ Shortcuts / .shortcuts ]
+*/
+.shortcuts {
+ text-align: center;
+}
+.shortcuts .shortcut {
+ min-width: 180px;
+ min-height: 100px;
+ display: inline-block;
+ padding: 13.33333333px 0;
+ margin: 0 2px 1em;
+ vertical-align: top;
+ text-decoration: none;
+ background: #F3F3F3;
+ background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee));
+ background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%);
+ background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%);
+ background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
+ border: 1px solid #ddd;
+ box-sizing: border-box;
+ border-radius: 10px;
+}
+.shortcuts .shortcut-sm {
+ min-width: 90px;
+ min-height: 60px;
+ display: inline-block;
+ padding: 5px 0;
+ margin: 0 2px 1em;
+ vertical-align: top;
+ text-decoration: none;
+ background: #F3F3F3;
+ background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee));
+ background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%);
+ background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%);
+ background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
+ border: 1px solid #ddd;
+ box-sizing: border-box;
+ border-radius: 10px;
+}
+.shortcuts .shortcut .shortcut-icon {
+ width: 100%;
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: 40px;
+ color: #333;
+}
+.shortcuts .shortcut-sm .shortcut-icon {
+ width: 100%;
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: 40px;
+ color: #333;
+}
+.shortcuts .shortcut:hover {
+ background: #E8E8E8;
+ background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
+ background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
+ background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
+ background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
+}
+.shortcuts .shortcut-sm:hover {
+ background: #E8E8E8;
+ background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
+ background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
+ background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
+ background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
+}
+.shortcuts .shortcut:active {
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+.shortcuts .shortcut-sm:active {
+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+}
+.shortcuts .shortcut:hover .shortcut-icon {
+ color: #C93;
+}
+.shortcuts .shortcut-sm:hover .shortcut-icon {
+ color: #666;
+}
+.shortcuts .shortcut-label {
+ display: block;
+ margin-top: 0.75em;
+ font-weight: 400;
+ color: #666;
+}
\ No newline at end of file
diff --git a/MP-MON/Content/Site.min.css b/MP-MON/Content/Site.min.css
new file mode 100644
index 00000000..161696a1
--- /dev/null
+++ b/MP-MON/Content/Site.min.css
@@ -0,0 +1 @@
+@import url('fonts.min.css');body{font-family:'Open Sans',sans-serif;background-color:#5d5d5d;padding:25px 0 20px 0;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.logoImg{height:40px;}.body-content{padding:.1em .2em;margin-top:1.6em;}.dl-horizontal dt{white-space:normal;}@media all and (min-width:425px){.mainHead{font-size:1.3em;}body{font-size:.8em;}.logoImg{height:30px;}}@media all and (min-width:768px){.mainHead{font-size:1.4em;}body{font-size:1em;}.logoImg{height:35px;}}@media all and (min-width:1024px){.mainHead{font-size:1.5em;}body{font-size:1.2em;}.logoImg{height:40px;}}@media all and (min-width:1440px){.mainHead{font-size:1.6em;}body{font-size:1.4em;}.logoImg{height:40px;}}@media all and (min-width:1600px){.mainHead{font-size:1.6em;}body{font-size:1.6em;}.logoImg{height:40px;}}@media all and (min-width:2000px){.mainHead{font-size:1.6em;}body{font-size:2.4em;}.logoImg{height:60px;}}@media all and (min-width:2600px){.mainHead{font-size:1.6em;}body{font-size:3.2em;}.logoImg{height:80px;}}@media all and (max-width:425px){.mainHead{font-size:1em;}body{font-size:.7em;}.logoImg{height:25px;}}input,select,textarea{max-width:280px;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontSmall{font-size:.66em;}.fontSmaller{font-size:.5em;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;background-color:#000;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:180px;min-height:100px;display:inline-block;padding:13.33333333px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:40px;color:#333;}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}
\ No newline at end of file
diff --git a/MP-MON/Content/baseStyle.css b/MP-MON/Content/baseStyle.css
new file mode 100644
index 00000000..568b0a95
--- /dev/null
+++ b/MP-MON/Content/baseStyle.css
@@ -0,0 +1,176 @@
+/*Import fonts!*/
+@import url('fonts.min.css');
+/* Gestione blocchi base */
+body {
+ font-family: 'Open Sans Condensed', sans-serif;
+ background-color: #5d5d5d;
+}
+body .ui-body-a,
+body .ui-body-c,
+body .ui-overlay-c {
+ text-shadow: 0 0 0;
+}
+/* END: gestione blocchi base */
+/* area semafori*/
+.semBlinkVe,
+.semFixVe,
+.semFixVe_b,
+.semVe,
+.semVe_b {
+ background: #009036;
+ background: rgba(0, 255, 80, 0.6);
+ color: #FFFFAA;
+}
+.semBlinkGr,
+.semFixGr,
+.semFixGr_b,
+.semGr,
+.semGr_b {
+ background-color: #bcbcbc;
+ background: rgba(180, 180, 180, 0.6);
+}
+.semGi {
+ text-align: left;
+ background: #8a8d27;
+ background: rgba(230, 210, 0, 0.6);
+ padding: 0px 4px 0px 4px;
+ color: #000;
+}
+.semGi_b,
+.semFixGi,
+.semFixGi_b {
+ text-align: left;
+ background: #f9ff18;
+ background: rgba(255, 255, 0, 0.8);
+ padding: 0px 4px 0px 4px;
+ color: #333;
+}
+.semBl {
+ text-align: left;
+ background: #000E7A;
+ background: rgba(0, 5, 200, 0.6);
+ padding: 0px 4px 0px 4px;
+ color: #959500;
+}
+.semBl_b,
+.semFixBl,
+.semFixBl_b {
+ text-align: left;
+ background: #243FFF;
+ background: rgba(60, 80, 255, 0.8);
+ padding: 0px 4px 0px 4px;
+ color: #ffff32;
+}
+.semRo {
+ text-align: left;
+ background-color: #7a000e;
+ background: rgba(200, 0, 5, 0.6);
+ padding: 0px 4px 0px 4px;
+ color: #959500;
+}
+.semRo_b,
+.semFixRo,
+.semFixRo_b {
+ text-align: left;
+ background-color: #ff243f;
+ background: rgba(255, 60, 80, 0.8);
+ padding: 0px 4px 0px 4px;
+ color: #ffff32;
+}
+/* semafori con animazione blinking */
+.no-cpu {
+ -moz-transform: translateZ(0);
+ -o-transform: translateZ(0);
+ -webkit-transform: translateZ(0);
+ -ms-transform: translateZ(0);
+ transform: translateZ(0);
+}
+@-webkit-keyframes blinkBack {
+ 0% {
+ background-position: 0% 50%;
+ }
+ 50% {
+ background-position: 100% 50%;
+ }
+ 100% {
+ background-position: 0% 50%;
+ }
+}
+@-moz-keyframes blinkBack {
+ 0% {
+ background-position: 0% 50%;
+ }
+ 50% {
+ background-position: 100% 50%;
+ }
+ 100% {
+ background-position: 0% 50%;
+ }
+}
+@-o-keyframes blinkBack {
+ 0% {
+ background-position: 0% 50%;
+ }
+ 50% {
+ background-position: 100% 50%;
+ }
+ 100% {
+ background-position: 0% 50%;
+ }
+}
+@keyframes blinkBack {
+ 0% {
+ background-position: 0% 50%;
+ }
+ 50% {
+ background-position: 100% 50%;
+ }
+ 100% {
+ background-position: 0% 50%;
+ }
+}
+.semBlinkGi {
+ background: linear-gradient(270deg, #8a8d27, #f9ff18);
+ background-size: 400% 400%;
+ -webkit-animation: blinkBack 2s ease infinite;
+ -moz-animation: blinkBack 2s ease infinite;
+ -o-animation: blinkBack 2s ease infinite;
+ animation: blinkBack 2s ease infinite;
+}
+.semBlinkRo {
+ background: linear-gradient(270deg, #7a000e, #ff243f);
+ background-size: 400% 400%;
+ -webkit-animation: blinkBack 2s ease infinite;
+ -moz-animation: blinkBack 2s ease infinite;
+ -o-animation: blinkBack 2s ease infinite;
+ animation: blinkBack 2s ease infinite;
+ color: Yellow;
+}
+/*end semafori */
+/* MAIN: gestione layout dinamico mappa... */
+/* A bit custom styling */
+.statusMap {
+ background: #222;
+}
+/* Link to the Google webfont is in the head */
+.statusMap .ui-title,
+.statusMap .ui-li-aside {
+ font-family: 'Open Sans Condensed', sans-serif;
+ font-weight: 800;
+ text-transform: uppercase;
+ font-size: 2.5em;
+ line-height: 1.1em;
+ color: #DEDEDE;
+ text-shadow: 2px 2px 4px #000;
+ text-align: center;
+ background: linear-gradient(270deg, rgba(20, 20, 20, 0.7), rgba(100, 100, 100, 0.7), rgba(20, 20, 20, 0.7));
+}
+.statusMap .ui-art {
+ font-family: 'Open Sans Condensed', sans-serif;
+}
+.statusMap .ui-footer {
+ font-family: 'Open Sans Condensed', sans-serif;
+ color: #CDCDCD;
+ background: linear-gradient(270deg, rgba(10, 10, 10, 0.7), rgba(80, 80, 80, 0.7), rgba(10, 10, 10, 0.7));
+}
+/* END: gestione layout dinamico mappa... */
\ No newline at end of file
diff --git a/MP-MON/Content/baseStyle.min.css b/MP-MON/Content/baseStyle.min.css
new file mode 100644
index 00000000..e7cc44e4
--- /dev/null
+++ b/MP-MON/Content/baseStyle.min.css
@@ -0,0 +1 @@
+@import url('fonts.min.css');body{font-family:'Open Sans Condensed',sans-serif;background-color:#5d5d5d;}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.semBlinkVe,.semFixVe,.semFixVe_b,.semVe,.semVe_b{background:#009036;background:rgba(0,255,80,.6);color:#ffa;}.semBlinkGr,.semFixGr,.semFixGr_b,.semGr,.semGr_b{background-color:#bcbcbc;background:rgba(180,180,180,.6);}.semGi{text-align:left;background:#8a8d27;background:rgba(230,210,0,.6);padding:0 4px 0 4px;color:#000;}.semGi_b,.semFixGi,.semFixGi_b{text-align:left;background:#f9ff18;background:rgba(255,255,0,.8);padding:0 4px 0 4px;color:#333;}.semBl{text-align:left;background:#000e7a;background:rgba(0,5,200,.6);padding:0 4px 0 4px;color:#959500;}.semBl_b,.semFixBl,.semFixBl_b{text-align:left;background:#243fff;background:rgba(60,80,255,.8);padding:0 4px 0 4px;color:#ffff32;}.semRo{text-align:left;background-color:#7a000e;background:rgba(200,0,5,.6);padding:0 4px 0 4px;color:#959500;}.semRo_b,.semFixRo,.semFixRo_b{text-align:left;background-color:#ff243f;background:rgba(255,60,80,.8);padding:0 4px 0 4px;color:#ffff32;}.no-cpu{-moz-transform:translateZ(0);-o-transform:translateZ(0);-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);}@-webkit-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-moz-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@-o-keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}@keyframes blinkBack{0%{background-position:0% 50%;}50%{background-position:100% 50%;}100%{background-position:0% 50%;}}.semBlinkGi{background:linear-gradient(270deg,#8a8d27,#f9ff18);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;}.semBlinkRo{background:linear-gradient(270deg,#7a000e,#ff243f);background-size:400% 400%;-webkit-animation:blinkBack 2s ease infinite;-moz-animation:blinkBack 2s ease infinite;-o-animation:blinkBack 2s ease infinite;animation:blinkBack 2s ease infinite;color:#ff0;}.statusMap{background:#222;}.statusMap .ui-title,.statusMap .ui-li-aside{font-family:'Open Sans Condensed',sans-serif;font-weight:800;text-transform:uppercase;font-size:2.5em;line-height:1.1em;color:#dedede;text-shadow:2px 2px 4px #000;text-align:center;background:linear-gradient(270deg,rgba(20,20,20,.7),rgba(100,100,100,.7),rgba(20,20,20,.7));}.statusMap .ui-art{font-family:'Open Sans Condensed',sans-serif;}.statusMap .ui-footer{font-family:'Open Sans Condensed',sans-serif;color:#cdcdcd;background:linear-gradient(270deg,rgba(10,10,10,.7),rgba(80,80,80,.7),rgba(10,10,10,.7));}
\ No newline at end of file
diff --git a/MP-MON/Content/fonts.css b/MP-MON/Content/fonts.css
new file mode 100644
index 00000000..acdc1bad
--- /dev/null
+++ b/MP-MON/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/MP-MON/Content/fonts.min.css b/MP-MON/Content/fonts.min.css
new file mode 100644
index 00000000..27ca6bc1
--- /dev/null
+++ b/MP-MON/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/MP-MON/MP-MON.csproj b/MP-MON/MP-MON.csproj
index 319abc4e..8f6ac4bf 100644
--- a/MP-MON/MP-MON.csproj
+++ b/MP-MON/MP-MON.csproj
@@ -343,10 +343,6 @@
-
-
- compilerconfig.json
-
PreserveNewest
@@ -363,6 +359,10 @@
+
+
+ compilerconfig.json
+
EntityModelCodeGenerator
@@ -671,11 +671,9 @@
-
-
\ No newline at end of file
diff --git a/MP-MON/compilerconfig.json b/MP-MON/compilerconfig.json
index d29ff5c5..58b496a2 100644
--- a/MP-MON/compilerconfig.json
+++ b/MP-MON/compilerconfig.json
@@ -1,13 +1,14 @@
-[{
- "outputFile": "Content/fonts.css",
- "inputFile": "Content/fonts.less"
- },
- {
- "outputFile": "Content/baseStyle.css",
- "inputFile": "Content/baseStyle.less"
- },
- {
- "outputFile": "Content/Site.css",
- "inputFile": "Content/Site.less"
- }
+[
+ {
+ "outputFile": "Content/baseStyle.css",
+ "inputFile": "Content/baseStyle.less"
+ },
+ {
+ "outputFile": "Content/fonts.css",
+ "inputFile": "Content/fonts.less"
+ },
+ {
+ "outputFile": "Content/Site.css",
+ "inputFile": "Content/Site.less"
+ }
]
\ No newline at end of file
diff --git a/MP-MON/compilerconfig.json.defaults b/MP-MON/compilerconfig.json.defaults
index c75eb7d5..b3519312 100644
--- a/MP-MON/compilerconfig.json.defaults
+++ b/MP-MON/compilerconfig.json.defaults
@@ -13,6 +13,7 @@
"sourceMap": false
},
"sass": {
+ "autoPrefix": "",
"includePath": "",
"indentType": "space",
"indentWidth": 2,
@@ -20,6 +21,7 @@
"Precision": 5,
"relativeUrls": true,
"sourceMapRoot": "",
+ "lineFeed": "",
"sourceMap": false
},
"stylus": {
@@ -32,6 +34,18 @@
"bare": false,
"runtimeMode": "node",
"sourceMap": false
+ },
+ "handlebars": {
+ "root": "",
+ "noBOM": false,
+ "name": "",
+ "namespace": "",
+ "knownHelpersOnly": false,
+ "forcePartial": false,
+ "knownHelpers": [],
+ "commonjs": "",
+ "amd": false,
+ "sourceMap": false
}
},
"minifiers": {
diff --git a/MP-MON/packages.config b/MP-MON/packages.config
index 0460c74f..a982ec9b 100644
--- a/MP-MON/packages.config
+++ b/MP-MON/packages.config
@@ -4,7 +4,6 @@
-