Leahnaya/pkmn-classic-framework
1
0
Fork 0
mirror of https://github.com/mm201/pkmn-classic-framework.git synced 2026-09-29 12:56:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

s/script/scripts

Browse Source
This commit is contained in:
Greg Edwards
2015-02-14 19:34:16 -05:00
parent c5e3602274
commit abb379988c
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/controls/LabelTextBox.ascx
View File

@@ -2,8 +2,8 @@
<%@ Register TagPrefix="pf" Namespace="PkmnFoundations.Web" Assembly="PkmnFoundations.Web" %>
<pf:RequireCss Key="form" CssUrl="~/css/form.css" After="main" runat="server" />
<pf:RequireScript Key="jquery" ScriptUrl="~/script/jquery-1.11.1.min.js" runat="server" />
<pf:RequireScript Key="form" ScriptUrl="~/script/form.js" runat="server" />
<pf:RequireScript Key="jquery" ScriptUrl="~/scripts/jquery-1.11.1.min.js" runat="server" />
<pf:RequireScript Key="form" ScriptUrl="~/scripts/form.js" runat="server" />
<div class="pfLabelTextBox">
<asp:Label ID="theLabel" AssociatedControlID="theTextBox" runat="server" />

4
web/masters/MasterPage.master
View File

@@ -11,8 +11,8 @@
<link rel="shortcut icon" href="~/favicon.ico?1" type="image/vnd.microsoft.icon" />
<pf:RequireCss Key="main" CssUrl="~/css/main.css" runat="server" />
<pf:RequireScript Key="jquery" ScriptUrl="~/script/jquery-1.11.1.min.js" runat="server" />
<pf:RequireScript Key="retina" After="jquery" ScriptUrl="~/script/retina.js" runat="server" />
<pf:RequireScript Key="jquery" ScriptUrl="~/scripts/jquery-1.11.1.min.js" runat="server" />
<pf:RequireScript Key="retina" After="jquery" ScriptUrl="~/scripts/retina.js" runat="server" />
</head>
<body class="<%= HeaderCssClass %>">
<asp:Literal ID="litHeaderCssClassKeep" Visible="false" runat="server" />

0
web/script/form.js → web/scripts/form.js
View File

0
web/script/jquery-1.11.1.min.js → web/scripts/jquery-1.11.1.min.js vendored
View File

0
web/script/retina.js → web/scripts/retina.js
View File

6
web/web.csproj
View File

@@ -3452,9 +3452,9 @@
<Content Include="pad.bin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="script\form.js" />
<Content Include="script\jquery-1.11.1.min.js" />
<Content Include="script\retina.js" />
<Content Include="scripts\form.js" />
<Content Include="scripts\jquery-1.11.1.min.js" />
<Content Include="scripts\retina.js" />
<Content Include="test\BoxUp.aspx" />
<Content Include="test\Decode.aspx" />
<Content Include="test\NameDecode.aspx" />