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

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-06-05 15:14:17 +08:00
132 changed files with 27426 additions and 4252 deletions
+421 -32
View File
@@ -135,6 +135,11 @@
font-size: 15px;
font-weight: 900;
cursor: pointer;
transition: opacity 160ms ease;
}
.brand-lockup:active {
opacity: 0.85;
}
.brand-lockup__mark {
@@ -232,7 +237,8 @@
}
.member-button {
color: var(--cyan-strong);
color: var(--accent);
font-weight: 600;
}
.member-button--community {
@@ -303,6 +309,15 @@
background: var(--bg-hover);
}
.creator-button:active,
.member-button:active,
.profile-button:active,
.icon-button:active,
.theme-toggle:active {
transform: scale(0.97);
transition-duration: 80ms;
}
.profile-button--guest:hover {
background: rgba(var(--accent-rgb), 0.88);
color: #07100b;
@@ -481,6 +496,15 @@
box-shadow: inset 0 0 0 1px rgba(var(--accent-rgb), 0.34);
}
@keyframes nav-activate-pulse {
0% { box-shadow: inset 0 0 0 1px rgba(var(--accent-rgb), 0.34), 0 0 8px rgba(var(--accent-rgb), 0.25); }
100% { box-shadow: inset 0 0 0 1px rgba(var(--accent-rgb), 0.34); }
}
.floating-nav__button.nav-just-activated {
animation: nav-activate-pulse 320ms var(--ease-out-expo, cubic-bezier(0.16, 1, 0.3, 1)) both;
}
.floating-nav__button:hover .floating-nav__label,
.floating-nav__button:focus-visible .floating-nav__label,
.floating-nav__button.is-active .floating-nav__label {
@@ -535,19 +559,343 @@
}
.web-shell__page {
position: relative;
flex: 1;
min-height: 0;
overflow: auto;
scrollbar-color: rgba(var(--accent-rgb), 0.42) transparent;
}
/* ═══════════════════════════════════════════════════════
Responsive: Shell Navigation & Topbar
Breakpoints: 1180px (small desktop), 900px (tablet),
560px (phone). Complements legacy-components.css rules.
═══════════════════════════════════════════════════════ */
.keepalive-ecommerce {
position: absolute;
inset: 0;
z-index: 1;
overflow: hidden;
}
/* ── Info button & popover ────────────────────── */
.info-button {
display: inline-grid;
width: 32px;
height: 32px;
place-items: center;
border: 1px solid rgba(var(--accent-rgb), 0.22);
border-radius: 8px;
background: transparent;
color: var(--fg-muted);
font-size: 15px;
cursor: pointer;
transition: color 140ms ease, border-color 140ms ease, background 140ms ease;
}
.info-button:hover {
color: var(--accent);
border-color: rgba(var(--accent-rgb), 0.4);
background: rgba(var(--accent-rgb), 0.06);
}
.info-popover-anchor {
position: relative;
}
.info-popover {
position: absolute;
top: calc(100% + 10px);
right: 0;
z-index: 100;
min-width: 280px;
max-width: min(360px, calc(100vw - 32px));
padding: 20px;
border-radius: 14px;
background: var(--bg-panel);
border: 1px solid var(--border-normal);
box-shadow: 0 8px 32px rgba(0, 0, 0, 0.28);
}
.info-popover dl {
display: grid;
gap: 12px;
margin: 0 0 16px;
}
.info-popover dt {
color: var(--fg-muted);
font-size: 11px;
font-weight: 700;
text-transform: uppercase;
letter-spacing: 0.04em;
}
.info-popover dd {
margin: 0 0 0 0;
color: var(--fg-body);
font-size: 13px;
line-height: 1.55;
}
.info-popover__links {
display: flex;
gap: 12px;
padding-top: 12px;
border-top: 1px solid var(--border-weak);
}
.info-popover__links a {
color: var(--accent);
font-size: 13px;
font-weight: 700;
text-decoration: none;
cursor: pointer;
}
.info-popover__links a:hover {
text-decoration: underline;
}
/* ── Admin monitor ──────────────────────────── */
.admin-monitor-trigger {
position: fixed;
bottom: 16px;
right: 16px;
z-index: 200;
display: grid;
width: 36px;
height: 36px;
place-items: center;
border: 1px solid rgba(var(--accent-rgb), 0.3);
border-radius: 50%;
background: var(--bg-panel);
cursor: pointer;
box-shadow: 0 2px 12px rgba(0,0,0,0.2);
}
.admin-monitor-trigger__dot {
width: 8px;
height: 8px;
border-radius: 50%;
background: var(--accent);
animation: admin-monitor-pulse 2s ease-in-out infinite;
}
@keyframes admin-monitor-pulse {
0%, 100% { opacity: 0.4; transform: scale(1); }
50% { opacity: 1; transform: scale(1.3); }
}
.admin-monitor {
position: fixed;
bottom: 60px;
right: 16px;
z-index: 199;
width: min(480px, calc(100vw - 32px));
max-height: 70vh;
display: flex;
flex-direction: column;
border: 1px solid var(--border-normal);
border-radius: 12px;
background: var(--bg-panel);
box-shadow: 0 8px 40px rgba(0,0,0,0.35);
overflow: hidden;
}
.admin-monitor__header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 12px 16px;
border-bottom: 1px solid var(--border-weak);
}
.admin-monitor__header strong {
font-size: 13px;
color: var(--fg-body);
}
.admin-monitor__actions {
display: flex;
gap: 6px;
}
.admin-monitor__actions button {
padding: 3px 12px;
border: 1px solid var(--border-normal);
border-radius: 5px;
background: transparent;
color: var(--fg-muted);
font-size: 11px;
cursor: pointer;
}
.admin-monitor__actions button:hover:not(:disabled) {
border-color: var(--accent);
color: var(--accent);
}
.admin-monitor__list {
flex: 1;
overflow: auto;
padding: 8px;
}
.admin-monitor__empty {
padding: 24px;
text-align: center;
color: var(--fg-muted);
font-size: 12px;
}
.admin-monitor__item {
border-bottom: 1px solid var(--border-weak);
}
.admin-monitor__item summary {
display: grid;
grid-template-columns: 60px 1fr 36px 100px;
align-items: center;
gap: 8px;
padding: 8px 4px;
cursor: pointer;
font-size: 11px;
}
.admin-monitor__source {
display: inline-block;
padding: 2px 6px;
border-radius: 3px;
background: rgba(var(--accent-rgb), 0.12);
color: var(--accent);
font-size: 10px;
font-weight: 700;
text-align: center;
}
.admin-monitor__msg {
overflow: hidden;
color: var(--fg-body);
text-overflow: ellipsis;
white-space: nowrap;
}
.admin-monitor__count {
display: inline-block;
min-width: 24px;
padding: 1px 5px;
border-radius: 999px;
background: rgba(255, 107, 53, 0.15);
color: #ff6b35;
font-size: 10px;
font-weight: 800;
text-align: center;
}
.admin-monitor__item time {
color: var(--fg-muted);
font-size: 10px;
text-align: right;
}
.admin-monitor__detail {
padding: 8px 12px 12px;
color: var(--fg-muted);
font-size: 11px;
line-height: 1.6;
}
.admin-monitor__detail pre {
margin-top: 6px;
padding: 8px;
border-radius: 4px;
background: var(--bg-inset);
font-size: 10px;
max-height: 120px;
overflow: auto;
}
.admin-monitor__pager {
display: flex;
align-items: center;
justify-content: center;
gap: 12px;
padding: 8px;
border-top: 1px solid var(--border-weak);
font-size: 11px;
color: var(--fg-muted);
}
.admin-monitor__pager button {
padding: 2px 10px;
border: 1px solid var(--border-normal);
border-radius: 4px;
background: transparent;
color: var(--fg-muted);
cursor: pointer;
}
.admin-monitor__pager button:hover:not(:disabled) {
border-color: var(--accent);
color: var(--accent);
}
.cookie-consent {
position: fixed;
right: 18px;
bottom: 18px;
z-index: 1300;
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: 16px;
width: min(640px, calc(100vw - 36px));
padding: 16px;
border: 1px solid rgba(var(--accent-rgb), 0.28);
border-radius: 16px;
background: var(--bg-panel);
color: var(--fg-body);
box-shadow: 0 18px 54px rgba(0, 0, 0, 0.34);
}
.cookie-consent strong,
.cookie-consent p {
margin: 0;
}
.cookie-consent p {
margin-top: 5px;
color: var(--fg-muted);
font-size: 13px;
line-height: 1.55;
}
.cookie-consent__actions {
display: flex;
align-items: center;
gap: 10px;
}
.cookie-consent__actions a,
.cookie-consent__actions button {
display: inline-flex;
align-items: center;
justify-content: center;
min-height: 36px;
padding: 0 12px;
border-radius: 999px;
font-size: 12px;
font-weight: 900;
white-space: nowrap;
}
.cookie-consent__actions a {
color: var(--accent);
text-decoration: none;
}
.cookie-consent__actions button {
border: 0;
background: var(--accent);
color: #07100b;
cursor: pointer;
}
/* ── 1180px: Compact topbar ── */
@media (max-width: 1180px) {
.brand-lockup__tone {
display: none;
@@ -563,49 +911,90 @@
}
}
/* ── 900px: Bottom nav & Touch-friendly topbar ── */
@media (max-width: 900px) {
.web-topbar {
position: sticky;
top: 0;
flex: 0 0 52px;
padding: 8px 12px;
gap: 10px;
}
.brand-lockup__name {
max-width: 110px;
.web-shell {
overflow: hidden;
text-overflow: ellipsis;
}
.creator-button,
.member-button {
.web-topbar {
flex: 0 0 auto;
gap: 10px;
padding: 10px 12px;
}
.brand-lockup__tone,
.profile-button span:not(.profile-button__avatar),
.member-button__label {
display: none;
}
.profile-button span:last-child {
display: none;
.web-topbar__actions {
gap: 6px;
}
.profile-button {
min-width: 44px;
height: 44px;
.member-button,
.profile-button,
.info-button {
width: 36px;
padding: 0;
aspect-ratio: 1;
}
.icon-button {
min-width: 44px;
height: 44px;
.floating-nav {
left: 50%;
top: auto;
bottom: max(10px, env(safe-area-inset-bottom));
flex-direction: row;
width: min(calc(100vw - 20px), 560px);
overflow-x: auto;
justify-content: flex-start;
border-radius: 18px;
transform: translateX(-50%);
scrollbar-width: none;
}
.floating-nav::-webkit-scrollbar {
display: none;
}
.floating-nav__item {
flex: 0 0 44px;
}
.floating-nav__label,
.floating-nav__submenu,
.floating-page-scroll-actions {
display: none;
}
.web-shell__page {
padding-bottom: 78px;
}
.floating-page-scroll-actions {
display: none;
.info-popover,
.profile-popover {
right: -8px;
max-width: calc(100vw - 24px);
}
}
/* ── 640px: Narrower topbar adjustments ── */
@media (max-width: 640px) {
.brand-lockup__name {
font-size: 14px;
}
.web-topbar__actions {
flex: 1;
}
.cookie-consent {
right: 12px;
bottom: 12px;
grid-template-columns: 1fr;
}
.cookie-consent__actions {
justify-content: space-between;
}
}