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

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>

frontend/src/melodies/MelodyDetail.jsx

@@ -143,7 +143,7 @@ export default function MelodyDetail() {
             <button
               onClick={() => setShowDelete(true)}
               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
             </button>

frontend/src/melodies/MelodyForm.jsx

@@ -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" />
                     </label>
                   </div>
-                  </div>
+                </div>
                 <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" />
                   <label htmlFor="isTrueRing" className="text-sm font-medium" style={labelStyle}>True Ring</label>