Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

main.css added to parent content folder

  • Loading branch information...
commit 5f4ce75593561a548554b9212c3f9ac125f3a06f 1 parent 8d1af35
@ryanki1 authored
View
3  AddCon_TravellingSalesman/AddCon_TravellingSalesman.csproj
@@ -211,7 +211,7 @@
<Compile Include="Utilities\ExtensionMethods.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="Content\app\main.css">
+ <Content Include="Content\main.css">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Content\fonts\cabinsketch-regular.svg" />
@@ -478,6 +478,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="Content\app\" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
View
12 AddCon_TravellingSalesman/App_Start/BundleConfig.cs
@@ -8,15 +8,10 @@ public class BundleConfig
// For more information on Bundling, visit http://go.microsoft.com/fwlink/?LinkId=254725
public static void RegisterBundles(BundleCollection bundles)
{
- //bundles.Add(new ScriptBundle("~/bundles/salesman").Include(
- // "~/Scripts/App/Salesman.js"
- // ));
- // GEO
+
bundles.Add(new ScriptBundle("~/bundles/geo").Include(
"~/Scripts/tutScript.js"));
- //bundles.Add(new StyleBundle("~/bundles/geoCss").Include(
- // "~/Content/tut-style.css"));
- // GEO
+
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
"~/Scripts/jquery-1.*"));
@@ -33,14 +28,13 @@ public static void RegisterBundles(BundleCollection bundles)
bundles.Add(new ScriptBundle("~/bundles/app").Include(
"~/Scripts/App/config.js",
"~/Scripts/App/common.js",
- //"~/Scripts/App/geo.js",
"~/Scripts/App/app.js"));
bundles.Add(new ScriptBundle("~/bundles/jquerymobile").Include("~/Scripts/jquery.mobile*"));
bundles.Add(new StyleBundle("~/Content/css").Include("~/Content/ts.css"));
- bundles.Add(new StyleBundle("~/Content/app").Include("~/Content/app/*.css"));
+ bundles.Add(new StyleBundle("~/Content/app").Include("~/Content/main.css"));
bundles.Add(new StyleBundle("~/Content/mobilecss").Include("~/Content/jquery.mobile*"));
View
8 AddCon_TravellingSalesman/Content/app/main.css → AddCon_TravellingSalesman/Content/main.css
@@ -5,7 +5,7 @@
padding: 0;
}
body {
- background: url("../images/background.jpg") repeat-x scroll left top #DDDEDD;
+ background: url("./images/background.jpg") repeat-x scroll left top #DDDEDD;
}
#container {
margin-left: auto;
@@ -180,11 +180,11 @@ body {
}
.hover {
- background: url("../images/menu-bg-addcon.gif") repeat-x scroll 0 0 transparent !important;
+ background: url("./images/menu-bg-addcon.gif") repeat-x scroll 0 0 transparent !important;
text-decoration: none;
}
.menu-buttonlist ul li a, .menu-buttonlist ul li a:hover {
- background: url("../images/menu-bg-inactive.gif") repeat-x scroll 0 0 transparent;
+ background: url("./images/menu-bg-inactive.gif") repeat-x scroll 0 0 transparent;
color: #FFFFFF;
display: block;
height: 22px;
@@ -192,7 +192,7 @@ body {
width: 440px;
}
.menu-buttonlist ul li a:hover {
- background: url("../images/menu-bg-addcon.gif") repeat-x scroll 0 0 transparent;
+ background: url("./images/menu-bg-addcon.gif") repeat-x scroll 0 0 transparent;
text-decoration: none;
}
.menu-buttonlist ul li#menuitem-424 a {
View
BIN  AddCon_TravellingSalesman/bin/AddCon_TravellingSalesman.dll
Binary file not shown
View
BIN  AddCon_TravellingSalesman/bin/AddCon_TravellingSalesman.pdb
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.