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

Merge for button updates #1136

Merged
merged 10 commits into from
Oct 10, 2024
Merged

Merge for button updates #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
847f6e6
Update most btn-primary and btn-secondary to new format
Iceinfly Oct 8, 2024
ec1e332
Resolve merge conflicts in btn updates
Iceinfly Oct 8, 2024
0e77eab
Update most btn-primary and btn-secondary to new format with proper m…
Iceinfly Oct 9, 2024
3e7884f
Take incoming for all merge conflicts
Iceinfly Oct 9, 2024
7587a82
Continued improvements to MC participants
k7hpn Oct 8, 2024
e06073f
Update most btn-primary and btn-secondary to new format
Iceinfly Oct 8, 2024
9888edd
Merge branch 'fix/bootstrap-5' of https://github.com/MCLD/greatreadin…
Iceinfly Oct 9, 2024
dd53fbd
Revert "Continued improvements to MC participants"
Iceinfly Oct 9, 2024
809ad42
Fix lost update caused by bad merge
Iceinfly Oct 9, 2024
1e2ec4c
Update first arrow button set to a new style
Iceinfly Oct 9, 2024
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
10 changes: 5 additions & 5 deletions src/GRA.Web/Areas/MissionControl/Views/Avatars/BundleDetail.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@
</div>

<div class="mb-3">
<a asp-action="Bundles" class="btn btn-secondary">Return to List</a>
<a asp-action="Bundles" class="btn btn-outline-secondary">Return to List</a>
@if (Model.Bundle?.HasBeenAwarded != true)
{
<button type="submit" class="btn btn-primary" button-spinner>
<button type="submit" class="btn btn-outline-primary" button-spinner>
<span class="buttonText">@(Model.Action == "Edit" ? "Save" : Model.Action) Bundle</span>
</button>
}
Expand Down Expand Up @@ -190,15 +190,15 @@
<div class="col-6">
<button type="button"
id="searchButton"
class="btn btn-secondary "
class="btn btn-outline-primary "
style="margin-right: 8px;">
Search
</button>
</div>
<div class="col-6">
<button type="button"
id="clearButton"
class="btn btn-secondary ">
class="btn btn-outline-secondary ">
Clear
</button>
</div>
Expand All @@ -218,7 +218,7 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Close
Expand Down
4 changes: 2 additions & 2 deletions src/GRA.Web/Areas/MissionControl/Views/Avatars/Bundles.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<div class="row" style="padding: 10px 0;">
<div class="col-12">
<a asp-action="BundleCreate" class="btn btn-secondary">Create a new bundle</a>
<a asp-action="BundleCreate" class="btn btn-outline-primary">Create a new bundle</a>
</div>
</div>

Expand Down Expand Up @@ -102,7 +102,7 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
Expand Down
6 changes: 3 additions & 3 deletions src/GRA.Web/Areas/MissionControl/Views/Avatars/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<form asp-action="@nameof(AvatarsController.SetupAvatarZip)"
method="post"
style="padding: 1em 0;">
<button type="submit" class="btn btn-primary btn-spinner" button-spinner>
<button type="submit" class="btn btn-outline-primary btn-spinner" button-spinner>
Import avatars.zip
</button>
</form>
Expand All @@ -27,7 +27,7 @@
<form asp-action="@nameof(AvatarsController.SetupDefaultAvatars)"
method="post"
style="padding: 1em 0;">
<button type="submit" class="btn btn-primary btn-spinner" button-spinner>
<button type="submit" class="btn btn-outline-primary btn-spinner" button-spinner>
Add default avatars
</button>
</form>
Expand Down Expand Up @@ -60,7 +60,7 @@
</div>
</div>
<div class="row-spacing">
<button class="btn btn-primary btn-spinner" type="submit" button-spinner>
<button class="btn btn-outline-primary btn-spinner" type="submit" button-spinner>
<span class="fas fa-file-upload"></span>
Upload
</button>
Expand Down
18 changes: 9 additions & 9 deletions src/GRA.Web/Areas/MissionControl/Views/Avatars/Layer.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<input name="Search" value="@Model.Search" class="form-control" />
</div>
<div class="col-4">
<input type="submit" value="Search" class="btn btn-secondary" style="margin-right: 8px;" />
<a asp-action="Layer" asp-route-id="@Model.Id" class="btn btn-secondary">Clear</a>
<input type="submit" value="Search" class="btn btn-outline-primary" style="margin-right: 8px;" />
<a asp-action="Layer" asp-route-id="@Model.Id" class="btn btn-outline-secondary">Clear</a>
</div>
</div>
</form>
Expand All @@ -44,12 +44,12 @@
<div style="height: 40px;">
@item.Name
</div>
<button asp-action="@nameof(AvatarsController.DecreaseItemSort)" name="ItemId" value="@item.Id" class="btn btn-sm btn-secondary" style="margin-right: 6px;" disabled="@(Model.PaginateModel.FirstPage == null && item == Model.Items.First() ? "disabled" : null)">
<span class="fas fa-arrow-left"></span>
<button asp-action="@nameof(AvatarsController.DecreaseItemSort)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-secondary" style="margin-right: 6px;" disabled="@(Model.PaginateModel.FirstPage == null && item == Model.Items.First() ? "disabled" : null)">
<span class="fas fa-arrow-left fa-fw"></span>
</button>
@if (item.Unlockable)
{
<button asp-action="@nameof(AvatarsController.SetItemAvailable)" name="ItemId" value="@item.Id" class="btn btn-sm btn-primary" style="margin: 0 3px;">
<button asp-action="@nameof(AvatarsController.SetItemAvailable)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-primary" style="margin: 0 3px;">
<span class="fas fa-lock"></span>
</button>
}
Expand All @@ -68,8 +68,8 @@
data-name="@item.Name">
<span class="fas fa-times fa-fw"></span>
</button>
<button asp-action="@nameof(AvatarsController.IncreaseItemSort)" name="ItemId" value="@item.Id" class="btn btn-sm btn-secondary" style="margin-left: 6px;" disabled="@(Model.PaginateModel.LastPage == null && item == Model.Items.Last() ? "disabled" : null)">
<span class="fas fa-arrow-right"></span>
<button asp-action="@nameof(AvatarsController.IncreaseItemSort)" name="ItemId" value="@item.Id" class="btn btn-sm btn-outline-secondary" style="margin-left: 6px;" disabled="@(Model.PaginateModel.LastPage == null && item == Model.Items.Last() ? "disabled" : null)">
<span class="fas fa-arrow-right fa-fw"></span>
</button>
</div>

Expand All @@ -80,7 +80,7 @@
{
<paginate paginateModel="@Model.PaginateModel"></paginate>
}
<a asp-action="Index" class="btn btn-secondary">Return to List</a>
<a asp-action="Index" class="btn btn-outline-secondary">Return to List</a>
</div>
</div>

Expand Down Expand Up @@ -121,7 +121,7 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
Expand Down
4 changes: 2 additions & 2 deletions src/GRA.Web/Areas/MissionControl/Views/Carousels/Detail.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@


<div class="mb-3">
<a asp-action="Index" class="btn btn-secondary">Return to List</a>
<a asp-action="Index" class="btn btn-outline-secondary">Return to List</a>
<button type="submit"
id="Submit"
name="Submit"
value="Submit"
class="btn btn-primary btn-spinner" button-spinner>
class="btn btn-outline-primary btn-spinner" button-spinner>
<span class="buttonText">Save</span>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/GRA.Web/Areas/MissionControl/Views/Carousels/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<div class="row" style="padding: 10px 0;">
<div class="col-12">
<a asp-action="Add" class="btn btn-secondary">Create a new dashboard carousel</a>
<a asp-action="Add" class="btn btn-outline-primary">Create a new dashboard carousel</a>
</div>
</div>

Expand Down Expand Up @@ -123,7 +123,7 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
Expand Down
4 changes: 2 additions & 2 deletions src/GRA.Web/Areas/MissionControl/Views/Carousels/ItemDetail.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
</div>

<div class="mb-3">
<a asp-action="Edit" asp-route-id="@Model.CarouselId" class="btn btn-secondary">Return to Carousel</a>
<a asp-action="Edit" asp-route-id="@Model.CarouselId" class="btn btn-outline-secondary">Return to Carousel</a>
<button type="submit"
id="Submit"
name="Submit"
value="Submit"
class="btn btn-primary btn-spinner"
class="btn btn-outline-primary btn-spinner"
button-spinner>
<span class="buttonText">Save</span>
</button>
Expand Down
16 changes: 8 additions & 8 deletions src/GRA.Web/Areas/MissionControl/Views/Categories/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<input asp-for="Search" class="form-control" />
</div>
<div class="col-4">
<input type="submit" value="Search" class="btn btn-secondary" style="margin-right: 8px;" />
<a asp-action="Index" class="btn btn-secondary">Clear</a>
<input type="submit" value="Search" class="btn btn-outline-primary" style="margin-right: 8px;" />
<a asp-action="Index" class="btn btn-outline-secondary">Clear</a>
</div>
</div>
</form>

<div class="row" style="padding: 10px 0;">
<div class="col-12">
<a class="btn btn-secondary"
<a class="btn btn-outline-primary"
data-bs-toggle="modal"
data-bs-target="#addModal">Add a Category</a>
</div>
Expand Down Expand Up @@ -132,12 +132,12 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal"
<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
</button>
<button type="submit"
class="btn btn-primary btn-spinner float-end"
class="btn btn-outline-primary btn-spinner float-end"
aria-label="Confirm"
button-spinner>
Add
Expand Down Expand Up @@ -195,13 +195,13 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
</button>
<button type="submit"
class="btn btn-primary btn-spinner float-end"
class="btn btn-outline-primary btn-spinner float-end"
aria-label="Confirm"
button-spinner>
Save
Expand Down Expand Up @@ -245,7 +245,7 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
Expand Down
10 changes: 5 additions & 5 deletions src/GRA.Web/Areas/MissionControl/Views/Challenges/Edit.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
</button>
<button type="submit"
asp-action="AddTask"
class="btn btn-primary float-end"
class="btn btn-outline-primary float-end"
aria-label="Confirm"
button-spinner>
<span class="buttonText">Add</span>
Expand Down Expand Up @@ -352,7 +352,7 @@
</button>
<button type="submit"
asp-action="ModifyTask"
class="btn btn-primary float-end"
class="btn btn-outline-primary float-end"
aria-label="Confirm"
button-spinner>
<span class="buttonText">Save</span>
Expand Down Expand Up @@ -817,7 +817,7 @@
<a aria-label="View Attachment (Opens new window)"
href="@task.Filename?@DateTime.Now.ToString("yyMMddHHmmss")"
target="_blank"
class="btn btn-sm btn-outline-secondary on-top mt-3">
class="btn btn-sm btn-outline-primary on-top mt-3">
<span class="far fa-file fa-fw"></span>
View Attachment
</a>
Expand All @@ -835,7 +835,7 @@
{
<a href="@task.Filename?@DateTime.Now.ToString("yyMMddHHmmss")"
target="_blank"
class="btn btn-sm btn-outline-secondary on-top mt-3">
class="btn btn-sm btn-outline-primary on-top mt-3">
<span class="far fa-file fa-fw"></span>
View Attachment
</a>
Expand All @@ -853,7 +853,7 @@
<a aria-label="View Attachment (Opens new window)"
href="@task.Filename?@DateTime.Now.ToString("yyMMddHHmmss")"
target="_blank"
class="btn btn-sm btn-outline-secondary on-top mt-3">
class="btn btn-sm btn-outline-primary on-top mt-3">
<span class="far fa-file fa-fw"></span>
View Attachment
</a>
Expand Down
4 changes: 2 additions & 2 deletions src/GRA.Web/Areas/MissionControl/Views/Challenges/FeaturedDetails.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@

<div style="text-align: right;">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal">
Close
</button>
<button type="submit" class="btn btn-primary">
<button type="submit" class="btn btn-outline-primary">
Update Image
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/GRA.Web/Areas/MissionControl/Views/Challenges/FeaturedGroups.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
Expand Down
2 changes: 1 addition & 1 deletion src/GRA.Web/Areas/MissionControl/Views/Challenges/GroupDetail.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
</button>
<button type="button"
id="searchButton"
class="btn btn-outline-secondary">
class="btn btn-outline-primary">
Search
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/GRA.Web/Areas/MissionControl/Views/DailyTips/Upload.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<span asp-validation-for="UploadedFile" class="text-danger"></span>
</div>
<div>
<button class="btn btn-primary btn-spinner" type="submit" button-spinner>
<button class="btn btn-outline-primary btn-spinner" type="submit" button-spinner>
<span class="fas fa-file-upload"></span>
Upload
</button>
Expand Down
4 changes: 2 additions & 2 deletions src/GRA.Web/Areas/MissionControl/Views/Dashboard/Detail.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
</div>

<div class="mb-3">
<a asp-action="Index" class="btn btn-secondary">Return to List</a>
<a asp-action="Index" class="btn btn-outline-secondary">Return to List</a>
<button type="submit"
id="Submit"
name="Submit"
value="Submit"
class="btn btn-primary btn-spinner"
class="btn btn-outline-primary btn-spinner"
button-spinner>
<span class="buttonText">@(Model.Action == "Edit" ? "Save" : Model.Action)</span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions src/GRA.Web/Areas/MissionControl/Views/Dashboard/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<div class="row" style="padding: 10px 0;">
<div class="col-12">
<a asp-controller="Dashboard" asp-action="Create" class="btn btn-secondary">Add Dashboard Content</a>
<a asp-controller="Dashboard" asp-action="Create" class="btn btn-outline-primary">Add Dashboard Content</a>
</div>
</div>

Expand Down Expand Up @@ -111,7 +111,7 @@
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-secondary"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
style="margin-right: 1em;">
Cancel
Expand Down
2 changes: 1 addition & 1 deletion src/GRA.Web/Areas/MissionControl/Views/Dashboard/Preview.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model GRA.Domain.Model.DashboardContent

<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-secondary" style="margin-top:10px;">Return to Editor</a>
<a asp-action="Edit" asp-route-id="@Model.Id" class="btn btn-outline-secondary" style="margin-top:10px;">Return to Editor</a>

<hr />

Expand Down
2 changes: 1 addition & 1 deletion src/GRA.Web/Areas/MissionControl/Views/Downloads/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
@if (Model.SystemBadgeCount[system] > 0)
{
<a title="Download ZIP"
class="btn btn-secondary btn-sm"
class="btn btn-outline-info btn-sm"
asp-action="@nameof(DownloadsController.GetBadgeZipForSystem)"
asp-route-id="@system.Id">
<span class="fas fa-file-download" aria-hidden="true"></span>
Expand Down
Loading
Loading