diff --git a/MP-MAG/Content/Site.css b/MP-MAG/Content/Site.css index b0ab23f8..64afd137 100644 --- a/MP-MAG/Content/Site.css +++ b/MP-MAG/Content/Site.css @@ -153,11 +153,11 @@ body { } .shortcuts .shortcut { color: black; - min-width: 10.5rem; - min-height: 6rem; + min-width: 8.4rem; + min-height: 5.04rem; display: inline-block; - padding: 1rem 0; - margin: 0 2px 1em; + padding: 0.46666667rem 0; + margin: 0 0.1em 0.5em 0.1em; vertical-align: top; text-decoration: none; background: #F3F3F3; @@ -169,14 +169,15 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 0.75rem; + border-radius: 0.7rem; + font-size: 0.85rem; } .shortcuts .shortcut-sm { color: black; - min-width: 6.75rem; - min-height: 4.5rem; + min-width: 6.3rem; + min-height: 3.36rem; display: inline-block; - padding: 0.375rem 0; + padding: 0.35rem 0; margin: 0 2px 1em; vertical-align: top; text-decoration: none; @@ -189,20 +190,20 @@ body { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0); border: 1px solid #ddd; box-sizing: border-box; - border-radius: 0.75rem; + border-radius: 0.7rem; } .shortcuts .shortcut .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 3rem; + font-size: 2.8rem; color: #333; } .shortcuts .shortcut-sm .shortcut-icon { width: 100%; margin-top: 0; margin-bottom: 0; - font-size: 3rem; + font-size: 2.8rem; color: #333; } .shortcuts .shortcut:hover { diff --git a/MP-MAG/Content/Site.less b/MP-MAG/Content/Site.less index 405810dd..3e9774fb 100644 --- a/MP-MAG/Content/Site.less +++ b/MP-MAG/Content/Site.less @@ -183,7 +183,7 @@ body { [ Shortcuts / .shortcuts ] */ -@blSCut: 1.5rem; +@blSCut: 1.4rem; .shortcuts { text-align: center; @@ -191,11 +191,11 @@ body { .shortcuts .shortcut { color: black; - min-width: (@blSCut * 7); - min-height: (@blSCut * 4); + min-width: (@blSCut * 6); + min-height: (@blSCut * 3.6); display: inline-block; - padding: (@blSCut * 2 / 3) 0; - margin: 0 2px 1em; + padding: (@blSCut / 3) 0; + margin: 0 0.1em 0.5em 0.1em; vertical-align: top; text-decoration: none; background: #F3F3F3; @@ -208,12 +208,13 @@ body { border: 1px solid #ddd; box-sizing: border-box; border-radius: (@blSCut / 2); + font-size: 0.85rem; } .shortcuts .shortcut-sm { color: black; min-width: (@blSCut * 4.5); - min-height: (@blSCut * 3); + min-height: (@blSCut * 2.4); display: inline-block; padding: (@blSCut / 4) 0; margin: 0 2px 1em; diff --git a/MP-MAG/Content/Site.min.css b/MP-MAG/Content/Site.min.css index aca5c2b8..913b3306 100644 --- a/MP-MAG/Content/Site.min.css +++ b/MP-MAG/Content/Site.min.css @@ -1 +1 @@ -body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.5em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px !important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{color:#000;min-width:10.5rem;min-height:6rem;display:inline-block;padding:1rem 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:.75rem;}.shortcuts .shortcut-sm{color:#000;min-width:6.75rem;min-height:4.5rem;display:inline-block;padding:.375rem 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:.75rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:3rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',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;} \ No newline at end of file +body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.5em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px!important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{color:#000;min-width:8.4rem;min-height:5.04rem;display:inline-block;padding:.46666667rem 0;margin:0 .1em .5em .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:.7rem;font-size:.85rem;}.shortcuts .shortcut-sm{color:#000;min-width:6.3rem;min-height:3.36rem;display:inline-block;padding:.35rem 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:.7rem;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2.8rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2.8rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#696969));background-image:-webkit-linear-gradient(top,#fafafa,0%,#696969,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#696969 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#696969 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ff696969',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;} \ No newline at end of file diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index 9c4a6cfb..21611e14 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -775,7 +775,7 @@ - site.less + Site.less Site.css @@ -1090,7 +1090,7 @@ Web.config - + diff --git a/MP-MAG/SMART/SmartStarter.aspx b/MP-MAG/SMART/SmartStarter.aspx index ad5853a9..abd0682b 100644 --- a/MP-MAG/SMART/SmartStarter.aspx +++ b/MP-MAG/SMART/SmartStarter.aspx @@ -10,13 +10,25 @@
-
Link per accesso diretto tramite lettore portatile:
-
    -
  • Aprire browser
  • -
  • Selezionare la barra indirizzi
  • -
  • Leggere il codice QR
  • -
  • Dalla pagina caricata leggere poi il QR della PackList che si vuole completare dalla gestione pedane
  • -
+
+
+

+ +

+
+
+
    +
  • Aprire browser
  • +
  • Selezionare la barra indirizzi
  • +
  • Leggere il codice QR
  • +
  • Dalla pagina caricata leggere poi il QR della PackList che si vuole completare dalla gestione pedane
  • +
+
+
+
+
diff --git a/MP-MAG/SMART/SmartStarter.aspx.designer.cs b/MP-MAG/SMART/SmartStarter.aspx.designer.cs index 8567fc64..aaaca442 100644 --- a/MP-MAG/SMART/SmartStarter.aspx.designer.cs +++ b/MP-MAG/SMART/SmartStarter.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// Codice generato da uno strumento. +// +// This code was generated by a tool. // -// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se -// il codice viene rigenerato. -// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// //------------------------------------------------------------------------------ namespace MP_MAG.SMART @@ -15,11 +15,11 @@ namespace MP_MAG.SMART { /// - /// Controllo imgQrMain. + /// imgQrMain control. /// /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.Image imgQrMain; } diff --git a/MP-MAG/SMART/menu.aspx b/MP-MAG/SMART/menu.aspx index d0183ee6..106b3500 100644 --- a/MP-MAG/SMART/menu.aspx +++ b/MP-MAG/SMART/menu.aspx @@ -2,7 +2,7 @@
-
+

Modulo Magazzino

Gestione Lotti, stampa etichette UDC prodotti, Anagrafiche Logistiche
diff --git a/MP-MAG/Site.Master b/MP-MAG/Site.Master index bc9d4a06..21a51fbc 100644 --- a/MP-MAG/Site.Master +++ b/MP-MAG/Site.Master @@ -77,7 +77,7 @@ - <%--<%: Scripts.Render("~/bundles/bootstrap") %>--%> - + + diff --git a/MP-MAG/WebUserControls/cmp_menuTop.ascx b/MP-MAG/WebUserControls/cmp_menuTop.ascx index f51806c3..09763a32 100644 --- a/MP-MAG/WebUserControls/cmp_menuTop.ascx +++ b/MP-MAG/WebUserControls/cmp_menuTop.ascx @@ -45,7 +45,7 @@  Spedizioni -
+
Search