merge: resolve conflicts between feat/responsive-layout and master

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-06-05 15:14:17 +08:00
parent ecade14bd0 91c332f567
commit 8cf9ee3519
132 changed files with 27426 additions and 4252 deletions
@@ -189,6 +189,40 @@
  cursor: zoom-in;
 }

+.asset-card-wrapper {
+  position: relative;
+  display: inline-block;
+}
+
+.asset-card__delete {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  z-index: 2;
+  display: none;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border: 0;
+  border-radius: 6px;
+  background: var(--bg-panel);
+  color: var(--fg-muted);
+  cursor: pointer;
+  font-size: 14px;
+  opacity: 0.85;
+  transition: opacity 150ms, color 150ms;
+}
+
+.asset-card-wrapper:hover .asset-card__delete {
+  display: flex;
+}
+
+.asset-card__delete:hover {
+  opacity: 1;
+  color: var(--fg-danger);
+}
+
@media (max-width: 720px) {
  .asset-preview-modal {
    padding: 14px;