Resolve merge conflicts in docs and M22-bulletin module files
Keep origin/main version for all 25 conflict sections: - README.md: 4 conflicts (bulletin timestamps, alert status) - docs/HoloLake-Era-OS-Modules.md: 8 conflicts (module metadata, file listings) - modules/M22-bulletin/index.html: 1 conflict (semantic header with i18n) - modules/M22-bulletin/style.css: 11 conflicts (CSS class naming, state styles) - modules/M22-bulletin/script.js: 1 conflict (IIFE pattern with dynamic rendering) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
parent
33fc76a26e
commit
82caccc18b
31
README.md
31
README.md
|
|
@ -78,16 +78,9 @@
|
|||
<!-- BINGSHUO_BULLETIN_START -->
|
||||
| 时间 | 检查项 | 状态 |
|
||||
|------|--------|------|
|
||||
<<<<<<< HEAD
|
||||
| 03-10 20:38 | 🔧 系统更新: `.github/` | 铸渊 (ZhùYuān) |
|
||||
| 03-10 20:37 | ❌ 📢 更新系统公告区 · 失败 | 冰朔 |
|
||||
| 03-10 20:37 | 🔧 系统更新: `docs/` | 铸渊 (ZhùYuān) |
|
||||
| 03-10 19:15 | 🔧 系统更新: `scripts/` | 铸渊 (Copilot) |
|
||||
=======
|
||||
| 03-10 23:36 | 🔧 系统更新: `.github/` | 铸渊 (ZhùYuān) |
|
||||
| 03-10 23:36 | 🔧 系统更新: `docs/` | 铸渊 (ZhùYuān) |
|
||||
| 03-10 21:57 | 🔧 系统更新: `scripts/` | 铸渊 (Copilot) |
|
||||
>>>>>>> origin/main
|
||||
| 03-10 16:56 | ✅ 每日巡检 ✅ 通过 | 冰朔 |
|
||||
| 03-10 08:00 | 🧠 核心大脑升级 v3.0 · 壳-核分离架构 · 前端壳(UI/IO) + 后端脑(prompt/routing/memory/context) · BRAIN域4接口上线 · 覆盖率 7/21 (33.3%) | 铸渊（冰朔指令） |
|
||||
| 03-10 08:00 | ⚠️ 铸渊 PSP 巡检完成 · 发现 3 个问题 · 自动修复 0 项 | 铸渊PSP巡检 |
|
||||
|
|
@ -103,17 +96,9 @@
|
|||
### 🤖 铸渊自动提醒
|
||||
|
||||
<!-- BINGSHUO_ALERT_START -->
|
||||
<<<<<<< HEAD
|
||||
> 🔴 **需要冰朔手动干预！**
|
||||
>
|
||||
> - ❌ 📢 更新系统公告区 · 失败
|
||||
>
|
||||
> 🗓️ 2026-03-10 · 铸渊已发送邮件提醒
|
||||
=======
|
||||
> 🟢 **今日无需冰朔手动干预** · 系统一切正常
|
||||
>
|
||||
> 🗓️ 2026-03-11 · 铸渊自动检测
|
||||
>>>>>>> origin/main
|
||||
<!-- BINGSHUO_ALERT_END -->
|
||||
|
||||
---
|
||||
|
|
@ -127,36 +112,20 @@
|
|||
<!-- COLLABORATOR_BULLETIN_START -->
|
||||
| 时间 | 合作者 | 模块 | 状态 |
|
||||
|------|--------|------|------|
|
||||
<<<<<<< HEAD
|
||||
| 03-10 20:49 | zhizhi200271 | `—/` | ✅ 上传成功 |
|
||||
| 03-10 20:40 | Copilot | `—/` | 🔵 已更新 |
|
||||
| 03-10 20:37 | 冰朔 | `—/` | ✅ 上传成功 |
|
||||
| 03-10 20:31 | 🛠️ 页页 | `backend-integration/` | 📦 上传成功 |
|
||||
=======
|
||||
| 03-10 23:55 | Copilot | `—/` | 🔵 已更新 |
|
||||
| 03-10 23:45 | Copilot | `—/` | 🔵 已更新 |
|
||||
| 03-10 23:36 | 冰朔 | `—/` | ✅ 上传成功 |
|
||||
| 03-10 22:39 | 🛠️ 页页 | `backend-integration/` | 📦 上传成功 |
|
||||
| 03-10 22:38 | 🎨 燕樊 | `m15-cloud-drive/` | 📦 上传成功 |
|
||||
| 03-10 21:20 | 🤖 之之 | `dingtalk-bot/` | 📦 上传成功 |
|
||||
>>>>>>> origin/main
|
||||
<!-- COLLABORATOR_BULLETIN_END -->
|
||||
|
||||
### 🤖 铸渊自动提醒 · 合作者
|
||||
|
||||
<!-- COLLABORATOR_ALERT_START -->
|
||||
<<<<<<< HEAD
|
||||
> 🔴 **以下合作者需要手动干预：**
|
||||
>
|
||||
> **🎨 燕樊（DEV-003）：**
|
||||
> - ⚠️ `m15-cloud-drive/` 缺少 README.md
|
||||
>
|
||||
> 🗓️ 2026-03-10 · 铸渊已发送邮件提醒
|
||||
=======
|
||||
> 🟢 **今日无需合作者手动干预** · 所有模块状态正常
|
||||
>
|
||||
> 🗓️ 2026-03-11 · 铸渊自动检测
|
||||
>>>>>>> origin/main
|
||||
<!-- COLLABORATOR_ALERT_END -->
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
# HoloLake Era 操作系统部署模块
|
||||
|
||||
<<<<<<< HEAD
|
||||
> 📋 **自动生成文档** · 铸渊（ZhùYuān）维护 · 最后更新：2026-03-10 12:37 UTC
|
||||
=======
|
||||
> 📋 **自动生成文档** · 铸渊（ZhùYuān）维护 · 最后更新：2026-03-10 15:36 UTC
|
||||
>>>>>>> origin/main
|
||||
>
|
||||
> 本文档由 GitHub Actions 自动触发生成，每当合作者上传/更新模块时自动刷新。
|
||||
> 按合作者编号（DEV-XXX）整理所有已上传模块。
|
||||
|
|
@ -143,24 +139,14 @@ m10-cloud/
|
|||
help.js
|
||||
```
|
||||
|
||||
<<<<<<< HEAD
|
||||
### 📦 m15-cloud-drive
|
||||
=======
|
||||
### 📦 M15 云盘系统
|
||||
>>>>>>> origin/main
|
||||
|
||||
| 字段 | 内容 |
|
||||
|------|------|
|
||||
| **目录** | `m15-cloud-drive/` |
|
||||
<<<<<<< HEAD
|
||||
| **负责人** | 燕樊 |
|
||||
| **状态** | 未知 |
|
||||
| **技术栈** | 待定 |
|
||||
=======
|
||||
| **负责人** | 燕樊（DEV-003） |
|
||||
| **状态** | 已毕业 |
|
||||
| **技术栈** | HTML + CSS + JavaScript（纯前端） |
|
||||
>>>>>>> origin/main
|
||||
| **依赖模块** | 无 |
|
||||
|
||||
**结构检查：** ⚠️ src/ · ⚠️ package.json · ⚠️ SYSLOG.md
|
||||
|
|
@ -169,10 +155,7 @@ m10-cloud/
|
|||
|
||||
```
|
||||
m15-cloud-drive/
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
README.md
|
||||
>>>>>>> origin/main
|
||||
cloud-drive-style.css
|
||||
cloud-drive.html
|
||||
cloud-drive.js
|
||||
|
|
@ -184,37 +167,23 @@ m15-cloud-drive/
|
|||
|
||||
**角色：** 机器人工程师
|
||||
|
||||
<<<<<<< HEAD
|
||||
### 📦 钉钉机器人
|
||||
=======
|
||||
### 📦 钉钉开发者工作台 · Phase1 · SYSLOG自动处理系统
|
||||
>>>>>>> origin/main
|
||||
|
||||
| 字段 | 内容 |
|
||||
|------|------|
|
||||
| **目录** | `dingtalk-bot/` |
|
||||
| **负责人** | 之之 |
|
||||
<<<<<<< HEAD
|
||||
| **状态** | 环节0已完成 |
|
||||
| **技术栈** | Node.js + Express |
|
||||
| **依赖模块** | 无 |
|
||||
|
||||
**结构检查：** ⚠️ src/ · ⚠️ package.json · ⚠️ SYSLOG.md
|
||||
=======
|
||||
| **状态** | 未知 |
|
||||
| **技术栈** | 待定 |
|
||||
| **依赖模块** | 无 |
|
||||
|
||||
**结构检查：** ⚠️ src/ · ✅ package.json · ⚠️ SYSLOG.md
|
||||
>>>>>>> origin/main
|
||||
|
||||
**已上传文件：**
|
||||
|
||||
```
|
||||
dingtalk-bot/
|
||||
README.md
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
broadcast-generator.js
|
||||
config.json
|
||||
dingtalk-api.js
|
||||
|
|
@ -222,7 +191,6 @@ dingtalk-bot/
|
|||
package.json
|
||||
server.js
|
||||
syslog-parser.js
|
||||
>>>>>>> origin/main
|
||||
```
|
||||
|
||||
---
|
||||
|
|
@ -372,11 +340,7 @@ m11-module/
|
|||
| 已上传模块数 | 12 |
|
||||
| 待上传模块数 | 0 |
|
||||
| 上传完成率 | 100% |
|
||||
<<<<<<< HEAD
|
||||
| 文档更新时间 | 2026-03-10 12:37 UTC |
|
||||
=======
|
||||
| 文档更新时间 | 2026-03-10 15:36 UTC |
|
||||
>>>>>>> origin/main
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -9,127 +9,6 @@
|
|||
<body>
|
||||
<div class="app-container">
|
||||
<!-- 顶部标题栏 -->
|
||||
<<<<<<< HEAD
|
||||
<div class="header">
|
||||
<h1>公告栏</h1>
|
||||
<div class="header-actions">
|
||||
<span class="pinned-badge">2条置顶</span>
|
||||
<button class="subscribe-btn">订阅</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 频道标签栏 -->
|
||||
<div class="channel-bar">
|
||||
<span class="channel active">全部</span>
|
||||
<span class="channel">系统公告</span>
|
||||
<span class="channel">开发动态</span>
|
||||
<span class="channel">团队消息</span>
|
||||
</div>
|
||||
|
||||
<!-- 公告列表 -->
|
||||
<div class="bulletin-list">
|
||||
<!-- 置顶公告1 -->
|
||||
<div class="bulletin-card pinned">
|
||||
<div class="pin-indicator">置顶</div>
|
||||
<div class="bulletin-icon system"></div>
|
||||
<div class="bulletin-content">
|
||||
<div class="bulletin-header">
|
||||
<span class="bulletin-title">光湖系统MVP v0.4.0发布公告</span>
|
||||
<span class="bulletin-time">2小时前</span>
|
||||
</div>
|
||||
<p class="bulletin-summary">主域公告栏与频道过渡系统（M22）正式进入环节0开发。新增公告置顶、频道分类、时间线展示功能，信息展示层逐步完善。</p>
|
||||
<div class="bulletin-footer">
|
||||
<span class="bulletin-tag tag-system">系统公告</span>
|
||||
<span class="bulletin-author">发布者：曜冥主控</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 置顶公告2 -->
|
||||
<div class="bulletin-card pinned">
|
||||
<div class="pin-indicator">置顶</div>
|
||||
<div class="bulletin-icon dev"></div>
|
||||
<div class="bulletin-content">
|
||||
<div class="bulletin-header">
|
||||
<span class="bulletin-title">SYSLOG提交流程v2上线通知</span>
|
||||
<span class="bulletin-time">5小时前</span>
|
||||
</div>
|
||||
<p class="bulletin-summary">SYSLOG生成方式已更新为「知秋主动提问制」完成任务后由知秋引导填写，无需手动套用模板。即日起生效。</p>
|
||||
<div class="bulletin-footer">
|
||||
<span class="bulletin-tag tag-dev">开发动态</span>
|
||||
<span class="bulletin-author">发布者：知秋</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 普通公告1 -->
|
||||
<div class="bulletin-card">
|
||||
<div class="bulletin-icon team"></div>
|
||||
<div class="bulletin-content">
|
||||
<div class="bulletin-header">
|
||||
<span class="bulletin-title">欢迎Awen加入光湖团队！</span>
|
||||
<span class="bulletin-time">1天前</span>
|
||||
</div>
|
||||
<p class="bulletin-summary">DEV-012 Awen正式加入光湖开发团队，成为第12位协作者。首个模块M09消息通知中心已全通关！</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 普通公告2 -->
|
||||
<div class="bulletin-card">
|
||||
<div class="bulletin-icon dev"></div>
|
||||
<div class="bulletin-content">
|
||||
<div class="bulletin-header">
|
||||
<span class="bulletin-title">M08数据统计面板全通关</span>
|
||||
<span class="bulletin-time">2天前</span>
|
||||
</div>
|
||||
<p class="bulletin-summary">完成M08全部环节，七连胜达成！响应式布局+SVG环形图+CSV导出一次通过，正式前端毕业</p>
|
||||
<div class="bulletin-footer">
|
||||
<span class="bulletin-tag tag-dev">开发动态</span>
|
||||
<span class="bulletin-author">发布者：霜砚</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 普通公告3 -->
|
||||
<div class="bulletin-card">
|
||||
<div class="bulletin-icon system"></div>
|
||||
<div class="bulletin-content">
|
||||
<div class="bulletin-header">
|
||||
<span class="bulletin-title">HTTPS配置与飞书Webhook联调完成</span>
|
||||
<span class="bulletin-time">3天前</span>
|
||||
</div>
|
||||
<p class="bulletin-summary">光湖主域已完成HTTPS配置与飞书Webhook全链路联调，Nginx+PM2+Certbot部署完毕，系统脊梁正式贯通。</p>
|
||||
<div class="bulletin-footer">
|
||||
<span class="bulletin-tag tag-system">系统公告</span>
|
||||
<span class="bulletin-author">发布者：页页</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 普通公告4 -->
|
||||
<div class="bulletin-card">
|
||||
<div class="bulletin-icon team"></div>
|
||||
<div class="bulletin-content">
|
||||
<div class="bulletin-header">
|
||||
<span class="bulletin-title">本周开发者进度总览</span>
|
||||
<span class="bulletin-time">3天前</span>
|
||||
</div>
|
||||
<p class="bulletin-summary">12位开发者中8位活跃，累计完成30+个环节。肥猫五连胜、桔子七连胜、小草莓五连胜、Awen四连胜团队势头强劲！</p>
|
||||
<div class="bulletin-footer">
|
||||
<span class="bulletin-tag tag-team">团队消息</span>
|
||||
<span class="bulletin-author">发布者：曜冥主控</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 底部状态栏 -->
|
||||
<div class="footer">
|
||||
<span>共6条公告2条置顶</span>
|
||||
<span class="footer-brand">HoloLake光湖系统</span>
|
||||
</div>
|
||||
</div>
|
||||
=======
|
||||
<header class="header">
|
||||
<h1 data-i18n="title">公告栏</h1>
|
||||
<div class="header-actions">
|
||||
|
|
@ -164,7 +43,6 @@
|
|||
<!-- 先加载 i18n，再加载其他 JS -->
|
||||
<script src="i18n.js"></script>
|
||||
<script src="api.js"></script>
|
||||
>>>>>>> origin/main
|
||||
<script src="storage.js"></script>
|
||||
<script src="script.js"></script>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -1,165 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
// ========== 确保 HoloLake 命名空间存在 ==========
|
||||
window.HoloLake = window.HoloLake || {};
|
||||
|
||||
// ========== 页面加载完成后执行 ==========
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
console.log('🚀 script.js 初始化');
|
||||
|
||||
// 恢复所有状态
|
||||
restoreState();
|
||||
|
||||
// 绑定事件
|
||||
bindEvents();
|
||||
|
||||
// 更新布局信息
|
||||
updateLayoutInfo();
|
||||
|
||||
// 监听窗口大小变化
|
||||
window.addEventListener('resize', function() {
|
||||
updateLayoutInfo();
|
||||
});
|
||||
});
|
||||
|
||||
// ========== 恢复状态 ==========
|
||||
function restoreState() {
|
||||
console.log('🔍 restoreState 开始...');
|
||||
|
||||
try {
|
||||
// 1. 恢复订阅状态
|
||||
const isSubscribed = HoloLake.UserState.isSubscribed();
|
||||
const subscribeBtn = document.querySelector('.subscribe-btn');
|
||||
if (subscribeBtn) {
|
||||
if (isSubscribed) {
|
||||
subscribeBtn.classList.add('active');
|
||||
subscribeBtn.textContent = '已订阅';
|
||||
} else {
|
||||
subscribeBtn.classList.remove('active');
|
||||
subscribeBtn.textContent = '订阅';
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 恢复已读公告
|
||||
const readList = HoloLake.UserState.getReadBulletins();
|
||||
const bulletinCards = document.querySelectorAll('.bulletin-card');
|
||||
bulletinCards.forEach((card, index) => {
|
||||
const bulletinId = `bulletin-${index}`;
|
||||
if (readList.includes(bulletinId)) {
|
||||
card.classList.add('read');
|
||||
}
|
||||
});
|
||||
|
||||
// 3. 恢复选中频道
|
||||
const activeChannel = HoloLake.UserState.getActiveChannel();
|
||||
const channels = document.querySelectorAll('.channel');
|
||||
channels.forEach(channel => {
|
||||
const channelText = channel.textContent.trim();
|
||||
if (channelText === activeChannel || (activeChannel === '全部' && channelText === '全部')) {
|
||||
channel.classList.add('active');
|
||||
} else {
|
||||
channel.classList.remove('active');
|
||||
}
|
||||
});
|
||||
|
||||
// 4. 更新最后访问时间
|
||||
HoloLake.UserState.updateLastVisit();
|
||||
|
||||
console.log('✅ 恢复已完成');
|
||||
} catch (e) {
|
||||
console.error('❌ 恢复失败:', e);
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 绑定事件 ==========
|
||||
function bindEvents() {
|
||||
console.log('🔗 绑定事件...');
|
||||
|
||||
// 订阅按钮
|
||||
const subscribeBtn = document.querySelector('.subscribe-btn');
|
||||
if (subscribeBtn) {
|
||||
subscribeBtn.addEventListener('click', function() {
|
||||
const newState = HoloLake.UserState.toggleSubscribe();
|
||||
if (newState) {
|
||||
this.classList.add('active');
|
||||
this.textContent = '已订阅';
|
||||
} else {
|
||||
this.classList.remove('active');
|
||||
this.textContent = '订阅';
|
||||
}
|
||||
console.log('📌 订阅状态:', newState ? '已订阅' : '未订阅');
|
||||
});
|
||||
}
|
||||
|
||||
// 频道点击
|
||||
const channels = document.querySelectorAll('.channel');
|
||||
channels.forEach(channel => {
|
||||
channel.addEventListener('click', function() {
|
||||
// 更新UI
|
||||
channels.forEach(c => c.classList.remove('active'));
|
||||
this.classList.add('active');
|
||||
|
||||
// 保存状态
|
||||
const channelName = this.textContent.trim();
|
||||
HoloLake.UserState.setActiveChannel(channelName);
|
||||
|
||||
// 筛选公告（可选功能，这里先做简单筛选）
|
||||
filterBulletinsByChannel(channelName);
|
||||
|
||||
console.log('📺 切换到频道:', channelName);
|
||||
});
|
||||
});
|
||||
|
||||
// 公告点击（标记已读）
|
||||
const bulletinCards = document.querySelectorAll('.bulletin-card');
|
||||
bulletinCards.forEach((card, index) => {
|
||||
card.addEventListener('click', function() {
|
||||
const bulletinId = `bulletin-${index}`;
|
||||
|
||||
// 标记已读
|
||||
if (!this.classList.contains('read')) {
|
||||
this.classList.add('read');
|
||||
HoloLake.UserState.markAsRead(bulletinId);
|
||||
console.log('📖 已读公告:', bulletinId);
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// ========== 按频道筛选 ==========
|
||||
function filterBulletinsByChannel(channelName) {
|
||||
const cards = document.querySelectorAll('.bulletin-card');
|
||||
|
||||
if (channelName === '全部') {
|
||||
cards.forEach(card => {
|
||||
card.style.display = 'flex';
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
cards.forEach(card => {
|
||||
const tag = card.querySelector('.bulletin-tag');
|
||||
if (tag && tag.textContent.trim() === channelName) {
|
||||
card.style.display = 'flex';
|
||||
} else {
|
||||
card.style.display = 'none';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ========== 更新布局信息 ==========
|
||||
function updateLayoutInfo() {
|
||||
const width = window.innerWidth;
|
||||
let mode = '桌面';
|
||||
|
||||
if (width <= 480) {
|
||||
mode = '手机';
|
||||
} else if (width <= 768) {
|
||||
mode = '平板';
|
||||
}
|
||||
|
||||
console.log(`📱 当前布局: ${mode}模式 (${width}px)`);
|
||||
}
|
||||
=======
|
||||
// ===== script.js =====
|
||||
// 知秋：主逻辑·动态渲染+loading+错误处理+i18n+无障碍
|
||||
|
||||
|
|
@ -377,4 +215,3 @@ function updateLayoutInfo() {
|
|||
// 启动一切
|
||||
init();
|
||||
})();
|
||||
>>>>>>> origin/main
|
||||
|
|
|
|||
|
|
@ -63,11 +63,7 @@ body {
|
|||
}
|
||||
|
||||
/* ========== 频道栏 ========== */
|
||||
<<<<<<< HEAD
|
||||
.channel-bar {
|
||||
=======
|
||||
.channel-tab-bar {
|
||||
>>>>>>> origin/main
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
padding: 16px 0;
|
||||
|
|
@ -75,11 +71,7 @@ body {
|
|||
overflow-x: auto;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.channel {
|
||||
=======
|
||||
.channel-tab {
|
||||
>>>>>>> origin/main
|
||||
padding: 8px 18px;
|
||||
border-radius: 20px;
|
||||
border: 1px solid rgba(255,255,255,0.1);
|
||||
|
|
@ -91,20 +83,12 @@ body {
|
|||
white-space: nowrap;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.channel:hover {
|
||||
=======
|
||||
.channel-tab:hover {
|
||||
>>>>>>> origin/main
|
||||
border-color: rgba(255, 183, 77, 0.3);
|
||||
color: #b0bec5;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.channel.active {
|
||||
=======
|
||||
.channel-tab.active {
|
||||
>>>>>>> origin/main
|
||||
background: rgba(255,183,77,0.15);
|
||||
border-color: #ffb74d;
|
||||
color: #ffb74d;
|
||||
|
|
@ -240,40 +224,24 @@ body {
|
|||
header h1 {
|
||||
font-size: 18px;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
.channel-bar {
|
||||
gap: 6px;
|
||||
padding: 12px 0;
|
||||
}
|
||||
.channel {
|
||||
=======
|
||||
.channel-tab-bar {
|
||||
gap: 6px;
|
||||
padding: 12px 0;
|
||||
}
|
||||
.channel-tab {
|
||||
>>>>>>> origin/main
|
||||
padding: 6px 14px;
|
||||
font-size: 12px;
|
||||
}
|
||||
.bulletin-card {
|
||||
padding: 12px 10px;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
.channel-bar {
|
||||
=======
|
||||
.channel-tab-bar {
|
||||
>>>>>>> origin/main
|
||||
flex-wrap: nowrap;
|
||||
overflow-x: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
scrollbar-width: none;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
.channel-bar::-webkit-scrollbar {
|
||||
=======
|
||||
.channel-tab-bar::-webkit-scrollbar {
|
||||
>>>>>>> origin/main
|
||||
display: none;
|
||||
}
|
||||
.bulletin-card {
|
||||
|
|
@ -362,19 +330,11 @@ body {
|
|||
height: 32px;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.channel-tabs {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.channel-tab {
|
||||
=======
|
||||
.channel-tab-tabs {
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.channel-tab-tab {
|
||||
>>>>>>> origin/main
|
||||
padding: 6px 12px;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
|
@ -409,11 +369,7 @@ body {
|
|||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.channel-tabs {
|
||||
=======
|
||||
.channel-tab-tabs {
|
||||
>>>>>>> origin/main
|
||||
overflow-x: auto;
|
||||
white-space: nowrap;
|
||||
flex-wrap: nowrap;
|
||||
|
|
@ -423,19 +379,11 @@ body {
|
|||
scrollbar-width: none; /* Firefox隐藏滚动条 */
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.channel-tabs::-webkit-scrollbar {
|
||||
display: none; /* Chrome/Safari隐藏滚动条 */
|
||||
}
|
||||
|
||||
.channel-tab {
|
||||
=======
|
||||
.channel-tab-tabs::-webkit-scrollbar {
|
||||
display: none; /* Chrome/Safari隐藏滚动条 */
|
||||
}
|
||||
|
||||
.channel-tab-tab {
|
||||
>>>>>>> origin/main
|
||||
display: inline-block;
|
||||
float: none;
|
||||
white-space: nowrap;
|
||||
|
|
@ -446,8 +394,6 @@ body {
|
|||
text-align: center;
|
||||
gap: 8px;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
}/* ===== 知秋：loading/error/empty 状态样式 ===== */
|
||||
|
||||
/* loading */
|
||||
|
|
@ -574,5 +520,4 @@ body {
|
|||
background: black;
|
||||
border-color: black;
|
||||
}
|
||||
>>>>>>> origin/main
|
||||
}
|
||||
Loading…
Reference in New Issue