Egalware/ScheMe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix master

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-09-05 12:52:09 +02:00
parent b93738097f
commit 5f9d6e6ed6
8 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ScheMe-SP/Bootstrap.Master
+1 -11
View File
@@ -70,19 +70,9 @@
<ContentTemplate>
<footer>
<div class="navbar navbar-fixed-bottom" role="navigation" style="min-height: 2em; padding-top: 0.4em;">
<div class="container-fluid" style="line-height: 1.5em;">
<div class="container-fluid">
<uc1:mod_bottom runat="server" ID="mod_bottom" />
</div>
<div class="container-fluid" style="font-size: 0.7em;">
<p class="navbar-text navbar-left" style="margin-bottom: 0px; margin-top: 0px; margin-left: 0px;">
<b><%: SteamWare.memLayer.ML.CRS("CodModulo") %></b>
<asp:Label runat="server" ID="lblVers" />
</p>
<p class="navbar-text navbar-right" style="margin-bottom: 0; margin-top: 0; margin-right: 0.1em;">
2007-<%: DateTime.Now.Year %>&copy;
<asp:Image ID="logoSW" ImageUrl="~/images/logoSteamware.png" runat="server" Height="22px" AlternateText="SteamWare" />
</p>
</div>
</div>
</footer>
</ContentTemplate>
ScheMe-SP/Bootstrap.Master.cs
-4
View File
@@ -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()
ScheMe-SP/Bootstrap.Master.designer.cs
Generated
-18
View File
@@ -102,24 +102,6 @@ namespace ScheMe {
/// </remarks>
protected global::ScheMe.WebUserControls.mod_bottom mod_bottom;
/// <summary>
/// Controllo lblVers.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblVers;
/// <summary>
/// Controllo logoSW.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Image logoSW;
/// <summary>
/// Controllo PlaceHolder2.
/// </summary>
ScheMe-SP/Content/Style.css
+10 -1
View File
@@ -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 {
ScheMe-SP/Content/Style.less
+12 -1
View File
@@ -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;
}
ScheMe-SP/Content/Style.min.css
Vendored
+1 -1
View File
@@ -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}}
.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}}
ScheMe-SP/ScheMe-SP.csproj
+2
View File
@@ -369,6 +369,8 @@
<Content Include="Content\jquery.mobile.theme-1.4.5.min.css" />
<Content Include="Bootstrap.Master" />
<None Include="Scripts\jquery.validate-vsdoc.js" />
<Content Include="images\SteamwareLogo.png" />
<Content Include="images\SteamwareTesto.png" />
<Content Include="Scripts\jquery.validate.js" />
<Content Include="Scripts\jquery.validate.min.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.js" />
ScheMe-SP/obj/Debug/ScheMe.dll
BIN
View File
Binary file not shown.