Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make nav buttons larger and remove outline on back save and edit buttons #143

Merged
merged 7 commits into from
Sep 24, 2023
Merged

make nav buttons larger and remove outline on back save and edit buttons #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
697ffa1
btn outline => btn filled
Penguine-Os Sep 18, 2023
f6792cc
navbar simplification
Penguine-Os Sep 20, 2023
2073148
resolve comments
Penguine-Os Sep 24, 2023
a7e8c99
format and remove non existing css class
chrisK00 Sep 24, 2023
6336ec3
Merge branch 'dev' into feature/Make-nav-buttons-larger-and-remove-ou…
chrisK00 Sep 24, 2023
7b94f18
remove default styling
chrisK00 Sep 24, 2023
6219076
Merge branch 'dev' into feature/Make-nav-buttons-larger-and-remove-ou…
chrisK00 Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion subtrack.MAUI/Pages/UpsertSubscription.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@implements IAsyncDisposable
<div class="d-flex justify-content-between" style="padding-bottom: 20px;">
<BackButton Url="@ReturnUrl"></BackButton>
<button type="submit" form="SubscriptionForm" class="btn btn-outline-success">
<button type="submit" form="SubscriptionForm" class="btn btn-success">
<i class="fa-solid fa-floppy-disk"></i>
</button>
</div>
Expand All @@ -17,7 +17,7 @@
<div>
<ValidationSummary />
<DataAnnotationsValidator/>
<InputText class="form-control" placeholder="Service Name" @bind-Value="@_subscription.Name"></InputText>

Check warning on line 20 in subtrack.MAUI/Pages/UpsertSubscription.razor

View workflow job for this annotation

GitHub Actions / build 

Dereference of a possibly null reference.
</div>
<div class="input-group mb-3" style="padding-top: 15px;">
<span class="input-group-text">@_currency</span>
Expand Down Expand Up @@ -86,7 +86,7 @@
{
RegionInfo ri = new RegionInfo(System.Threading.Thread.CurrentThread.CurrentUICulture.LCID);
_currency = ri.ISOCurrencySymbol;
_subscription.LastPayment = DateTime.Today;

Check warning on line 89 in subtrack.MAUI/Pages/UpsertSubscription.razor

View workflow job for this annotation

GitHub Actions / build 

Dereference of a possibly null reference.
}

protected override async Task OnParametersSetAsync()
Expand All @@ -96,7 +96,7 @@
_subscription = await SubscriptionService.GetByIdIfExists(Id.Value);
} else
{
_subscription.PrimaryColor = backgroundColorOptions.First();

Check warning on line 99 in subtrack.MAUI/Pages/UpsertSubscription.razor

View workflow job for this annotation

GitHub Actions / build 

Dereference of a possibly null reference.
}
}

Expand Down
2 changes: 1 addition & 1 deletion subtrack.MAUI/Shared/Components/BackButton.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@inject NavigationManager NavigationManager

<button class="btn btn-outline-primary" @onclick="() => NavigationManager.NavigateTo(Url)">
<button class="btn btn-primary" @onclick="() => NavigationManager.NavigateTo(Url)">
<i class="fa-solid fa-arrow-left"></i>
</button>

Expand Down
2 changes: 1 addition & 1 deletion subtrack.MAUI/Shared/Components/EditButton.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@inject NavigationManager NavigationManager

<button aria-label="Edit" type="button" class="btn btn-outline-info" @onclick="() => NavigationManager.NavigateTo(Url)">
<button aria-label="Edit" type="button" class="btn btn-info" @onclick="() => NavigationManager.NavigateTo(Url)">
<i class="bi bi-pencil-square"></i>
</button>

Expand Down
33 changes: 15 additions & 18 deletions subtrack.MAUI/Shared/NavBar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<style>
.custom-navbar {
height: 50px; /* Adjust the height value as needed */
height: 4.1rem; /* Adjust the height value as needed */
}
</style>

<nav class="navbar navbar-expand bg-dark fixed-bottom justify-content-center custom-navbar" data-bs-theme="dark">
<div id="navbarColor02">
<ul class="navbar-nav">
<li class="nav-item">
<NavLink class="nav-link d-flex flex-column align-items-center" href="/" Match="NavLinkMatch.All">
<i class="bi bi-house"></i>
<span>Home</span>
</NavLink>
</li>
<li class="nav-item">
<NavLink class="nav-link d-flex flex-column align-items-center" href="monthly" Match="NavLinkMatch.Prefix">
<i class="bi bi-card-list"></i>
<span>Monthly</span>
</NavLink>
</li>
</ul>
</div>
<nav class="navbar navbar-expand bg-dark fixed-bottom custom-navbar justify-content-center" data-bs-theme="dark">

<ul class="navbar-nav">
<li class="nav-item">
<NavLink class="nav-link d-flex flex-column align-items-center pb-4 px-2" href="/" Match="NavLinkMatch.All">
<i class="bi bi-house" style="font-size: 1.65rem;"></i>
</NavLink>
</li>
<li class="nav-item ms-4">
<NavLink class="nav-link d-flex flex-column align-items-center pb-4 px-2" href="monthly" Match="NavLinkMatch.Prefix">
<i class="bi bi-calendar" style="font-size: 1.65rem;"></i>
</NavLink>
</li>
</ul>
</nav>
10 changes: 0 additions & 10 deletions subtrack.MAUI/wwwroot/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,6 @@ h1:focus {
outline: none;
}

a, .btn-link {
color: #0071c1;
}

.btn-primary {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}

.content {
padding-top: 1.1rem;
}
Expand Down
Loading