Skip to content

Commit

Permalink
Fixed minor styling problems
Browse files Browse the repository at this point in the history
  • Loading branch information
joszz committed Jun 2, 2021
1 parent d4a7883 commit 3150a24
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 30 deletions.
14 changes: 3 additions & 11 deletions RDPMonWebGUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@

<PropertyGroup>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<Version>1.1.0</Version>
<Version>1.3.1</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<UserSecretsId>01460183-e12f-43e8-b4bd-1e7a6d188df1</UserSecretsId>
<AssemblyVersion>1.2.0.0</AssemblyVersion>
<FileVersion>1.2.0.0</FileVersion>
<AssemblyVersion>1.3.1.0</AssemblyVersion>
<FileVersion>1.3.1.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -75,12 +75,4 @@
<Folder Include="wwwroot\lib\bootstrap\" />
</ItemGroup>

<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="build-post.cmd" />
</Target>

<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="build-pre.cmd" />
</Target>

</Project>
4 changes: 2 additions & 2 deletions Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

@if (Model.RecordActionButtons.Count != 0)
{
<th class="text-right">Actions</th>
<th class="text-end">Actions</th>
}
</tr>
</thead>
Expand All @@ -44,7 +44,7 @@

@foreach (RecordActionButton btn in Model.RecordActionButtons)
{
<td class="text-right">
<td class="text-end">
<a href="@Url.ActionLink(btn.Action, btn.Controller, new { id = record.Id })" @(string.Join(' ', btn.Attributes)) class="@btn.CssClass"></a>
</td>
}
Expand Down
9 changes: 7 additions & 2 deletions Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />

<script defer src="~/lib/jquery/dist/jquery.js" asp-append-version="true"></script>
<script defer src="~/lib/bootstrap/dist/js/bootstrap.js" asp-append-version="true"></script>
<script defer src="~/lib/bootstrap/js/dist/dom/data.js" asp-append-version="true"></script>
<script defer src="~/lib/bootstrap/js/dist/dom/manipulator.js" asp-append-version="true"></script>
<script defer src="~/lib/bootstrap/js/dist/dom/selector-engine.js" asp-append-version="true"></script>
<script defer src="~/lib/bootstrap/js/dist/dom/event-handler.js" asp-append-version="true"></script>
<script defer src="~/lib/bootstrap/js/dist/base-component.js" asp-append-version="true"></script>
<script defer src="~/lib/bootstrap/js/dist/collapse.js" asp-append-version="true"></script>
<script defer src="~/lib/fancybox/jquery.fancybox.js" asp-append-version="true"></script>
<script defer src="~/js/site.js" asp-append-version="true"></script>
</environment>
Expand All @@ -36,7 +41,7 @@
<div class="container">
<a class="navbar-brand" href="@homeLink">RDPMonWebGUI</a>

<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-content">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-content">
<span class="navbar-toggler-icon"></span>
</button>

Expand Down
7 changes: 0 additions & 7 deletions build-post.cmd

This file was deleted.

7 changes: 0 additions & 7 deletions build-pre.cmd

This file was deleted.

2 changes: 1 addition & 1 deletion wwwroot/css/site.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $font-family-base: Roboto-Regular, Arial;
@import "../lib/bootstrap/scss/tables";
@import "../lib/bootstrap/scss/forms";
@import "../lib/bootstrap/scss/buttons";
//@import "../lib/bootstrap/scss/transitions";
@import "../lib/bootstrap/scss/transitions";
//@import "../lib/bootstrap/scss/dropdown";
@import "../lib/bootstrap/scss/button-group";
@import "../lib/bootstrap/scss/nav";
Expand Down

0 comments on commit 3150a24

Please sign in to comment.