diff --git a/modules/rbooks/components/folk-book-reader.ts b/modules/rbooks/components/folk-book-reader.ts index 743c59e..f97348a 100644 --- a/modules/rbooks/components/folk-book-reader.ts +++ b/modules/rbooks/components/folk-book-reader.ts @@ -366,8 +366,8 @@ export class FolkBookReader extends HTMLElement { width: 100%; height: 100%; min-height: calc(100vh - 52px); - background: #0f172a; - color: #f1f5f9; + background: var(--rs-bg-page); + color: var(--rs-text-primary); } .loading { @@ -382,7 +382,7 @@ export class FolkBookReader extends HTMLElement { .loading-spinner { width: 40px; height: 40px; - border: 3px solid #334155; + border: 3px solid var(--rs-border-strong); border-top-color: #60a5fa; border-radius: 50%; animation: spin 0.8s linear infinite; @@ -390,14 +390,14 @@ export class FolkBookReader extends HTMLElement { @keyframes spin { to { transform: rotate(360deg); } } .loading-status { - color: #94a3b8; + color: var(--rs-text-secondary); font-size: 0.9rem; } .loading-bar { width: 200px; height: 4px; - background: #1e293b; + background: var(--rs-bg-surface); border-radius: 2px; overflow: hidden; } @@ -417,15 +417,15 @@ export class FolkBookReader extends HTMLElement { height: calc(100vh - 52px); gap: 0.5rem; } - .error h3 { color: #f87171; margin: 0; } - .error p { color: #94a3b8; margin: 0; } + .error h3 { color: var(--rs-error); margin: 0; } + .error p { color: var(--rs-text-secondary); margin: 0; } .error button { margin-top: 1rem; padding: 0.5rem 1.5rem; - border: 1px solid #334155; + border: 1px solid var(--rs-border-strong); border-radius: 0.5rem; - background: #1e293b; - color: #f1f5f9; + background: var(--rs-bg-surface); + color: var(--rs-text-primary); cursor: pointer; } @@ -446,23 +446,23 @@ export class FolkBookReader extends HTMLElement { min-height: 36px; } .rapp-nav__back { - padding: 4px 10px; border-radius: 6px; border: 1px solid rgba(255,255,255,0.1); - background: transparent; color: #94a3b8; cursor: pointer; font-size: 13px; + padding: 4px 10px; border-radius: 6px; border: 1px solid var(--rs-border-subtle); + background: transparent; color: var(--rs-text-secondary); cursor: pointer; font-size: 13px; text-decoration: none; transition: color 0.15s, border-color 0.15s; } - .rapp-nav__back:hover { color: #e2e8f0; border-color: rgba(255,255,255,0.2); } + .rapp-nav__back:hover { color: var(--rs-text-primary); border-color: var(--rs-border-strong); } .rapp-nav__title { - font-size: 15px; font-weight: 600; color: #e2e8f0; + font-size: 15px; font-weight: 600; color: var(--rs-text-primary); flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .rapp-nav__subtitle { font-size: 0.8rem; - color: #94a3b8; + color: var(--rs-text-secondary); margin-left: 4px; } .rapp-nav__meta { font-size: 0.85rem; - color: #94a3b8; + color: var(--rs-text-secondary); white-space: nowrap; } @@ -481,10 +481,10 @@ export class FolkBookReader extends HTMLElement { .nav-btn { width: 44px; height: 80px; - border: 1px solid #334155; + border: 1px solid var(--rs-border-strong); border-radius: 0.5rem; - background: #1e293b; - color: #f1f5f9; + background: var(--rs-bg-surface); + color: var(--rs-text-primary); font-size: 1.5rem; cursor: pointer; display: flex; @@ -492,7 +492,7 @@ export class FolkBookReader extends HTMLElement { justify-content: center; transition: background 0.15s; } - .nav-btn:hover { background: #334155; } + .nav-btn:hover { background: var(--rs-border-strong); } .reader-footer { display: flex; @@ -501,14 +501,14 @@ export class FolkBookReader extends HTMLElement { .nav-text-btn { padding: 0.375rem 1rem; - border: 1px solid #334155; + border: 1px solid var(--rs-border-strong); border-radius: 0.375rem; background: transparent; - color: #94a3b8; + color: var(--rs-text-secondary); font-size: 0.8rem; cursor: pointer; } - .nav-text-btn:hover { border-color: #60a5fa; color: #f1f5f9; } + .nav-text-btn:hover { border-color: #60a5fa; color: var(--rs-text-primary); } `; } diff --git a/modules/rcal/components/folk-calendar-view.ts b/modules/rcal/components/folk-calendar-view.ts index 5cac8c3..055a333 100644 --- a/modules/rcal/components/folk-calendar-view.ts +++ b/modules/rcal/components/folk-calendar-view.ts @@ -810,7 +810,7 @@ class FolkCalendarView extends HTMLElement { ${dayEvents.length > 0 ? `