Skip to content

Phase2/Replace legacy btn-danger markup with design tokens #5

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

Merged
Rodern merged 2 commits into from
Aug 24, 2026
Merged

Phase2/Replace legacy btn-danger markup with design tokens #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9d4489
Phase 2: button consolidation (initial set) — replace Bootstrap btn u…
Rodern Aug 24, 2026
086d9d9
Phase 2: Replace legacy btn-danger markup with design tokens\n\nMap d…
Rodern Aug 24, 2026
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
4 changes: 2 additions & 2 deletions Store.UI/Pages/AuditLog.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@
@if (Model.CurrentPage > 1)
{
<a href="?page=@(Model.CurrentPage - 1)@(Model.TypeFilter.HasValue ? "&type=" + (int)Model.TypeFilter.Value : "")"
class="btn btn-sm btn-secondary">&#8592; Prev</a>
class="button-secondary btn-sm">&#8592; Prev</a>
}
<span class="pagination-info">Page @Model.CurrentPage</span>
@if (Model.Movements.Count == Model.PageSize)
{
<a href="?page=@(Model.CurrentPage + 1)@(Model.TypeFilter.HasValue ? "&type=" + (int)Model.TypeFilter.Value : "")"
class="btn btn-sm btn-secondary">Next &#8594;</a>
class="button-secondary btn-sm">Next &#8594;</a>
}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Store.UI/Pages/BatchTracking.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<td style="white-space:nowrap;">
<button type="button" class="btn-icon" title="Edit"
onclick="openEdit('@b.BatchId', @System.Text.Json.JsonSerializer.Serialize(b))">✏️</button>
<button type="button" class="btn-icon btn-danger" title="Delete"
<button type="button" class="btn-icon danger" title="Delete"
onclick="confirmDelete('@b.BatchId', '@System.Web.HttpUtility.JavaScriptStringEncode(b.BatchNumber)')">🗑️</button>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions Store.UI/Pages/BranchAdmin.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
}
</td>
<td>
<button type="button" class="btn btn-sm"
<button type="button" class="button-secondary btn-sm"
onclick="fillBranchForm(@b.BranchId, '@Html.Raw(Html.Encode(b.Code))', '@Html.Raw(Html.Encode(b.Name))', '@Html.Raw(Html.Encode(b.Address ?? ""))', @(b.IsActive ? "true" : "false"))">
Edit
</button>
Expand Down Expand Up @@ -145,7 +145,7 @@
<td>
<form method="post" asp-page-handler="Revoke" style="display:inline">
<input type="hidden" name="assignmentId" value="@a.UserBranchRoleId" />
<button type="submit" class="btn btn-sm btn-danger"
<button type="submit" class="button-command danger btn-sm"
data-confirm="Remove this assignment?" data-confirm-type="danger">
Revoke
</button>
Expand Down
6 changes: 3 additions & 3 deletions Store.UI/Pages/CommunicationLogs.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</div>
<div class="col-auto">
<button type="submit" class="button-primary">Filter</button>
<a asp-page="/CommunicationLogs" class="btn btn-outline-secondary">Clear</a>
<a asp-page="/CommunicationLogs" class="button-command">Clear</a>
</div>
</form>
</div>
Expand Down Expand Up @@ -89,7 +89,7 @@
@log.Payload
</td>
<td>
<button type="button" class="btn btn-sm btn-outline-info" data-bs-toggle="modal" data-bs-target="#logModal-@log.Id">
<button type="button" class="button-command btn-sm" data-bs-toggle="modal" data-bs-target="#logModal-@log.Id">
Details
</button>

Expand Down Expand Up @@ -119,7 +119,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
<button type="button" class="button-secondary" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions Store.UI/Pages/Payments.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<label>To <input type="date" name="to" value="@Model.ToDate?.ToString("yyyy-MM-dd")" class="form-control form-control-sm" /></label>
<input type="hidden" name="status" value="@((int?)Model.StatusFilter)" />
<input type="hidden" name="page" value="1" />
<button type="submit" class="btn btn-sm btn-primary">Filter</button>
<button type="submit" class="button-primary btn-sm">Filter</button>
</form>
</div>
@if (Model.Settlement is not null)
Expand Down Expand Up @@ -103,7 +103,7 @@
<option value="@((int)s)" selected="@(Model.StatusFilter == s)">@StatusLabel(s.ToString())</option>
}
</select>
<button type="submit" class="btn btn-sm btn-primary">Filter</button>
<button type="submit" class="button-primary btn-sm">Filter</button>
</form>
</div>

Expand Down Expand Up @@ -148,12 +148,12 @@
<div class="pagination">
@if (Model.CurrentPage > 1)
{
<a href="?page=@(Model.CurrentPage - 1)&status=@((int?)Model.StatusFilter)&from=@Model.FromDate?.ToString("yyyy-MM-dd")&to=@Model.ToDate?.ToString("yyyy-MM-dd")" class="btn btn-sm btn-outline">Previous</a>
<a href="?page=@(Model.CurrentPage - 1)&status=@((int?)Model.StatusFilter)&from=@Model.FromDate?.ToString("yyyy-MM-dd")&to=@Model.ToDate?.ToString("yyyy-MM-dd")" class="button-command btn-sm">Previous</a>
}
<span class="page-info">Page @Model.CurrentPage</span>
@if (Model.Transactions.Count == Model.PageSize)
{
<a href="?page=@(Model.CurrentPage + 1)&status=@((int?)Model.StatusFilter)&from=@Model.FromDate?.ToString("yyyy-MM-dd")&to=@Model.ToDate?.ToString("yyyy-MM-dd")" class="btn btn-sm btn-outline">Next</a>
<a href="?page=@(Model.CurrentPage + 1)&status=@((int?)Model.StatusFilter)&from=@Model.FromDate?.ToString("yyyy-MM-dd")&to=@Model.ToDate?.ToString("yyyy-MM-dd")" class="button-command btn-sm">Next</a>
}
</div>
}
Expand Down
14 changes: 7 additions & 7 deletions Store.UI/Pages/Pos.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
<p>Fast checkout flow for supermarket operations.</p>
</div>
<div class="pos-top-actions">
<a class="btn btn-secondary" href="/Dashboard">Back to Dashboard</a>
<a class="button-secondary" href="/Dashboard">Back to Dashboard</a>
<form method="post" asp-page-handler="Logout">
<button type="submit" class="btn btn-danger">Sign Out</button>
<button type="submit" class="danger">Sign Out</button>
</form>
</div>
</header>
Expand Down Expand Up @@ -72,7 +72,7 @@
<div class="panel-head">
<h2>Cart</h2>
<div class="cart-head-actions">
<button type="button" class="btn btn-secondary" id="suspendSaleBtn">Suspend</button>
<button type="button" class="button-secondary" id="suspendSaleBtn">Suspend</button>
<button type="button" class="btn btn-warning" id="clearCartBtn">Clear</button>
</div>
</div>
Expand Down Expand Up @@ -113,7 +113,7 @@
<div class="field-row">
<div class="tender-head">
<label>Payment</label>
<button type="button" class="btn btn-secondary tender-add-btn" id="addTenderLineBtn">+ Add</button>
<button type="button" class="button-secondary tender-add-btn" id="addTenderLineBtn">+ Add</button>
</div>
<div id="tenderLinesContainer"></div>
<div class="tender-summary">
Expand All @@ -139,8 +139,8 @@
<select id="suspendedSaleSelect">
<option value="">No suspended sale</option>
</select>
<button type="button" class="btn btn-secondary" id="resumeSaleBtn">Resume</button>
<button type="button" class="btn btn-danger" id="deleteSuspendedBtn">Delete</button>
<button type="button" class="button-secondary" id="resumeSaleBtn">Resume</button>
<button type="button" class="danger" id="deleteSuspendedBtn">Delete</button>
</div>
</div>

Expand All @@ -151,7 +151,7 @@

<div id="offlineQueueBanner" class="offline-queue-banner" hidden>
<span id="offlineQueueCount"></span>
<button type="button" id="syncQueueBtn" class="btn btn-secondary">Sync Now</button>
<button type="button" id="syncQueueBtn" class="button-secondary">Sync Now</button>
</div>

<div id="checkoutMessage" class="checkout-message" role="status" aria-live="polite"></div>
Expand Down
12 changes: 6 additions & 6 deletions Store.UI/Pages/Profile.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
</div>
@if (Model.TwoFactorEnabled)
{
<button type="button" class="btn-danger" data-open-blade="disable2FABlade">Disable</button>
<button type="button" class="button-command danger" data-open-blade="disable2FABlade">Disable</button>
}
else
{
Expand Down Expand Up @@ -396,7 +396,7 @@
</td>
<td>@key.RegistrationDate.ToString("MMM dd, yyyy HH:mm")</td>
<td style="text-align: right;">
<button type="button" class="btn-danger" style="padding: 6px 12px; font-size: 0.8rem;" onclick="openRemovePasskeyBlade('@key.Id')">Remove</button>
<button type="button" class="button-command danger" style="padding: 6px 12px; font-size: 0.8rem;" onclick="openRemovePasskeyBlade('@key.Id')">Remove</button>
</td>
</tr>
}
Expand All @@ -418,7 +418,7 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"></circle><polyline points="12 6 12 12 16 14"></polyline></svg>
Recent Activity
</h2>
<button type="button" class="btn-danger" style="padding: 6px 16px;" data-open-blade="revokeSessionsBlade">Sign Out All</button>
<button type="button" class="button-command danger" style="padding: 6px 16px;" data-open-blade="revokeSessionsBlade">Sign Out All</button>
</div>

<div style="overflow-x: auto; border: 1px solid var(--border); border-radius: 12px;">
Expand Down Expand Up @@ -597,7 +597,7 @@
</div>
<div class="blade-footer">
<button type="button" class="btn-secondary" data-close-blade="disable2FABlade">Cancel</button>
<button type="submit" form="disable2FAForm" class="btn-danger">Yes, Disable</button>
<button type="submit" form="disable2FAForm" class="button-command danger">Yes, Disable</button>
</div>
</div>

Expand All @@ -618,7 +618,7 @@
</div>
<div class="blade-footer">
<button type="button" class="btn-secondary" data-close-blade="revokeSessionsBlade">Cancel</button>
<button type="submit" form="revokeSessionsForm" class="btn-danger">Sign Out All</button>
<button type="submit" form="revokeSessionsForm" class="button-command danger">Sign Out All</button>
</div>
</div>

Expand All @@ -640,7 +640,7 @@
</div>
<div class="blade-footer">
<button type="button" class="btn-secondary" data-close-blade="removePasskeyBlade">Cancel</button>
<button type="submit" form="removePasskeyForm" class="btn-danger">Yes, Remove</button>
<button type="submit" form="removePasskeyForm" class="button-command danger">Yes, Remove</button>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion Store.UI/Pages/PromotionEffectiveness.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<form method="get" class="filter-form">
<label>From <input type="date" name="from" value="@Model.FromDate.ToString("yyyy-MM-dd")" class="form-control form-control-sm" /></label>
<label>To <input type="date" name="to" value="@Model.ToDate.ToString("yyyy-MM-dd")" class="form-control form-control-sm" /></label>
<button type="submit" class="btn btn-sm btn-primary">Apply</button>
<button type="submit" class="button-primary btn-sm">Apply</button>
</form>
</div>
</section>
Expand Down
12 changes: 5 additions & 7 deletions Store.UI/Pages/PurchaseOrders.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</select>
</div>
<div class="col-auto">
<button class="btn btn-secondary btn-sm" type="submit">Filter</button>
<button class="button-secondary btn-sm" type="submit">Filter</button>
</div>
</form>

Expand Down Expand Up @@ -78,27 +78,25 @@
<form method="post" asp-page-handler="Submit">
@Html.AntiForgeryToken()
<input type="hidden" name="ActionPurchaseOrderId" value="@po.PurchaseOrderId" />
<button class="btn btn-outline-info btn-sm" type="submit">Submit</button>
<button class="button-command btn-sm" type="submit">Submit</button>
</form>
<form method="post" asp-page-handler="Cancel">
@Html.AntiForgeryToken()
<input type="hidden" name="ActionPurchaseOrderId" value="@po.PurchaseOrderId" />
<button class="btn btn-outline-danger btn-sm" type="submit"
data-confirm="Cancel this PO?" data-confirm-type="danger">Cancel</button>
<button class="button-command danger btn-sm" type="submit" data-confirm="Cancel this PO?" data-confirm-type="danger">Cancel</button>
</form>
}
@if (po.Status == "Submitted")
{
<form method="post" asp-page-handler="Approve">
@Html.AntiForgeryToken()
<input type="hidden" name="ActionPurchaseOrderId" value="@po.PurchaseOrderId" />
<button class="btn btn-outline-primary btn-sm" type="submit">Approve</button>
<button class="button-command btn-sm" type="submit">Approve</button>
</form>
<form method="post" asp-page-handler="Cancel">
@Html.AntiForgeryToken()
<input type="hidden" name="ActionPurchaseOrderId" value="@po.PurchaseOrderId" />
<button class="btn btn-outline-danger btn-sm" type="submit"
data-confirm="Cancel this PO?" data-confirm-type="danger">Cancel</button>
<button class="button-command danger btn-sm" type="submit" data-confirm="Cancel this PO?" data-confirm-type="danger">Cancel</button>
</form>
}
@if (po.Status == "Approved" || po.Status == "PartiallyReceived")
Expand Down
2 changes: 1 addition & 1 deletion Store.UI/Pages/Verify2FA.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<input type="text" id="code" asp-for="Code" class="form-control" style="width:100%; padding:10px; border-radius:6px; border:1px solid var(--border); font-size:1.2rem; letter-spacing:4px; text-align:center;" maxlength="6" inputmode="numeric" required autofocus />
</div>

<button type="submit" class="btn-primary" style="width:100%; padding:12px; background:var(--brand); color:white; border:none; border-radius:6px; font-weight:600; cursor:pointer;">
<button type="submit" class="button-primary" style="width:100%; padding:12px; background:var(--brand); color:white; border:none; border-radius:6px; font-weight:600; cursor:pointer;">
Verify & Log In
</button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion Store.UI/Pages/VerifyContact.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
<h3>Verification Failed</h3>
<p>@Model.ErrorMessage</p>
</div>
<a href="/Profile" class="btn btn-secondary" style="display: inline-block; padding: 10px 20px; background: #f3f4f6; color: #374151; text-decoration: none; border-radius: 6px; border: 1px solid #d1d5db;">Return to Profile</a>
<a href="/Profile" class="button-secondary" style="display: inline-block; padding: 10px 20px; background: #f3f4f6; color: #374151; text-decoration: none; border-radius: 6px; border: 1px solid #d1d5db;">Return to Profile</a>
}
</div>
4 changes: 2 additions & 2 deletions Store.UI/Pages/_Host.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
<p>Efficient inventory and business management</p>
@if (User?.Identity?.IsAuthenticated == true)
{
<a href="/dashboard" class="btn btn-lg btn-light">Go to Dashboard</a>
<a href="/dashboard" class="button-secondary btn-lg">Go to Dashboard</a>
}
else
{
<a href="/login" class="btn btn-lg btn-light">Login</a>
<a href="/login" class="button-secondary btn-lg">Login</a>
}
</div>
</div>
Expand Down
Loading