bonamin/bellsystems-cp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote changes, standardize button text color to --text-white CSS variable

Browse Source 
Resolved merge conflicts by keeping the CSS variable approach (var(--text-white))
instead of hardcoded #fff for button text colors across all components.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Vasileios Kousaridas
2026-02-17 19:56:07 +02:00
parent f1b0bcd201 3296c645da
commit f38057361d
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/index.css
View File

@@ -44,7 +44,6 @@
--badge-blue-text: #63b3ed; --badge-blue-text: #63b3ed;
} }
--color-default: #000000;
/* Ensure all interactive elements show pointer cursor */ /* Ensure all interactive elements show pointer cursor */
button, button,
[role="button"], [role="button"],

2
frontend/src/melodies/MelodyDetail.jsx
View File

@@ -143,7 +143,7 @@ export default function MelodyDetail() {
<button <button
onClick={() => setShowDelete(true)} onClick={() => setShowDelete(true)}
className="px-4 py-2 text-sm rounded-md transition-colors" className="px-4 py-2 text-sm rounded-md transition-colors"
style={{ backgroundColor: "var(--danger)", color: "var(--text-white)" }} style={{ backgroundColor: "var(--danger-btn)", color: "var(--text-white)" }}
> >
Delete Delete
</button> </button>

2
frontend/src/melodies/MelodyForm.jsx
View File

@@ -336,7 +336,7 @@ export default function MelodyForm() {
<input type="color" value={normalizeColor(information.color)} onChange={(e) => updateInfo("color", e.target.value)} className="absolute inset-0 opacity-0 w-full h-full cursor-pointer" /> <input type="color" value={normalizeColor(information.color)} onChange={(e) => updateInfo("color", e.target.value)} className="absolute inset-0 opacity-0 w-full h-full cursor-pointer" />
</label> </label>
</div> </div>
</div> </div>
<div className="flex items-center gap-2 pt-2"> <div className="flex items-center gap-2 pt-2">
<input type="checkbox" id="isTrueRing" checked={information.isTrueRing} onChange={(e) => updateInfo("isTrueRing", e.target.checked)} className="h-4 w-4 rounded" /> <input type="checkbox" id="isTrueRing" checked={information.isTrueRing} onChange={(e) => updateInfo("isTrueRing", e.target.checked)} className="h-4 w-4 rounded" />
<label htmlFor="isTrueRing" className="text-sm font-medium" style={labelStyle}>True Ring</label> <label htmlFor="isTrueRing" className="text-sm font-medium" style={labelStyle}>True Ring</label>