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

Completato fix menù testa

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-23 09:44:08 +01:00
parent 7ebd92e4e5
commit 6eb4cda0ad
6 changed files with 139 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/XPS_app/v15/sqlite3/storage.ide
BIN
View File
Binary file not shown.
XPS/Content/Style.css
+40 -21
View File
@@ -1,22 +1,59 @@
body {
font-family: 'Open Sans', sans-serif;
}
.navTitle {
.navFont {
font-family: 'Open Sans Condensed', sans-serif;
}
.navTitle {
font-size: 1.5em;
}
.navItem {
text-align: center;
line-height: 1.0em;
}
.navbar-dark .navbar-nav .show > .nav-link,
.navbar-dark .navbar-nav .active > .nav-link,
.navbar-dark .navbar-nav .nav-link.show,
.navbar-dark .navbar-nav .nav-link.active {
background: transparent;
color: #F90;
border: 1px solid #F90;
color: #9CF;
border: 1px solid #09F;
/*margin: -5px;*/
}
@media (max-width: 480px) {
.headSpacer {
min-height: 5em;
}
.navTitle {
font-size: 0.9em;
}
}
@media (min-width: 480px) {
.headSpacer {
min-height: 5.5em;
}
.navTitle {
font-size: 1.1em;
}
}
@media (min-width: 768px) {
.headSpacer {
min-height: 5em;
}
.navTitle {
font-size: 1.3em;
}
}
@media (min-width: 1024px) {
.headSpacer {
min-height: 4.5em;
}
}
@media (min-width: 1366px) {
.headSpacer {
min-height: 4em;
}
}
/* @group Generale */
.fixedVal {
background-color: #cdcdcd;
@@ -605,9 +642,6 @@
.error-container h1 {
font-size: 72px;
}
.headSpacer {
min-height: 0.3em;
}
.shortcuts .shortcut {
width: 95px;
}
@@ -626,9 +660,6 @@
position: static;
margin-bottom: 0;
}
.headSpacer {
min-height: 1em;
}
.navbar .btn-navbar {
font-size: 16px;
background: none;
@@ -650,9 +681,6 @@
body {
font-size: 9px;
}
.headSpacer {
min-height: 0.5em;
}
.navbar .mainnav > li > a {
padding: 0 10px;
font-size: 1em;
@@ -805,9 +833,6 @@
body {
font-size: 10px;
}
.headSpacer {
min-height: 2em;
}
.subnav-collapse.collapse {
display: block !important;
height: auto !important;
@@ -820,18 +845,12 @@
body {
font-size: 12px;
}
.headSpacer {
min-height: 5em;
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
body {
font-size: 14px;
}
.headSpacer {
min-height: 5em;
}
.nav > li > a {
padding: 4px 8px;
font-size: 1.2em;
XPS/Content/Style.less
+49 -26
View File
@@ -2,13 +2,17 @@
font-family: 'Open Sans', sans-serif;
}
.navTitle {
.navFont{
font-family: 'Open Sans Condensed', sans-serif;
}
.navTitle {
font-size: 1.5em;
}
.navItem {
text-align: center;
line-height: 1.0em;
}
.navbar-dark .navbar-nav .show > .nav-link,
@@ -16,11 +20,53 @@
.navbar-dark .navbar-nav .nav-link.show,
.navbar-dark .navbar-nav .nav-link.active {
background: transparent;
color: #F90;
border: 1px solid #F90;
color: #9CF;
border: 1px solid #09F;
/*margin: -5px;*/
}
@media (max-width: 480px) {
.headSpacer {
min-height: 5em;
}
.navTitle {
font-size: 0.9em;
}
}
@media (min-width: 480px) {
.headSpacer {
min-height: 5.5em;
}
.navTitle {
font-size: 1.1em;
}
}
@media (min-width: 768px) {
.headSpacer {
min-height: 5em;
}
.navTitle {
font-size: 1.3em;
}
}
@media (min-width: 1024px) {
.headSpacer {
min-height: 4.5em;
}
}
@media (min-width: 1366px) {
.headSpacer {
min-height: 4em;
}
}
/* @group Generale */
.fixedVal {
background-color: #cdcdcd;
@@ -717,9 +763,6 @@
font-size: 72px;
}
.headSpacer {
min-height: 0.3em;
}
.shortcuts .shortcut {
width: 95px;
@@ -742,10 +785,6 @@
margin-bottom: 0;
}
.headSpacer {
min-height: 1em;
}
.navbar .btn-navbar {
font-size: 16px;
background: none;
@@ -769,11 +808,6 @@
body {
font-size: 9px;
}
.headSpacer {
min-height: 0.5em;
}
.navbar .mainnav > li > a {
padding: 0 10px;
font-size: 1em;
@@ -959,10 +993,6 @@
font-size: 10px;
}
.headSpacer {
min-height: 2em;
}
.subnav-collapse.collapse {
display: block !important;
height: auto !important;
@@ -977,9 +1007,6 @@
font-size: 12px;
}
.headSpacer {
min-height: 5em;
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
@@ -988,10 +1015,6 @@
font-size: 14px;
}
.headSpacer {
min-height: 5em;
}
.nav > li > a {
padding: 4px 8px;
font-size: 1.2em;
XPS/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
XPS/WebUserControls/mod_testata.ascx
+40 -39
View File
@@ -6,44 +6,45 @@
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<nav class="navbar navbar-expand-md navbar-dark bg-dark text-light fixed-top py-1 m-0 justify-content-start flex-nowrap">
<asp:LinkButton runat="server" ID="lbnUpdate" OnClick="lbnUpdate_Click" ToolTip="Update" CssClass="navbar-brand pt-0"><i class="fa fa-home fa-2x"></i> <b style="font-size:2em;">XPS</b></asp:LinkButton>
<button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse">
<%--<div class="col-12">--%>
<ul class="navbar-nav mr-auto mt-1 mt-lg-0 navTitle">
<asp:Repeater ID="menu" runat="server" DataSourceID="XmlMenu">
<ItemTemplate>
<asp:Repeater ID="voci" runat="server" DataSource='<%# XPathSelect("voce") %>'>
<ItemTemplate>
<li class='<%# checkPag(XPath("@title")) %>'>
<a href='<%# XPath("@url").ToString().Replace("~/","")%>' class="nav-link py-0 px-1 my-0 mx-2">
<i class='<%# XPath("@description")%>'></i>&nbsp;<%# SteamWare.SteamwareStrings.limitString(XPath("@title").ToString(), 15)%>
</a>
</li>
</ItemTemplate>
</asp:Repeater>
</ItemTemplate>
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="false"></asp:XmlDataSource>
</ul>
<div class="form-inline my-2 my-lg-0">
<asp:TextBox ID="txtSearch" runat="server" CssClass="form-control form-control-sm search-query" placeholder="[S]earch" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" TextMode="Search" AccessKey="s" />
<div class="fixed-top navFont">
<nav class="navbar navbar-expand-sm navbar-dark bg-dark text-light m-0 p-1 justify-content-start flex-nowrap">
<asp:LinkButton runat="server" ID="lbnUpdate" OnClick="lbnUpdate_Click" ToolTip="Update" CssClass="navbar-brand p-0 m-0"><i class="fa fa-home fa-2x"></i> <asp:Label runat="server" ID="lblBrand" CssClass="navTitle" Font-Size="2em"><b>XPS</b></asp:Label></asp:LinkButton>
<button class="navbar-toggler ml-auto" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse">
<%--<div class="col-12">--%>
<ul class="navbar-nav mr-auto my-1 my-md-0 navTitle">
<asp:Repeater ID="menu" runat="server" DataSourceID="XmlMenu">
<ItemTemplate>
<asp:Repeater ID="voci" runat="server" DataSource='<%# XPathSelect("voce") %>'>
<ItemTemplate>
<li class='<%# checkPag(XPath("@title")) %>'>
<a href='<%# XPath("@url").ToString().Replace("~/","")%>' class="nav-link py-0 px-1 my-0 mx-1">
<i class='<%# XPath("@description")%> d-none d-md-block'></i>&nbsp;<%# SteamWare.SteamwareStrings.limitString(XPath("@title").ToString(), 15)%>
</a>
</li>
</ItemTemplate>
</asp:Repeater>
</ItemTemplate>
<SeparatorTemplate>
</SeparatorTemplate>
</asp:Repeater>
<asp:XmlDataSource ID="XmlMenu" runat="server" EnableCaching="false"></asp:XmlDataSource>
</ul>
<div class="form-inline my-0 my-lg-0">
<asp:TextBox ID="txtSearch" runat="server" CssClass="form-control form-control-sm navTitle" placeholder="[S]earch" AutoPostBack="true" OnTextChanged="txtSearch_TextChanged" TextMode="Search" AccessKey="s" />
</div>
</div>
</div>
</nav>
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top mt-5 p-0 text-light">
<div class="navbar-collapse collapse row small py-0 px-2 text-secondary">
<div class="col-6">
<%: string.Format("{0} | {1}", SteamWare.dnsUtils.ReverseLookup(Request.UserHostAddress), Request.UserHostAddress) %>
</div>
<div class="col-6 text-right">
<asp:HyperLink runat="server" ID="hlLang" NavigateUrl="~/chLang"> <i class="fa fa-flag-checkered"></i> <%: string.Format("{0} - [{1}]", SteamWare.devicesAuthProxy.stObj.CognomeNome, SteamWare.devicesAuthProxy.stObj.lingua) %></asp:HyperLink>
</div>
</div>
</nav>
<nav class="navbar navbar-expand-sm navbar-dark bg-dark m-0 p-0 text-light">
<div class="navbar-collapse collapse row small py-0 px-2 text-secondary">
<div class="col-6">
<%: string.Format("{0} | {1}", SteamWare.dnsUtils.ReverseLookup(Request.UserHostAddress), Request.UserHostAddress) %>
</div>
<div class="col-6 text-right">
<asp:HyperLink runat="server" ID="hlLang" NavigateUrl="~/chLang"> <i class="fa fa-flag-checkered"></i> <%: string.Format("{0} - [{1}]", SteamWare.devicesAuthProxy.stObj.CognomeNome, SteamWare.devicesAuthProxy.stObj.lingua) %></asp:HyperLink>
</div>
</div>
</nav>
</div>
XPS/WebUserControls/mod_testata.ascx.designer.cs
Generated
+9
View File
@@ -39,6 +39,15 @@ namespace XPS.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbnUpdate;
/// <summary>
/// Controllo lblBrand.
/// </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 lblBrand;
/// <summary>
/// Controllo menu.
/// </summary>