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

iniziato include stile con less...

Browse Source
This commit is contained in:
Samuele Locatelli
2013-05-09 12:49:52 +02:00
parent 1b3ca04b5a
commit 9110dbbd31
20 changed files with 305 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ETS_Data/obj/Debug/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS.sln
+5
View File
@@ -5,6 +5,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PROJ-ETS", "PROJ-ETS\PROJ-E
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ETS_Data", "..\ETS_Data\ETS_Data.csproj", "{0A14058F-ED18-4F82-91C9-93945C2C409A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{79203114-695D-4D7F-94C7-70BCEB39C129}"
ProjectSection(SolutionItems) = preProject
WE-settings.xml = WE-settings.xml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
PROJ-ETS/PROJ-ETS/Bundle.config
+20 -17
View File
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="utf-8" ?>
<bundles version="1.0">
<styleBundle path="~/Content/css">
<include path="~/Content/Site.css" />
</styleBundle>
<styleBundle path="~/Content/themes/base/css">
<include path="~/Content/themes/base/jquery.ui.core.css" />
<include path="~/Content/themes/base/jquery.ui.resizable.css" />
<include path="~/Content/themes/base/jquery.ui.selectable.css" />
<include path="~/Content/themes/base/jquery.ui.accordion.css" />
<include path="~/Content/themes/base/jquery.ui.autocomplete.css" />
<include path="~/Content/themes/base/jquery.ui.button.css" />
<include path="~/Content/themes/base/jquery.ui.dialog.css" />
<include path="~/Content/themes/base/jquery.ui.slider.css" />
<include path="~/Content/themes/base/jquery.ui.tabs.css" />
<include path="~/Content/themes/base/jquery.ui.datepicker.css" />
<include path="~/Content/themes/base/jquery.ui.progressbar.css" />
<include path="~/Content/themes/base/jquery.ui.theme.css" />
</styleBundle>
<styleBundle path="~/Content/css">
<include path="~/Content/Site.css" />
</styleBundle>
<!--<styleBundle path="~/Content/less">
<include path="~/Content/Style.css" />
</styleBundle>-->
<styleBundle path="~/Content/themes/base/css">
<include path="~/Content/themes/base/jquery.ui.core.css" />
<include path="~/Content/themes/base/jquery.ui.resizable.css" />
<include path="~/Content/themes/base/jquery.ui.selectable.css" />
<include path="~/Content/themes/base/jquery.ui.accordion.css" />
<include path="~/Content/themes/base/jquery.ui.autocomplete.css" />
<include path="~/Content/themes/base/jquery.ui.button.css" />
<include path="~/Content/themes/base/jquery.ui.dialog.css" />
<include path="~/Content/themes/base/jquery.ui.slider.css" />
<include path="~/Content/themes/base/jquery.ui.tabs.css" />
<include path="~/Content/themes/base/jquery.ui.datepicker.css" />
<include path="~/Content/themes/base/jquery.ui.progressbar.css" />
<include path="~/Content/themes/base/jquery.ui.theme.css" />
</styleBundle>
</bundles>
PROJ-ETS/PROJ-ETS/Content/Style.css
+71 -79
View File
@@ -1,92 +1,84 @@
@import url("MasterPage.css");
@import url("BuildBlocks.css");
@import url("ExtraComp.css");
@import url("ETS.css");
.bodyMainCenter {
background-image: url('../images/logo_sw.png');
vertical-align: middle;
border-left: #0D0083 1px solid;
/*border-top: #0D0083 1px solid;*/
text-align: center;
height: 100%;
width: 100%;
background-position: center;
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyCenter {
vertical-align: middle;
text-align: center;
height: 100%;
width: 100%;
}
.centerMenu {
background-color: White;
text-align: center;
border-width: thin;
border-style: groove;
border-color: Blue;
}
A:hover {
color: red;
}
.bodyMain {
background-image: url('../images/logo_sw.png');
vertical-align: top;
border-left: #0D0083 1px solid;
/*border-top: #0D0083 1px solid;*/
.bodyMainCenter
{
background-image: url('../images/logo_sw.png');
vertical-align: middle;
border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
text-align: center;
height: 100%;
width: 100%;
background-position: center;
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyCenter
{
vertical-align: middle;
text-align: center;
height: 100%;
width: 100%;
}
.centerMenu
{
background-color: White;
text-align: center;
border-width: thin;
border-style: groove;
border-color: Blue;
}
A:hover
{
color: red;
}
height: 100%;
width: 100%;
background-position: center;
/*was topleft*/
.bodyMain
{
background-image: url('../images/logo_sw.png');
vertical-align: top;
border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
height: 100%;
width: 100%;
background-position: center; /*was topleft*/
background-attachment: scroll;
background-repeat: no-repeat;
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyMainEmpty
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
.bodyMainEmpty {
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
}
.bodyMainWhite
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-position: center;
background-attachment: scroll;
background-repeat: no-repeat;
.bodyMainWhite {
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-position: center;
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyMainWhite a:hover
{
color: white;
.bodyMainWhite a:hover {
color: white;
}
.bodyMainNoLogo
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
.bodyMainNoLogo {
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
}
.bodyMainLogoPiccolo
{
background-image: url('../images/sfondoMedio.png');
background-position: 97% 210px;
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-attachment: scroll;
background-repeat: no-repeat;
.bodyMainLogoPiccolo {
background-image: url('../images/sfondoMedio.png');
background-position: 97% 210px;
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-attachment: scroll;
background-repeat: no-repeat;
}
PROJ-ETS/PROJ-ETS/Content/Style.less
+95
View File
@@ -0,0 +1,95 @@
@import url("MasterPage.css");
@import url("BuildBlocks.css");
@import url("ExtraComp.css");
@import url("ETS.css");
.bodyMainCenter
{
background-image: url('../images/logo_sw.png');
vertical-align: middle;
border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
text-align: center;
height: 100%;
width: 100%;
background-position: center;
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyCenter
{
vertical-align: middle;
text-align: center;
height: 100%;
width: 100%;
}
.centerMenu
{
background-color: White;
text-align: center;
border-width: thin;
border-style: groove;
border-color: Blue;
}
A:hover
{
color: red;
}
.bodyMain
{
background-image: url('../images/logo_sw.png');
vertical-align: top;
border-left: #0D0083 1px solid; /*border-top: #0D0083 1px solid;*/
height: 100%;
width: 100%;
background-position: center; /*was topleft*/
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyMainEmpty
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
}
.bodyMainWhite
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-position: center;
background-attachment: scroll;
background-repeat: no-repeat;
}
.bodyMainWhite a:hover
{
color: white;
}
.bodyMainNoLogo
{
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
}
.bodyMainLogoPiccolo
{
background-image: url('../images/sfondoMedio.png');
background-position: 97% 210px;
vertical-align: top;
border-left: maroon 1px solid;
height: 100%;
width: 100%;
background-attachment: scroll;
background-repeat: no-repeat;
}
body {
}
PROJ-ETS/PROJ-ETS/Content/Style.min.css
Vendored
+1
View File
@@ -0,0 +1 @@
@import url("MasterPage.css");@import url("BuildBlocks.css");@import url("ExtraComp.css");@import url("ETS.css");.bodyMainCenter{background-image:url('../images/logo_sw.png');vertical-align:middle;border-left:#0d0083 1px solid;text-align:center;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:blue}A:hover{color:red}.bodyMain{background-image:url('../images/logo_sw.png');vertical-align:top;border-left:#0d0083 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainEmpty{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainWhite{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-position:center;background-attachment:scroll;background-repeat:no-repeat}.bodyMainWhite a:hover{color:#fff}.bodyMainNoLogo{vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%}.bodyMainLogoPiccolo{background-image:url('../images/sfondoMedio.png');background-position:97% 210px;vertical-align:top;border-left:maroon 1px solid;height:100%;width:100%;background-attachment:scroll;background-repeat:no-repeat}
PROJ-ETS/PROJ-ETS/Images/favicon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj
+5
View File
@@ -114,6 +114,9 @@
<Content Include="Content\MasterPage.css" />
<Content Include="Content\Site.css" />
<Content Include="Content\Style.css" />
<Content Include="Content\Style.min.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
<Content Include="Content\themes\base\images\animated-overlay.gif" />
<Content Include="Content\themes\base\images\ui-bg_flat_0_aaaaaa_40x100.png" />
<Content Include="Content\themes\base\images\ui-bg_flat_75_ffffff_40x100.png" />
@@ -178,6 +181,7 @@
<Content Include="Content\themes\base\minified\jquery.ui.tooltip.min.css" />
<Content Include="Images\accent.png" />
<Content Include="Images\bullet.png" />
<Content Include="Images\favicon.png" />
<Content Include="Images\heroAccent.png" />
<Content Include="Images\orderedList0.png" />
<Content Include="Images\orderedList1.png" />
@@ -203,6 +207,7 @@
<Content Include="Scripts\WebForms\MSAjax\MicrosoftAjaxWebServices.js" />
<Content Include="WebUserControls\mod_menuBottomFullpage.ascx" />
<Content Include="WebUserControls\mod_testata.ascx" />
<Content Include="Content\Style.less" />
<None Include="Scripts\jquery-2.0.0.intellisense.js" />
<Content Include="Scripts\jquery-2.0.0.js" />
<Content Include="Scripts\jquery-2.0.0.min.js" />
PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master
+13 -3
View File
@@ -1,14 +1,19 @@
<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="PROJ_ETS.SiteMaster" %>
<%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %>
<!DOCTYPE html>
<html lang="en">
<head runat="server">
<meta charset="utf-8" />
<title><%: Page.Title %> - My ASP.NET Application</title>
<title><%: Page.Title %> - PROJ-ETS</title>
<asp:PlaceHolder runat="server">
<%: Scripts.Render("~/bundles/modernizr") %>
</asp:PlaceHolder>
<webopt:BundleReference runat="server" Path="~/Content/css" />
<%--<webopt:BundleReference ID="brLess" runat="server" Path="~/Content/less" />--%>
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<meta name="viewport" content="width=device-width" />
<asp:ContentPlaceHolder runat="server" ID="HeadContent" />
@@ -33,8 +38,9 @@
<%--Site Scripts--%>
</Scripts>
</asp:ScriptManager>
<%--testata pagina--%>
<header>
<div class="content-wrapper">
<%--<div class="content-wrapper">
<div class="float-left">
<p class="site-title">
<a runat="server" href="~/">your logo here</a>
@@ -50,14 +56,17 @@
</ul>
</nav>
</div>
</div>
</div>--%>
<uc1:mod_testata runat="server" ID="mod_testata" />
</header>
<%--corpo pagina--%>
<div id="body">
<asp:ContentPlaceHolder runat="server" ID="FeaturedContent" />
<section class="content-wrapper main-content clear-fix">
<asp:ContentPlaceHolder runat="server" ID="MainContent" />
</section>
</div>
<%--footer pagina--%>
<footer>
<div class="content-wrapper">
<div class="float-left">
@@ -65,6 +74,7 @@
</div>
</div>
</footer>
</form>
</body>
</html>
PROJ-ETS/PROJ-ETS/WebMasterPages/Site.Master.designer.cs
Generated
+16 -9
View File
@@ -7,13 +7,11 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace PROJ_ETS
{
public partial class SiteMaster
{
namespace PROJ_ETS {
public partial class SiteMaster {
/// <summary>
/// HeadContent control.
/// </summary>
@@ -22,7 +20,16 @@ namespace PROJ_ETS
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder HeadContent;
/// <summary>
/// mod_testata control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::PROJ_ETS.WebUserControls.mod_testata mod_testata;
/// <summary>
/// FeaturedContent control.
/// </summary>
@@ -31,7 +38,7 @@ namespace PROJ_ETS
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ContentPlaceHolder FeaturedContent;
/// <summary>
/// MainContent control.
/// </summary>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx
+25 -3
View File
@@ -1,13 +1,13 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_testata.ascx.cs" Inherits="PROJ_ETS.WebUserControls.mod_testata" %>
<% if (false)
<%--<% if (false)
{ %>
<link href="../css/BuildBlocks.css" rel="stylesheet" type="text/css" />
<link href="../css/ETS.css" rel="stylesheet" type="text/css" />
<link href="../css/ExtraComp.css" rel="stylesheet" type="text/css" />
<link href="../css/MasterPage.css" rel="stylesheet" type="text/css" />
<link href="../css/Style.css" rel="stylesheet" type="text/css" />
<% } %>
<div class="divCenter areaTitolo">
<% } %>--%>
<%--<div class="divCenter areaTitolo">
<div class="divSx fontPiccolo" style="padding: 20px 0px 2px 4px;">
<asp:Label runat="server" ID="lblUser" />
</div>
@@ -38,4 +38,26 @@
<StaticSelectedStyle BackColor="#507CD1" />
</asp:Menu>
<asp:SiteMapDataSource ID="SiteMapDS" runat="server" />
</div>--%>
<div class="content-wrapper">
<div class="float-left">
<a id="A1" runat="server" href="~/">Utente</a>
</div>
<div class="float-right">
<nav>
<ul id="menu">
<li><a href="Default">Home</a></li>
<li><a href="About">About</a></li>
<li><a href="Contact">Contact</a></li>
</ul>
</nav>
</div>
<div class="divCenter fontTitolo">
<p class="site-title">
<a id="A2" runat="server" href="~/">PROJ-ETS</a>
</p>
</div>
</div>
PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.cs
+2 -2
View File
@@ -12,8 +12,8 @@ namespace PROJ_ETS.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
lblUser.Text = string.Format("{0} ({1})",utils.obj.currUserCognomeNome, utils.obj.currUserId);
lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss");
//lblUser.Text = string.Format("{0} ({1})",utils.obj.currUserCognomeNome, utils.obj.currUserId);
//lblDataOra.Text = DateTime.Now.ToString("dd-MM-yyyy HH:mm:ss");
}
/// <summary>
/// richiesta update
PROJ-ETS/PROJ-ETS/WebUserControls/mod_testata.ascx.designer.cs
Generated
+4 -49
View File
@@ -13,66 +13,21 @@ namespace PROJ_ETS.WebUserControls {
public partial class mod_testata {
/// <summary>
/// lblUser control.
/// A1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblUser;
protected global::System.Web.UI.HtmlControls.HtmlAnchor A1;
/// <summary>
/// btnUpdate control.
/// A2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton btnUpdate;
/// <summary>
/// lblDataOra control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDataOra;
/// <summary>
/// ibHome control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image ibHome;
/// <summary>
/// lblTitolo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblTitolo;
/// <summary>
/// Menu1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Menu Menu1;
/// <summary>
/// SiteMapDS control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.SiteMapDataSource SiteMapDS;
protected global::System.Web.UI.HtmlControls.HtmlAnchor A2;
}
}
PROJ-ETS/PROJ-ETS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 273 KiB

PROJ-ETS/PROJ-ETS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll
BIN
View File
Binary file not shown.
PROJ-ETS/WE-settings.xml
+48
View File
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<webessentials version="1.9">
<settings>
<CoffeeScriptGenerateJsFile>True</CoffeeScriptGenerateJsFile>
<CoffeeScriptMinify>True</CoffeeScriptMinify>
<CoffeeScriptShowPreviewWindow>True</CoffeeScriptShowPreviewWindow>
<CoffeeScriptWrapClosure>True</CoffeeScriptWrapClosure>
<CssAutoCloseCurlyBraces>True</CssAutoCloseCurlyBraces>
<CssEnableMinification>True</CssEnableMinification>
<CssEnableSelectorHighligting>True</CssEnableSelectorHighligting>
<CssErrorLocation>1</CssErrorLocation>
<CssShowBrowserTooltip>True</CssShowBrowserTooltip>
<CssShowUnsupported>True</CssShowUnsupported>
<CssSyncVendorValues>True</CssSyncVendorValues>
<HtmlEnableMustache>True</HtmlEnableMustache>
<HtmlEnableZenCoding>True</HtmlEnableZenCoding>
<JavaScriptAutoCloseBraces>True</JavaScriptAutoCloseBraces>
<JavaScriptEnableMinification>True</JavaScriptEnableMinification>
<JavascriptEnableRegions>True</JavascriptEnableRegions>
<JavaScriptGenerateSourceMaps>True</JavaScriptGenerateSourceMaps>
<JavaScriptOutlining>True</JavaScriptOutlining>
<JsHint_bitwise>True</JsHint_bitwise>
<JsHint_browser>True</JsHint_browser>
<JsHint_debug>True</JsHint_debug>
<JsHint_devel>True</JsHint_devel>
<JsHint_eqeqeq>True</JsHint_eqeqeq>
<JsHint_es5>True</JsHint_es5>
<JsHint_expr>True</JsHint_expr>
<JsHint_jquery>True</JsHint_jquery>
<JsHint_laxbreak>True</JsHint_laxbreak>
<JsHint_laxcomma>True</JsHint_laxcomma>
<JsHint_maxerr>50</JsHint_maxerr>
<JsHint_regexdash>True</JsHint_regexdash>
<JsHint_smarttabs>True</JsHint_smarttabs>
<JsHintEnable>True</JsHintEnable>
<JsHintErrorLocation>2</JsHintErrorLocation>
<LessGenerateCssFile>True</LessGenerateCssFile>
<LessMinify>True</LessMinify>
<LessShowPreviewWindow>True</LessShowPreviewWindow>
<ScssGenerateCssFile>True</ScssGenerateCssFile>
<ScssMinify>True</ScssMinify>
<ScssShowPreviewWindow>True</ScssShowPreviewWindow>
<TypeScriptAddGeneratedFilesToProject>True</TypeScriptAddGeneratedFilesToProject>
<TypeScriptGenerateJsFile>True</TypeScriptGenerateJsFile>
<TypeScriptMinify>True</TypeScriptMinify>
<TypeScriptShowPreviewWindow>True</TypeScriptShowPreviewWindow>
</settings>
</webessentials>