Skip to content

Replace Bootstrap with BeerCSS custom elements for Material Design 3 interface #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Replace Bootstrap with BeerCSS custom elements for Material Design 3 interface #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cdd808
Initial plan
Copilot Aug 13, 2025
b0df7f1
Replace Bootstrap with BeerCSS in index.html, App, Home, and NavBar c…
Copilot Aug 13, 2025
538369a
Complete Bootstrap to BeerCSS migration for all main components
Copilot Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
<link rel="manifest" href="src/index.webmanifest" />

<script src="https://polyfill.web-cell.dev/feature/PWAManifest.js"></script>
<link
rel="stylesheet"
href="https://unpkg.com/bootstrap@5.3.3/dist/css/bootstrap.min.css"
/>

<script src="https://polyfill.web-cell.dev/feature/ECMAScript.js"></script>
<script src="https://polyfill.web-cell.dev/feature/WebComponents.js"></script>
<script src="https://polyfill.web-cell.dev/feature/ElementInternals.js"></script>
Expand Down
8 changes: 5 additions & 3 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ export class GitHubApp extends HTMLElement {
return (
<>
<NavBar />
<div className="container" id="PageBox">
<CellRouter routes={this.routes} />
</div>
<main className="grid" id="PageBox">
<div className="s12">
<CellRouter routes={this.routes} />
</div>
</main>
</>
);
}
Expand Down
5 changes: 3 additions & 2 deletions src/components/Loading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { FC } from 'web-cell';

export const Loading: FC = () => (
<div className="text-center">
<div className="spinner">加载中...</div>
<div className="center-align">
<progress className="circle"></progress>
<p>加载中...</p>
</div>
);
85 changes: 37 additions & 48 deletions src/components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,54 +66,43 @@ export class NavBar extends HTMLElement {

render() {
return (
<nav className={`navbar navbar-fixed-top ${this.dark ? 'navbar-inverse' : ''}`}>
<div className="container">
<div className="navbar-header">
<button
type="button"
className="navbar-toggle collapsed"
data-toggle="collapse"
data-target="#Main_Nav"
aria-expanded="false"
>
<span className="sr-only">Toggle navigation</span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
<span className="icon-bar"></span>
</button>
<a className="navbar-brand" href="#/" title="返回首页">
{this.title}
</a>
</div>

<div className="collapse navbar-collapse" id="Main_Nav">
<form className="navbar-form navbar-left" id="search-form">
<div className="form-group">
<input
type="search"
className="form-control"
name="keyword"
required
placeholder="定位：用户 ID、仓库全名"
/>
</div>
</form>

<ul className="nav navbar-nav">
{this.channels.map(({ title, name, URL, target }, index) => (
<li role={URL ? '' : 'separator'} className={URL ? '' : 'divider'}>
<a
target={target || ''}
href={URL}
title={name}
data-autofocus={index === 0 ? 'true' : undefined}
>
{title}
</a>
</li>
))}
</ul>
</div>
<nav className="top">
<h5>
<a href="#/" title="返回首页">
{this.title}
</a>
</h5>
<div className="max">
<form id="search-form">
<div className="field border">
<input
type="search"
name="keyword"
required
placeholder="定位：用户 ID、仓库全名"
/>
</div>
</form>
<a>
<i>menu</i>
</a>
<nav className="drawer">
{this.channels.map(({ title, name, URL, target }, index) => (
<a
key={title}
target={target || ''}
href={URL}
title={name}
data-autofocus={index === 0 ? 'true' : undefined}
>
<i>link</i>
<div>
<div>{title}</div>
{name && <div>{name}</div>}
</div>
</a>
))}
</nav>
</div>
</nav>
);
Expand Down
1 change: 1 addition & 0 deletions src/main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { auto } from 'browser-unhandled-rejection';
import { DOMRenderer } from 'dom-renderer';
import { configure } from 'mobx';
import { documentReady, serviceWorkerUpdate } from 'web-utility';
import 'beercss';

import { GitHubApp } from './App';
import { renderMode } from './utility';
Expand Down
32 changes: 17 additions & 15 deletions src/page/Gists.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,24 @@ export default class GistsPage extends HTMLElement {
if (downloading) return <Loading />;

return (
<div className="row">
<div className="col-md-12">
<div className="grid">
<div className="s12">
<h2>GitHub Gists (G 锦)</h2>
<table className="table table-striped table-hover">
<thead>
<tr>
<th>序号</th>
<th>标题</th>
<th>创建时间</th>
<th>更新时间</th>
</tr>
</thead>
<tbody>
{gists.map(this.renderGistRow)}
</tbody>
</table>
<div className="table-wrapper">
<table>
<thead>
<tr>
<th>序号</th>
<th>标题</th>
<th>创建时间</th>
<th>更新时间</th>
</tr>
</thead>
<tbody>
{gists.map(this.renderGistRow)}
</tbody>
</table>
</div>
</div>
</div>
);
Expand Down
18 changes: 9 additions & 9 deletions src/page/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export function HomePage() {
return (
<div className="row">
<div className="col-md-12">
<div className="jumbotron">
<div className="grid">
<div className="s12">
<div className="large-space center-align">
<h1>GitHub 中文版</h1>
<p>基于 WebCell v3 重写的现代化 GitHub 浏览器</p>
<p>
<a className="btn btn-primary btn-lg" href="#/events" role="button">查看 G 流</a>
<a className="btn btn-success btn-lg" href="#/repos" role="button">浏览 G 仓</a>
<a className="btn btn-info btn-lg" href="#/users" role="button">发现 G 友</a>
</p>
<p className="large-text">基于 WebCell v3 重写的现代化 GitHub 浏览器</p>
<div className="space">
<a className="button large fill" href="#/events" role="button">查看 G 流</a>
<a className="button large fill" href="#/repos" role="button">浏览 G 仓</a>
<a className="button large fill" href="#/users" role="button">发现 G 友</a>
</div>
</div>
</div>
</div>
Expand Down
34 changes: 17 additions & 17 deletions src/page/User.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,44 +22,44 @@ export default class UserPage extends HTMLElement {
if (!user) return <div>用户不存在</div>;

return (
<div className="row">
<div className="col-md-4">
<div className="panel panel-default">
<div className="panel-body text-center">
<div className="grid">
<div className="s12 m4">
<article className="card">
<div className="center-align">
<img
src={user.avatar_url}
className="img-circle"
className="circle"
width={150}
height={150}
alt={user.login}
/>
<h3>{user.name || user.login}</h3>
<p className="text-muted">@{user.login}</p>
<h4>{user.name || user.login}</h4>
<p className="secondary-text">@{user.login}</p>
{user.bio && <p>{user.bio}</p>}
<div className="row">
<div className="col-xs-4">
<div className="grid no-space">
<div className="s4">
<strong>{user.public_repos}</strong>
<br />
<small>仓库</small>
</div>
<div className="col-xs-4">
<div className="s4">
<strong>{user.followers}</strong>
<br />
<small>关注者</small>
</div>
<div className="col-xs-4">
<div className="s4">
<strong>{user.following}</strong>
<br />
<small>关注</small>
</div>
</div>
</div>
</div>
</article>
</div>
<div className="col-md-8">
<h3>用户信息</h3>
<div className="panel panel-default">
<div className="panel-body">
<div className="s12 m8">
<h4>用户信息</h4>
<article className="card">
<div>
{user.company && (
<p>
<strong>公司:</strong> {user.company}
Expand All @@ -77,7 +77,7 @@ export default class UserPage extends HTMLElement {
</a>
</p>
</div>
</div>
</article>
</div>
</div>
);
Expand Down
20 changes: 10 additions & 10 deletions src/page/Users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@ export default class UsersPage extends HTMLElement {
}

renderUserCard = ({ avatar_url, login, id }: User) => (
<div key={id} className="col-md-4 col-sm-6">
<div className="panel panel-default">
<div className="panel-body text-center">
<div key={id} className="s12 m6 l4">
<article className="card">
<div className="center-align">
<img
src={avatar_url}
className="img-circle"
className="circle"
width={64}
height={64}
alt={login}
/>
<h4>
<h5>
<a href={`#/users/${login}`}>{login}</a>
</h4>
</h5>
<p>
<small>ID: {id}</small>
</p>
</div>
</div>
</article>
</div>
);

Expand All @@ -39,10 +39,10 @@ export default class UsersPage extends HTMLElement {
if (downloading > 0) return <Loading />;

return (
<div className="row">
<div className="col-md-12">
<div className="grid">
<div className="s12">
<h2>GitHub 用户 (G 友)</h2>
<div className="row">
<div className="grid">
{users.map(this.renderUserCard)}
</div>
</div>
Expand Down