Fixed responsive menu

joszz · Aug 10, 2020 · c39097c · c39097c
1 parent 6d185b4
commit c39097c
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 182 deletions.
diff --git a/App_Start/BundleConfig.cs b/App_Start/BundleConfig.cs
@@ -15,6 +15,8 @@ public static void RegisterBundles(BundleCollection bundles)
                 "~/Content/Vendor/jquery.vibrate/jquery.vibrate.js",
                 "~/Content/Vendor/waves/waves.js",
                 "~/Content/Vendor/sorttable/sorttable.js",
+                "~/Content/Vendor/bootstrap/js/dist/util.js",
+                "~/Content/Vendor/bootstrap/js/dist/collapse.js",
 
                 "~/Content/Scripts/general.js"
             ));

diff --git a/Content/Styles/Bootstrap.scss b/Content/Styles/Bootstrap.scss
@@ -10,7 +10,7 @@
 @import "../Vendor/bootstrap/scss/tables";
 //@import "../Vendor/bootstrap/scss/forms";
 @import "../Vendor/bootstrap/scss/buttons";
-//@import "../Vendor/bootstrap/scss/transitions";
+@import "../Vendor/bootstrap/scss/transitions";
 //@import "../Vendor/bootstrap/scss/dropdown";
 @import "../Vendor/bootstrap/scss/button-group";
 //@import "../Vendor/bootstrap/scss/input-group";

diff --git a/Content/Styles/Default.css b/Content/Styles/Default.css
diff --git a/Content/Styles/Default.min.css b/Content/Styles/Default.min.css
diff --git a/HyperVAdmin.csproj b/HyperVAdmin.csproj
@@ -149,60 +149,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Fonts\icomoon.svg" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-grid.css" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-grid.min.css" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-reboot.css" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-reboot.min.css" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap.css" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap.min.css" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.bundle.js" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.bundle.min.js" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.js" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.min.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\alert.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\button.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\carousel.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\collapse.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\dropdown.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\index.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\modal.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\popover.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\scrollspy.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\tab.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\toast.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\tooltip.js" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\util.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\alert.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\button.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\carousel.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\collapse.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\dropdown.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\index.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\modal.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\popover.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\scrollspy.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\tab.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\toast.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\tools\sanitizer.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\tooltip.js" />
-    <Content Include="Content\Vendor\bootstrap\js\src\util.js" />
-    <Content Include="Content\Vendor\fancybox\jquery.fancybox.css" />
-    <Content Include="Content\Vendor\fancybox\jquery.fancybox.js" />
-    <Content Include="Content\Vendor\fancybox\jquery.fancybox.min.css" />
-    <Content Include="Content\Vendor\fancybox\jquery.fancybox.min.js" />
-    <Content Include="Content\Vendor\jquery-fullscreen-plugin\jquery.fullscreen-min.js" />
-    <Content Include="Content\Vendor\jquery-fullscreen-plugin\jquery.fullscreen-min.min.js" />
-    <Content Include="Content\Vendor\jquery-fullscreen-plugin\jquery.fullscreen.js" />
-    <Content Include="Content\Vendor\jquery-fullscreen-plugin\jquery.fullscreen.min.js" />
-    <Content Include="Content\Vendor\jquery.isloading\jquery.isloading.js" />
-    <Content Include="Content\Vendor\jquery.vibrate\jquery.vibrate.js" />
-    <Content Include="Content\Vendor\jquery\jquery.js" />
-    <Content Include="Content\Vendor\jquery\jquery.min.js" />
-    <Content Include="Content\Vendor\jquery\jquery.slim.js" />
-    <Content Include="Content\Vendor\jquery\jquery.slim.min.js" />
-    <Content Include="Content\Vendor\sorttable\sorttable.js" />
-    <Content Include="Content\Vendor\waves\waves.css" />
-    <Content Include="Content\Vendor\waves\waves.js" />
     <Content Include="Documentation\docfx\api\HyperVAdmin.Attributes.AJAXOnlyAttribute.html" />
     <Content Include="Documentation\docfx\api\HyperVAdmin.Attributes.html" />
     <Content Include="Documentation\docfx\api\HyperVAdmin.BundleConfig.html" />
@@ -395,128 +341,9 @@
     <Content Include="Documentation\docfx\xrefmap.yml" />
     <Content Include="Views\Session\Index.cshtml" />
     <Content Include="libman.json" />
-    <Content Include="Content\Vendor\jquery\jquery.min.map" />
-    <Content Include="Content\Vendor\jquery\jquery.slim.min.map" />
-    <Content Include="Content\Vendor\bootstrap\LICENSE" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-grid.css.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-grid.min.css.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-reboot.css.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap-reboot.min.css.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap.css.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\css\bootstrap.min.css.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.bundle.js.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.bundle.min.js.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.js.map" />
-    <Content Include="Content\Vendor\bootstrap\dist\js\bootstrap.min.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\alert.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\button.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\carousel.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\collapse.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\dropdown.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\index.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\modal.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\popover.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\scrollspy.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\tab.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\toast.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\tooltip.js.map" />
-    <Content Include="Content\Vendor\bootstrap\js\dist\util.js.map" />
-    <Content Include="Content\Vendor\bootstrap\package.json" />
-    <Content Include="Content\Vendor\bootstrap\README.md" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_alert.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_background-variant.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_alert.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_badge.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_border-radius.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_box-shadow.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_breakpoints.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_buttons.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_caret.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_clearfix.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_deprecate.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_float.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_forms.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_gradients.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_grid-framework.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_grid.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_hover.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_image.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_list-group.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_lists.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_nav-divider.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_pagination.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_reset-text.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_resize.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_screen-reader.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_size.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_table-row.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_text-emphasis.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_text-hide.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_text-truncate.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_transition.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\mixins\_visibility.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_align.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_background.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_borders.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_clearfix.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_display.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_embed.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_flex.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_float.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_interactions.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_overflow.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_position.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_screenreaders.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_shadows.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_sizing.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_spacing.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_stretched-link.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_text.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\utilities\_visibility.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_badge.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_breadcrumb.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_button-group.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_buttons.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_card.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_carousel.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_close.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_code.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_custom-forms.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_dropdown.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_forms.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_functions.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_grid.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_images.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_input-group.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_jumbotron.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_list-group.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_media.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_mixins.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_modal.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_nav.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_navbar.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_pagination.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\vendor\_rfs.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_popover.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_print.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_progress.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_reboot.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_root.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_spinners.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_tables.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_toasts.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_tooltip.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\bootstrap-grid.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\bootstrap-reboot.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\bootstrap.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_transitions.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_type.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_utilities.scss" />
-    <Content Include="Content\Vendor\bootstrap\scss\_variables.scss" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Content\Vendor\fortawesome\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Index\Index.cshtml" />

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.3")]
-[assembly: AssemblyFileVersion("1.3")]
+[assembly: AssemblyVersion("1.3.1")]
+[assembly: AssemblyFileVersion("1.3.1")]
diff --git a/Views/Shared/_Menu.cshtml b/Views/Shared/_Menu.cshtml
@@ -21,15 +21,15 @@
                 <ul class="navbar-nav ml-auto">
                     @if ((bool)ViewBag.HyperVEnabled)
                     {
-                        <li @Html.Raw(currentController == "VMs" ? "class='active'" : null)>
+                        <li class="nav-item">
 
-                            @Html.ActionLink("Virtual machines", "Index", "VMs", null, new { @class = "text-light ml-3" })
+                            @Html.ActionLink("Virtual machines", "Index", "VMs", null, new { @class = "nav-link" + (currentController == "VMs" ? " active" : null) })
                         </li>
                     }
                     @if ((bool)ViewBag.IISEnabled)
                     {
-                        <li @Html.Raw(currentController == "Sites" ? "class='active'" : null)>
-                            @Html.ActionLink("Sites", "Index", "Sites", null, new { @class = "text-light  ml-3" }))
+                        <li class="nav-item">
+                            @Html.ActionLink("Sites", "Index", "Sites", null, new { @class = "nav-link" + (currentController == "Sites" ? " active" : null) })
                         </li>
                     }
                 </ul>