-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
ff64013
commit 6d3ec87
Showing
22 changed files
with
5,822 additions
and
3,006 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,78 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>@ViewData["Title"] - GenericMvc.Test.App</title> | ||
|
|
||
| <environment names="Development"> | ||
| <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" /> | ||
| <link rel="stylesheet" href="~/css/site.css" /> | ||
| </environment> | ||
| <environment names="Staging,Production"> | ||
| <link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.6/css/bootstrap.min.css" | ||
| asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css" | ||
| asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" /> | ||
| <link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" /> | ||
| </environment> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>@ViewData["Title"] - Test Website</title> | ||
| <!-- Material Design fonts --> | ||
| <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css"> | ||
| <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> | ||
| <environment names="Development,Staging,Production"> | ||
| <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" /> | ||
| <link rel="stylesheet" href="~/css/material-dist/bootstrap-material-design.css" /> | ||
| <link rel="stylesheet" href="~/lib/bootstrap-material-design/dist/css/ripples.css" /> | ||
| <link rel="stylesheet" href="~/lib/dropdown.js/jquery.dropdown.css" /> | ||
| <link rel="stylesheet" href="~/css/site.css" /> | ||
| </environment> | ||
| @RenderSection("stylesheets", required: false) | ||
| </head> | ||
| <body> | ||
| <div class="navbar navbar-inverse navbar-fixed-top"> | ||
| <div class="container"> | ||
| <div class="navbar-header"> | ||
| <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> | ||
| <span class="sr-only">Toggle navigation</span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">GenericMvc.Test.App</a> | ||
| </div> | ||
| <div class="navbar-collapse collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li> | ||
| <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li> | ||
| <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li> | ||
| <li><a asp-area="" asp-controller="Models" asp-action="Index">Models</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="container body-content"> | ||
| @RenderBody() | ||
| <hr /> | ||
| <footer> | ||
| <p>© 2017 - GenericMvc.Test.App</p> | ||
| </footer> | ||
| </div> | ||
| <nav class="navbar navbar-fixed-top" role="navigation"> | ||
| <div class="container-fluid"> | ||
| <div class="navbar-header"> | ||
| <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> | ||
| <span class="sr-only">Toggle navigation</span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| <a asp-controller="Home" asp-action="Index" class="navbar-brand">Test Website</a> | ||
| </div> | ||
| <div class="navbar-collapse collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <li><a asp-controller="Home" asp-action="Index"><i class="material-icons">home</i> Home</a></li> | ||
| <li><a asp-controller="Home" asp-action="About"><i class="material-icons">info_outline</i> About</a></li> | ||
| <li><a asp-controller="Home" asp-action="Contact"><i class="material-icons">mail_outline</i> Contact</a></li> | ||
| <li><a asp-controller="Models" asp-action="Index">Models</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </nav> | ||
| @*style="padding-top: 65px"*@ | ||
| <main class="container"> | ||
| @RenderBody() | ||
| </main> | ||
| <footer class="parentfooter"> | ||
| <div class="container"> | ||
| <hr class="shadow-z-2" style="background-color: #0D47A1" /> | ||
| <ul class="list-inline"> | ||
| <li>Copyright © 2017 Joshua Clark</li> | ||
| <li class="pull-right">Designed And Built By: <a href="mailto:[email protected]">Joshua Clark</a></li> | ||
| </ul> | ||
| </div> | ||
| </footer> | ||
| <environment names="Development,Staging,Production"> | ||
| <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/bootstrap-material-design/dist/js/ripples.js"></script> | ||
| <script src="~/lib/bootstrap-material-design/dist/js/material.js"></script> | ||
| <script src="~/lib/dropdown.js/jquery.dropdown.js"></script> | ||
| <script src="~/lib/jquery-autosize/dist/autosize.min.js"></script> | ||
| </environment> | ||
| @RenderSection("scripts", required: false) | ||
| <script> | ||
| $(window).on('load resize', function () { | ||
| $('body').css({ "padding-top": ($(".navbar").height() + 10) + "px" }) | ||
| }); | ||
| $(document).ready(function () { | ||
| $.material.init(); | ||
| <environment names="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> | ||
| </environment> | ||
| <environment names="Staging,Production"> | ||
| <script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js" | ||
| asp-fallback-src="~/lib/jquery/dist/jquery.min.js" | ||
| asp-fallback-test="window.jQuery"> | ||
| </script> | ||
| <script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.6/bootstrap.min.js" | ||
| asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js" | ||
| asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"> | ||
| </script> | ||
| <script src="~/js/site.min.js" asp-append-version="true"></script> | ||
| </environment> | ||
| autosize(document.querySelectorAll('textarea')); | ||
| @RenderSection("scripts", required: false) | ||
| $("select").dropdown({ "autoinit": "select" }); | ||
| }); | ||
| </script> | ||
| </body> | ||
| </html> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,16 @@ | ||
| { | ||
| "name": "asp.net", | ||
| "name": "ASP.NET", | ||
| "private": true, | ||
| "dependencies": { | ||
| "bootstrap": "3.3.6", | ||
| "jquery": "2.2.0", | ||
| "jquery-validation": "1.14.0", | ||
| "jquery-validation-unobtrusive": "3.2.6" | ||
| "bootstrap": "3.3.6", | ||
| "bootstrap-material-design": "0.5.9", | ||
| "jquery": "2.2.0", | ||
| "jquery-validation": "1.15.1", | ||
| "jquery-validation-unobtrusive": "3.2.6", | ||
| "jquery-autosize": "3.0.17", | ||
| "dropdown.js": "*" | ||
| }, | ||
| "resolutions": { | ||
| "jquery": ">=1.8" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.