Skip to content

Commit

Permalink
Merge pull request #216 from pkgw/more-cleanups
Browse files Browse the repository at this point in the history
More cleanups
  • Loading branch information
pkgw authored Nov 22, 2020
2 parents 7f7067d + 36b488e commit 9e2b7b3
Show file tree
Hide file tree
Showing 31 changed files with 115 additions and 82,352 deletions.
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,3 @@ x64/
# Database file
Database.jfm
/tools/PlateManager/Properties/launchSettings.json

# npm content
/src/WWTMVC5/Content/bootstrap
/src/WWTMVC5/Content/fonts
4 changes: 2 additions & 2 deletions init.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ Push-Location src/WWTMVC5
bower install
if (-not $?) { throw "bower install failed with error code $LastExitCode" }

grunt copy
if (-not $?) { throw "grunt copy failed with error code $LastExitCode" }
grunt vendor dist-css
if (-not $?) { throw "grunt failed with error code $LastExitCode" }
Pop-Location
8 changes: 8 additions & 0 deletions src/WWTMVC5/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/Content/bootstrap/
/Content/fonts/
/Content/CSS/wwt.css
/Content/CSS/wwt.css.map
/Content/CSS/wwt.min.css
/Scripts/ext/angular.js
/Scripts/ext/bootstrap.js
/Scripts/ext/jquery.js
22 changes: 0 additions & 22 deletions src/WWTMVC5/App_Start/BundleConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,6 @@ public class BundleConfig
// For more information on bundling, visit http://go.microsoft.com/fwlink/?LinkId=301862
public static void RegisterBundles(BundleCollection bundles)
{
//bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
// "~/Scripts/jquery-{version}.js"));

//bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include(
// "~/Scripts/jquery.validate*"));

//// Use the development version of Modernizr to develop with and learn from. Then, when you're
//// ready for production, use the build tool at http://modernizr.com to pick only the tests you need.
//bundles.Add(new ScriptBundle("~/bundles/modernizr").Include(
// "~/Scripts/modernizr-*"));

//bundles.Add(new ScriptBundle("~/bundles/bootstrap").Include(
// "~/Scripts/bootstrap.js",
// "~/Scripts/respond.js"));

//bundles.Add(new StyleBundle("~/Content/css").Include(
// "~/Content/bootstrap.css",
// "~/Content/site.css"));

// Set EnableOptimizations to false for debugging. For more information,
// visit http://go.microsoft.com/fwlink/?LinkId=301862
//BundleTable.EnableOptimizations = true;
}
}
}
2 changes: 0 additions & 2 deletions src/WWTMVC5/Content/CSS/bootswatch.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Bootswatch
// -----------------------------------------------------

@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");

.btn-shadow(@color) {
#gradient > .vertical-three-colors(lighten(@color, 15%), @color, 50%, darken(@color, 4%));
border: 1px solid darken(@color, 10%);
Expand Down
Loading

0 comments on commit 9e2b7b3

Please sign in to comment.