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

Fix css vari (update)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-12-13 14:22:24 +01:00
parent 6551acc85b
commit d058e449c3
23 changed files with 164 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW/Bundle.config
+2 -4
View File
@@ -10,11 +10,10 @@
<include path="~/Content/bootstrap.css" />
<include path="~/Content/bootstrap-theme.css" />
</styleBundle>
<styleBundle path="~/Content/jqm">
<styleBundle path="~/Content/jqm">
<include path="~/Content/jquery.mobile-1.4.5.css" />
<include path="~/Content/jquery.mobile.icons-1.4.5.css" />
<!--<include path="~/Content/themes/base/jquery.ui.all.css" />-->
<!--
<include path="~/Content/themes/base/jquery.ui.css" />
@@ -36,8 +35,7 @@
<include path="~/Content/themes/base/jquery.ui.tooltip.css" />
-->
</styleBundle>
<styleBundle path="~/Content/droid">
<include path="~/Content/nativeDroid/nativedroid2.css" />
<include path="~/Content/waves/waves.min.css" />
GPW/Site.Master
+5 -1
View File
@@ -9,10 +9,14 @@
<title><%: Page.Title %> - My ASP.NET Application</title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/jquery") %>
<%: Scripts.Render("~/bundles/jSteamware") %>
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:bundlereference runat="server" path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
</head>
GPW/Site.Master.designer.cs
Generated
+18
View File
@@ -12,6 +12,24 @@ namespace GPW {
public partial class SiteMaster {
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// MainContent control.
/// </summary>
GPW/WebMasterPages/AjaxSearch.master
+3 -3
View File
@@ -18,9 +18,9 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
GPW/WebMasterPages/AjaxSearch.master.designer.cs
Generated
+9 -9
View File
@@ -20,15 +20,6 @@ public partial class AjaxSearch {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
@@ -38,6 +29,15 @@ public partial class AjaxSearch {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// PlaceHolder1 control.
/// </summary>
GPW/WebMasterPages/AjaxSimple.master
+3 -3
View File
@@ -12,9 +12,9 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
GPW/WebMasterPages/AjaxSimple.master.designer.cs
Generated
+9 -9
View File
@@ -20,15 +20,6 @@ public partial class AjaxSimple {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
@@ -38,6 +29,15 @@ public partial class AjaxSimple {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// form1 control.
/// </summary>
GPW/WebMasterPages/AjaxSimpleFull.Master
+3 -3
View File
@@ -12,9 +12,9 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
GPW/WebMasterPages/AjaxSimpleFull.Master.designer.cs
Generated
+9 -9
View File
@@ -21,15 +21,6 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
@@ -39,6 +30,15 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// PlaceHolder1 control.
/// </summary>
GPW/WebMasterPages/AjaxSimpleFullBCode.Master
+3 -3
View File
@@ -13,9 +13,9 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
GPW/WebMasterPages/AjaxSimpleFullBCode.Master.designer.cs
Generated
+9 -9
View File
@@ -21,15 +21,6 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
@@ -39,6 +30,15 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// PlaceHolder1 control.
/// </summary>
GPW/WebMasterPages/AjaxTitle.master
+3 -3
View File
@@ -17,9 +17,9 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
GPW/WebMasterPages/AjaxTitle.master.designer.cs
Generated
+9 -9
View File
@@ -20,15 +20,6 @@ public partial class AjaxTitle {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
@@ -38,6 +29,15 @@ public partial class AjaxTitle {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// PlaceHolder1 control.
/// </summary>
GPW/WebMasterPages/JQMob.Master
+2 -2
View File
@@ -28,10 +28,10 @@
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference4" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/jqm" />
<webopt:BundleReference ID="BundleReference3" runat="server" Path="~/Content/droid" />
<webopt:BundleReference ID="BundleReference4" runat="server" Path="~/Content/bootstrap" />
<link rel="stylesheet" href="~/Content/waves/waves.min.css" />
<link rel="stylesheet" href="~/Content/wow/animate.css" />
@@ -53,7 +53,7 @@
<div data-role="header" data-position="fixed" class="wow fadeInDown" data-wow-delay="0.1s">
<a href="#bottomsheet" class="ui-btn ui-btn-right wow fadeIn" data-wow-delay='0.2s'><i class="zmdi zmdi-more-vert"></i></a>
<a href="#leftpanel" class="ui-btn ui-btn-left wow fadeIn" data-wow-delay='0.2s'><i class="zmdi zmdi-menu"></i></a>
<h1><uc2:mod_title ID="mod_title1" runat="server" /></h1>
<h3><uc2:mod_title ID="mod_title1" runat="server" /></h3>
</div>
<div role="main" class="ui-content" data-inset="false">
GPW/WebMasterPages/JQMob.Master.designer.cs
Generated
+9 -9
View File
@@ -30,6 +30,15 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// BundleReference4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference4;
/// <summary>
/// BundleReference1 control.
/// </summary>
@@ -57,15 +66,6 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3;
/// <summary>
/// BundleReference4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference4;
/// <summary>
/// head control.
/// </summary>
GPW/WebMasterPages/MasterAjax.master
+3 -3
View File
@@ -15,9 +15,9 @@
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<link rel="icon" href="~/images/favicon.png" type="image/png" />
GPW/WebMasterPages/MasterAjax.master.designer.cs
Generated
+9 -9
View File
@@ -20,15 +20,6 @@ public partial class MasterAjax {
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
@@ -38,6 +29,15 @@ public partial class MasterAjax {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// PlaceHolder1 control.
/// </summary>
GPW/WebMasterPages/jQueryMobile.Master
+4 -1
View File
@@ -30,8 +30,11 @@
<%: Scripts.Render("~/bundles/jquerymobile") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference5" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference3" runat="server" Path="~/Content/jqm" />
<webopt:BundleReference ID="BundleReference4" runat="server" Path="~/Content/droid" />
<%--DA VERIFICARE QUESTI in inclusione...--%>
<link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
GPW/WebMasterPages/jQueryMobile.Master.designer.cs
Generated
+20 -2
View File
@@ -31,13 +31,13 @@ namespace GPW.WebMasterPages {
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// BundleReference1 control.
/// BundleReference5 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference5;
/// <summary>
/// BundleReference2 control.
@@ -48,6 +48,24 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference3 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference3;
/// <summary>
/// BundleReference4 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference4;
/// <summary>
/// form1 control.
/// </summary>
GPW/WebMasterPages/jQueryMobileNoCookie.Master
+3 -3
View File
@@ -24,9 +24,9 @@
<%: Scripts.Render("~/bundles/jSteamware") %>
<%: Scripts.Render("~/bundles/jquerymobile") %>
</asp:PlaceHolder>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/themes/base/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<%--DA VERIFICARE QUESTI in inclusione...--%>
<link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
GPW/WebMasterPages/jQueryMobileNoCookie.Master.designer.cs
Generated
+9 -9
View File
@@ -30,15 +30,6 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolder1;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// BundleReference2 control.
/// </summary>
@@ -48,6 +39,15 @@ namespace GPW.WebMasterPages {
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// form1 control.
/// </summary>
GPW/WebUserControls/mod_autocomplete.ascx
+2 -2
View File
@@ -1,8 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_autocomplete.ascx.cs" Inherits="GPW.WebUserControls.mod_autocomplete" %>
<%if (false)
{ %>
<%--<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />--%>
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/bootstrap" />
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<%} %>
<style>
.ui-autocomplete {
GPW/WebUserControls/mod_autocomplete.ascx.designer.cs
Generated
+18
View File
@@ -12,6 +12,24 @@ namespace GPW.WebUserControls {
public partial class mod_autocomplete {
/// <summary>
/// BundleReference2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// BundleReference1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// btnSearch control.
/// </summary>