diff --git a/ScheMe-SP/Bootstrap.Master b/ScheMe-SP/Bootstrap.Master index 2a185ab..4791502 100644 --- a/ScheMe-SP/Bootstrap.Master +++ b/ScheMe-SP/Bootstrap.Master @@ -70,19 +70,9 @@ diff --git a/ScheMe-SP/Bootstrap.Master.cs b/ScheMe-SP/Bootstrap.Master.cs index ac5d875..7a70468 100644 --- a/ScheMe-SP/Bootstrap.Master.cs +++ b/ScheMe-SP/Bootstrap.Master.cs @@ -11,10 +11,6 @@ namespace ScheMe { protected void Page_Load(object sender, EventArgs e) { - if (!Page.IsPostBack) - { - lblVers.Text = string.Format("v.{0}", System.Reflection.Assembly.GetExecutingAssembly().GetName().Version); - } } public void doUpdate() diff --git a/ScheMe-SP/Bootstrap.Master.designer.cs b/ScheMe-SP/Bootstrap.Master.designer.cs index bb18278..647c72c 100644 --- a/ScheMe-SP/Bootstrap.Master.designer.cs +++ b/ScheMe-SP/Bootstrap.Master.designer.cs @@ -102,24 +102,6 @@ namespace ScheMe { /// protected global::ScheMe.WebUserControls.mod_bottom mod_bottom; - /// - /// Controllo lblVers. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Label lblVers; - - /// - /// Controllo logoSW. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.Image logoSW; - /// /// Controllo PlaceHolder2. /// diff --git a/ScheMe-SP/Content/Style.css b/ScheMe-SP/Content/Style.css index fa99a6e..0595eac 100644 --- a/ScheMe-SP/Content/Style.css +++ b/ScheMe-SP/Content/Style.css @@ -8,6 +8,16 @@ min-height: 2.2em; font-size: 1.2em; } +.navbar-nav { + display: table; + width: 100%; + margin: 0; +} +.navbar-nav > li { + float: none; + display: table-cell; + text-align: center; +} /* punteggi colore */ .VVF-CL-01 { color: #006600; @@ -34,7 +44,6 @@ } .headerRow { background-color: #EEEEEE; - font-weight: 600; color: black; } .text-center { diff --git a/ScheMe-SP/Content/Style.less b/ScheMe-SP/Content/Style.less index 11fa857..70e2704 100644 --- a/ScheMe-SP/Content/Style.less +++ b/ScheMe-SP/Content/Style.less @@ -21,6 +21,18 @@ font-size: 1.2em; } +.navbar-nav { + display: table; + width: 100%; + margin: 0; +} + + .navbar-nav > li { + float: none; + display: table-cell; + text-align: center; + } + /* punteggi colore */ .VVF-CL-01 { color: #006600; @@ -53,7 +65,6 @@ .headerRow { background-color: @headerCol; - font-weight: 600; color: black; } diff --git a/ScheMe-SP/Content/Style.min.css b/ScheMe-SP/Content/Style.min.css index 5265a14..c6878dd 100644 --- a/ScheMe-SP/Content/Style.min.css +++ b/ScheMe-SP/Content/Style.min.css @@ -1 +1 @@ -.uppercase{text-transform:uppercase}.bigBtn{min-height:2.2em;font-size:1.2em}.VVF-CL-01{color:#060;background-color:#fff}.VVF-CL-02{color:#ff3;background-color:#22f}.VVF-CL-03{color:#ff3;background-color:#181}.VVF-CL-04{background-color:#ff1}.VVF-CL-05{color:#ff3;background-color:#e62}.VVF-CL-06{color:#ff1;background-color:#ff0c0c}.headerRow{background-color:#eee;font-weight:600;color:#000}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.errore{color:#f00}.headLine{background-color:#f83;color:#fff}.hBlock{background-color:#d7d7d7;color:#000}.hBlockDrk{background-color:#585858;color:#fff}.fBlock{background-color:#f2f2f2;color:#000}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#f83;font-weight:600;color:#fff}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#ffa567;font-weight:600;color:#333}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef}.RowStyle{background-color:#fbf3ef;text-align:left}.rowStyle{background-color:#fbf3ef}.editRowStyle{background-color:#cf6124}.selectedRowStyle{background-color:#f1ccc1;font-weight:bold;Color:#f63}.alternatingRowStyle{background-color:#fff}.footerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff}.headerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff}.spacedRow{line-height:3em}.baseRow{background-color:#fbf3ef}.altRow{background-color:#fff}.editRow{background-color:#cf6124}.selectedRow{background-color:#ffa567;font-weight:600;color:#333}.headerHighlight{background-color:#f83;font-weight:600;color:#fff}.footerRow{background-color:#f83;font-weight:600;color:#fff}.pagerRow{background-color:#cf6124;color:#fff;text-align:center;margin:auto}.stortAscCellStyle{background-color:#f5f7fb}.stortAscHeadStyle{background-color:#6d95e1}.stortDescCellStyle{background-color:#e9ebef}.stortDescHeadStyle{background-color:#4870be}.GridPager{background-color:#ff7c50}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#cf6124}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold}.imgNoPad{margin-top:-3px;margin-bottom:-7px}@media all and (min-width:768px){#textWrapper{font-size:1em}#headData{margin-top:0}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em}#headData{margin-top:0}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em}#headData{margin-top:0}}@media all and (min-width:2200px){#textWrapper{font-size:2em}#headData{margin-top:0}}@media all and (max-width:767px){#textWrapper{font-size:.8em}#headData{margin-top:6px}}@media all and (max-width:480px){#textWrapper{font-size:.6em}#headData{margin-top:14px}}@media all and (max-width:320px){#textWrapper{font-size:.5em}#headData{margin-top:18px}} \ No newline at end of file +.uppercase{text-transform:uppercase}.bigBtn{min-height:2.2em;font-size:1.2em}.navbar-nav{display:table;width:100%;margin:0}.navbar-nav>li{float:none;display:table-cell;text-align:center}.VVF-CL-01{color:#060;background-color:#fff}.VVF-CL-02{color:#ff3;background-color:#22f}.VVF-CL-03{color:#ff3;background-color:#181}.VVF-CL-04{background-color:#ff1}.VVF-CL-05{color:#ff3;background-color:#e62}.VVF-CL-06{color:#ff1;background-color:#ff0c0c}.headerRow{background-color:#eee;color:#000}.text-center{text-align:center;margin:auto}.tStrong{font-weight:bold;font-size:1.3em}.flRight{float:right}.errore{color:#f00}.headLine{background-color:#f83;color:#fff}.hBlock{background-color:#d7d7d7;color:#000}.hBlockDrk{background-color:#585858;color:#fff}.fBlock{background-color:#f2f2f2;color:#000}.btn-circle{width:2.2em;height:2.2em;text-align:center;padding:.3em 0;font-size:1em;line-height:1.6;border-radius:1em}.btn-circle.btn-lg{width:3.5em;height:3.5em;padding:.6em 1em;font-size:1.5em;line-height:1.5;border-radius:1.8em}.btn-circle.btn-xl{width:5em;height:5em;padding:.6em 1em;font-size:2em;line-height:1.5;border-radius:3em}.btn-selected,.navbar-nav>li>.btn-selected{background-color:#f83;font-weight:600;color:#fff}.btn-selected:hover,.navbar-nav>li .btn-selected:hover{background-color:#ffa567;font-weight:600;color:#333}.btn-unselected,.navbar-nav>li .btn-unselected{background-color:#efefef;font-weight:600;color:#333}.btn-unselected:hover,.navbar-nav>li>.btn-unselected:hover{background-color:#333;font-weight:600;color:#efefef}.RowStyle{background-color:#fbf3ef;text-align:left}.rowStyle{background-color:#fbf3ef}.editRowStyle{background-color:#cf6124}.selectedRowStyle{background-color:#f1ccc1;font-weight:bold;Color:#f63}.alternatingRowStyle{background-color:#fff}.footerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff}.headerRowStyle{background-color:#ff7c50;font-weight:bold;color:#fff}.spacedRow{line-height:3em}.baseRow{background-color:#fbf3ef}.altRow{background-color:#fff}.editRow{background-color:#cf6124}.selectedRow{background-color:#ffa567;font-weight:600;color:#333}.headerHighlight{background-color:#f83;font-weight:600;color:#fff}.footerRow{background-color:#f83;font-weight:600;color:#fff}.pagerRow{background-color:#cf6124;color:#fff;text-align:center;margin:auto}.stortAscCellStyle{background-color:#f5f7fb}.stortAscHeadStyle{background-color:#6d95e1}.stortDescCellStyle{background-color:#e9ebef}.stortDescHeadStyle{background-color:#4870be}.GridPager{background-color:#ff7c50}.GridPager a,.GridPager span{display:block;height:2em;width:2em;text-align:center;vertical-align:baseline;text-decoration:none;background-color:#cf6124}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#f2dca1;color:#000;font-weight:bold}.imgNoPad{margin-top:-3px;margin-bottom:-7px}@media all and (min-width:768px){#textWrapper{font-size:1em}#headData{margin-top:0}}@media all and (min-width:1024px){#textWrapper{font-size:1.2em}#headData{margin-top:0}}@media all and (min-width:1440px){#textWrapper{font-size:1.4em}#headData{margin-top:0}}@media all and (min-width:1600px){#textWrapper{font-size:1.6em}#headData{margin-top:0}}@media all and (min-width:1900px){#textWrapper{font-size:1.8em}#headData{margin-top:0}}@media all and (min-width:2200px){#textWrapper{font-size:2em}#headData{margin-top:0}}@media all and (max-width:767px){#textWrapper{font-size:.8em}#headData{margin-top:6px}}@media all and (max-width:480px){#textWrapper{font-size:.6em}#headData{margin-top:14px}}@media all and (max-width:320px){#textWrapper{font-size:.5em}#headData{margin-top:18px}} \ No newline at end of file diff --git a/ScheMe-SP/ScheMe-SP.csproj b/ScheMe-SP/ScheMe-SP.csproj index 4c5cd2e..40c1a00 100644 --- a/ScheMe-SP/ScheMe-SP.csproj +++ b/ScheMe-SP/ScheMe-SP.csproj @@ -369,6 +369,8 @@ + + diff --git a/ScheMe-SP/obj/Debug/ScheMe.dll b/ScheMe-SP/obj/Debug/ScheMe.dll index 7e7c412..ff58701 100644 Binary files a/ScheMe-SP/obj/Debug/ScheMe.dll and b/ScheMe-SP/obj/Debug/ScheMe.dll differ