Skip to content

Commit

Permalink
Gfs/narrow view navbar (#144)
Browse files Browse the repository at this point in the history
* Fixes collapsed navbar

* Switch to using local js for production

* Switch to using local js for production

* Simplifying js imports

* Simplifying lib resources
  • Loading branch information
gfs authored Apr 23, 2019
1 parent ee6316d commit c8af4bc
Show file tree
Hide file tree
Showing 47 changed files with 14 additions and 58,969 deletions.
33 changes: 9 additions & 24 deletions Gui/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<title>Attack Surface Analyzer Preview</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
<link rel="localizations" href="~/lib/American-English.json" type="application/vnd.oftn.l10n+json" />
<link rel="localizations" href="~/American-English.json" type="application/vnd.oftn.l10n+json" />
@{
if (!TelemetryConfiguration.Active.DisableTelemetry)
{
Expand Down Expand Up @@ -80,29 +80,14 @@
<img src="~/images/microsoft-gray.png" style="height:30px" alt="Microsoft Corporation Logo" /> v. @Helpers.GetVersionString()
</nav>

<environment include="Development">
<script src="~/lib/jquery/dist/jquery.js"></script>
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
<script src="~/lib/l10n.js"></script>



</environment>
<environment exclude="Development">
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.3.1.min.js"
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
asp-fallback-test="window.jQuery"
crossorigin="anonymous"
integrity=""></script>


<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
<script src="~/lib/l10n.js"></script>

</environment>
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-3.3.1.min.js"
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
asp-fallback-test="window.jQuery"
crossorigin="anonymous"
integrity=""></script> <script src="~/lib/popper.min.js"></script>
<script src="~/lib/bootstrap.min.js"></script>
<script src="~/js/site.js" asp-append-version="true"></script>
<script src="~/lib/l10n.js"></script>

@RenderSection("Scripts", required: false)
</body>
Expand Down
6 changes: 3 additions & 3 deletions Gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
"description": "",
"main": "main.js",
"author": "Microsoft Corporation",
"license": "ISC",
"license": "MIT",
"scripts": {
"start": "tsc -p ."
},
"dependencies": {
"portscanner": "^2.2.0",
"socket.io": "^2.2.0",
"electron": "4.1.1"
"electron": "^4.1.3"
},
"devDependencies": {
"@types/node": "^10.12.18",
"@types/socket.io": "^2.1.2",
"tslint": "^5.14.0",
"typescript": "^3.4.1",
"electron": "4.1.1"
"electron": "^4.1.3"
}
}
File renamed without changes.
2 changes: 1 addition & 1 deletion Gui/wwwroot/js/Collect.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function StartCollection()
EnableCollectionFields();
}
else {
$('#ScanStatus').append($('<div/>', { html: '<i class="fas fa-cog fa-spin"></i> <i>'+l('CollectionHasStarted')+'</i>' }));
$('#ScanStatus').append($('<div/>', { html: '<i class="fas fa-cog fa-spin"></i> <i>'+l('%CollectionHasStarted')+'</i>' }));
setTimeout(GetCollectors, 1000)
}
});
Expand Down
File renamed without changes.
Loading

0 comments on commit c8af4bc

Please sign in to comment.