jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: FontAwesome Added

Browse Source 
FontAwesome 4.0.3.1 Added, and an initial pass to replace bitmap icons.
This commit is contained in:
Gary Sharp
2013-12-24 16:22:26 +11:00
parent f1ee2937cd
commit 20263905f9
63 changed files with 3682 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Views/Device/DeviceParts/_Resources.cshtml
+3 -3
View File
@@ -32,7 +32,7 @@
else
{ @da.Comments }}
</span><span class="author">@da.TechUser.ToString()</span>@if (canRemoveAnyAttachments || (canRemoveOwnAttachments && da.TechUserId == CurrentUser.Id))
{<text><span class="remove"></span></text>}<span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.FromNow()</span>
{<text><span class="remove fa fa-times-circle"></span></text>}<span class="timestamp" title="@da.Timestamp.ToFullDateTime()">@da.Timestamp.FromNow()</span>
</a>
}
}
@@ -40,7 +40,7 @@
@if (canAddAttachments)
{
<div class="attachmentInput clearfix">
<span class="action upload"></span><span class="action photo"></span>
<span class="action upload fa fa-upload" title="Attach File"></span><span class="action photo fa fa-camera" title="Capture Image"></span>
</div>
}
<script type="text/javascript">
@@ -144,7 +144,7 @@
function buildAttachment(a, canRemove, quick) {
var t = '<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span>';
if (canRemove)
t += '<span class="remove"></span>';
t += '<span class="remove fa fa-times-circle"></span>';
t += '<span class="timestamp"></span></a>';
var e = $(t);
Disco.Web/Views/Device/DeviceParts/_Resources.generated.cs
+13 -9
View File
@@ -252,13 +252,13 @@ WriteLiteral("</span>");
#line hidden
WriteLiteral("<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>");
#line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
}
}
#line default
#line hidden
@@ -266,21 +266,21 @@ WriteLiteral("<span");
WriteLiteral(" class=\"timestamp\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2125), Tuple.Create("\"", 2163)
WriteAttribute("title", Tuple.Create(" title=\"", 2144), Tuple.Create("\"", 2182)
#line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
, Tuple.Create(Tuple.Create("", 2133), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
, Tuple.Create(Tuple.Create("", 2152), Tuple.Create<System.Object, System.Int32>(da.Timestamp.ToFullDateTime()
#line default
#line hidden
, 2133), false)
, 2152), false)
);
WriteLiteral(">");
#line 35 "..\..\Views\Device\DeviceParts\_Resources.cshtml"
Write(da.Timestamp.FromNow());
Write(da.Timestamp.FromNow());
#line default
@@ -317,11 +317,15 @@ WriteLiteral(" class=\"attachmentInput clearfix\"");
WriteLiteral(">\r\n <span");
WriteLiteral(" class=\"action upload\"");
WriteLiteral(" class=\"action upload fa fa-upload\"");
WriteLiteral(" title=\"Attach File\"");
WriteLiteral("></span><span");
WriteLiteral(" class=\"action photo\"");
WriteLiteral(" class=\"action photo fa fa-camera\"");
WriteLiteral(" title=\"Capture Image\"");
WriteLiteral("></span>\r\n </div>\r\n");
@@ -551,7 +555,7 @@ WriteLiteral(" class=\"author\"");
WriteLiteral("></span>\';\r\n if (canRemove)\r\n " +
" t += \'<span");
WriteLiteral(" class=\"remove\"");
WriteLiteral(" class=\"remove fa fa-times-circle\"");
WriteLiteral("></span>\';\r\n t += \'<span");