diff --git a/GPW_Smart/Content/Site.css b/GPW_Smart/Content/Site.css index c68c8d7..06c1667 100644 --- a/GPW_Smart/Content/Site.css +++ b/GPW_Smart/Content/Site.css @@ -1,6 +1,6 @@ /* Move down content because we have a fixed navbar that is 50px tall */ body { - font-family: 'Roboto Condensed', sans-serif; + font-family: 'Open Sans', sans-serif; padding-top: 50px; padding-bottom: 20px; } @@ -16,13 +16,19 @@ select, textarea { max-width: 280px; } +.bg-abstract { + background: url("../images/AbstractDownload.jpg"); + background-repeat: no-repeat; + background-size: cover; + /*border-image-repeat:stretch;*/ +} /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { .jumbotron { margin-top: 20px; } - .body-content { - padding: 0; + body { + font-size: 1.6rem; } /* Set widths on the form inputs since otherwise they're 100% wide */ input, diff --git a/GPW_Smart/Content/Site.less b/GPW_Smart/Content/Site.less index bbf0bf0..26a869a 100644 --- a/GPW_Smart/Content/Site.less +++ b/GPW_Smart/Content/Site.less @@ -20,7 +20,9 @@ textarea { } .bg-abstract { - background-image: url("../images/AbstractDownload.jpg"); + background: url("../images/AbstractDownload.jpg"); + background-repeat: no-repeat; + background-size: cover; /*border-image-repeat:stretch;*/ } @@ -30,8 +32,8 @@ textarea { margin-top: 20px; } - .body-content { - padding: 0; + body { + font-size: 1.6rem; } /* Set widths on the form inputs since otherwise they're 100% wide */ diff --git a/GPW_Smart/Content/Site.min.css b/GPW_Smart/Content/Site.min.css index a0913c1..de19973 100644 --- a/GPW_Smart/Content/Site.min.css +++ b/GPW_Smart/Content/Site.min.css @@ -1 +1 @@ -body{font-family:'Open Sans',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:280px;}.bg-abstract{background-image:url("../images/AbstractDownload.jpg");}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:.1rem !important;margin:.1rem !important;}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;} \ No newline at end of file +body{font-family:'Open Sans',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}input,select,textarea{max-width:280px;}.bg-abstract{background:url("../images/AbstractDownload.jpg");background-repeat:no-repeat;background-size:cover;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}body{font-size:1.6rem;}input,select,textarea{max-width:100%;}}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:.1rem !important;margin:.1rem !important;}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;} \ No newline at end of file diff --git a/GPW_Smart/Reset.aspx.cs b/GPW_Smart/Reset.aspx.cs index a16f3f5..25ec140 100644 --- a/GPW_Smart/Reset.aspx.cs +++ b/GPW_Smart/Reset.aspx.cs @@ -97,7 +97,6 @@ namespace GPW_Smart } } lblOut.Text = testo; -#if false if (nextPage != "") { logger.lg.scriviLog(string.Format("Reset {0} OK: redirect a pag {1}", action, nextPage), tipoLog.INFO); @@ -113,9 +112,6 @@ namespace GPW_Smart logger.lg.scriviLog(string.Format("Reset {0} OK: redirect a pag {1}", action, "Default"), tipoLog.INFO); Response.Redirect("Default"); } -#endif - logger.lg.scriviLog(string.Format("Reset {0} OK: redirect a pag {1}", action, "Default"), tipoLog.INFO); - Response.Redirect("Default"); } } } \ No newline at end of file diff --git a/GPW_Smart/Site.Master b/GPW_Smart/Site.Master index 4a3f4ac..0408971 100644 --- a/GPW_Smart/Site.Master +++ b/GPW_Smart/Site.Master @@ -1,4 +1,4 @@ -<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="GPW_Smart.Site" %> + <%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="GPW_Smart.Site" %> <%@ Register Src="~/WebUserControls/cmp_footer.ascx" TagPrefix="uc1" TagName="cmp_footer" %>