Skip to content

Commit 6f55ce9

Browse files
committed
Merge pull request dpaquette#25 from dpaquette/Style_and_Layout
Style and layout
2 parents d444dec + d9db60e commit 6f55ce9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+10858
-1648
lines changed

src/BugTracker.Web/BugTracker.Web.csproj

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@
122122
</ItemGroup>
123123
<ItemGroup>
124124
<Content Include="btnet_css_for_email.css.renamed" />
125+
<Content Include="Content\btnet-bootstrap-theme.css" />
126+
<Content Include="Content\bootstrap-theme.css" />
127+
<Content Include="Content\bootstrap-theme.min.css" />
128+
<Content Include="Content\bootstrap.css" />
129+
<Content Include="Content\bootstrap.min.css" />
130+
<Content Include="Content\images\btnet.png" />
125131
<Content Include="Content\images\ExternalLink.png" />
126132
<Content Include="Content\images\ExternalLink.svg" />
127133
<Content Include="Content\images\ui-bg_diagonals-thick_18_b81900_40x40.png" />
@@ -145,9 +151,13 @@
145151
<Content Include="Content\style\jquery.mobile.custom.structure.min.css" />
146152
<Content Include="Content\style\jquery.mobile.custom.theme.css" />
147153
<Content Include="Content\style\jquery.mobile.custom.theme.min.css" />
154+
<Content Include="Controls\Footer.ascx" />
148155
<Content Include="Controls\MainMenu.ascx" />
149156
<Content Include="edit_area\edit_area_full.gz" />
157+
<Content Include="fonts\glyphicons-halflings-regular.svg" />
150158
<Content Include="packages.config" />
159+
<Content Include="Scripts\bootstrap.js" />
160+
<Content Include="Scripts\bootstrap.min.js" />
151161
<Content Include="Scripts\ckeditor\adapters\jquery.js" />
152162
<Content Include="Scripts\ckeditor\build-config.js" />
153163
<Content Include="Scripts\ckeditor\ckeditor.js" />
@@ -426,6 +436,11 @@
426436
<Content Include="Scripts\ckeditor\bower.json" />
427437
<Content Include="LoggedIn.Master" />
428438
<Content Include="LoggedOut.Master" />
439+
<Content Include="fonts\glyphicons-halflings-regular.woff" />
440+
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
441+
<Content Include="fonts\glyphicons-halflings-regular.eot" />
442+
<Content Include="Content\bootstrap-theme.css.map" />
443+
<Content Include="Content\bootstrap.css.map" />
429444
<None Include="Web.Debug.config">
430445
<DependentUpon>Web.config</DependentUpon>
431446
</None>
@@ -615,7 +630,6 @@
615630
<Content Include="mbug.aspx" />
616631
<Content Include="mbugs.aspx" />
617632
<Content Include="merge_bug.aspx" />
618-
<Content Include="mlogin.aspx" />
619633
<Content Include="notifications.aspx" />
620634
<Content Include="orgs.aspx" />
621635
<Content Include="paste_plain.png" />
@@ -633,6 +647,7 @@
633647
<Content Include="Scripts\jquery-ui.js" />
634648
<Content Include="Scripts\jquery-ui.min.js" />
635649
<Content Include="Scripts\jquery.mobile-1.4.4.min.js" />
650+
<Content Include="Scripts\npm.js" />
636651
<Content Include="Scripts\r.js" />
637652
<Content Include="Scripts\require.js" />
638653
<Content Include="search.aspx" />
@@ -731,6 +746,13 @@
731746
<Compile Include="BasePage.cs">
732747
<SubType>ASPXCodeBehind</SubType>
733748
</Compile>
749+
<Compile Include="Controls\Footer.ascx.cs">
750+
<DependentUpon>Footer.ascx</DependentUpon>
751+
<SubType>ASPXCodeBehind</SubType>
752+
</Compile>
753+
<Compile Include="Controls\Footer.ascx.designer.cs">
754+
<DependentUpon>Footer.ascx</DependentUpon>
755+
</Compile>
734756
<Compile Include="LoggedIn.Master.cs">
735757
<DependentUpon>LoggedIn.Master</DependentUpon>
736758
<SubType>ASPXCodeBehind</SubType>
@@ -1217,13 +1239,6 @@
12171239
<Compile Include="merge_bug.aspx.designer.cs">
12181240
<DependentUpon>merge_bug.aspx</DependentUpon>
12191241
</Compile>
1220-
<Compile Include="mlogin.aspx.cs">
1221-
<DependentUpon>mlogin.aspx</DependentUpon>
1222-
<SubType>ASPXCodeBehind</SubType>
1223-
</Compile>
1224-
<Compile Include="mlogin.aspx.designer.cs">
1225-
<DependentUpon>mlogin.aspx</DependentUpon>
1226-
</Compile>
12271242
<Compile Include="notifications.aspx.cs">
12281243
<DependentUpon>notifications.aspx</DependentUpon>
12291244
<SubType>ASPXCodeBehind</SubType>

0 commit comments

Comments
 (0)