Skip to content

AM_PM #48

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

Merged
bacurrah merged 3 commits into from
Dec 8, 2025
Merged

AM_PM #48

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
327c6ce
BUILD
BogachanKarabiyik Dec 1, 2025
13a6eb0
AMAMAMAM
BogachanKarabiyik Dec 3, 2025
6a8fa2e
Add AM/PM setting
Dec 3, 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
8 changes: 0 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rsbuild.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { pluginTypedCSSModules } from "@rsbuild/plugin-typed-css-modules";
export default defineConfig({
plugins: [pluginReact(), pluginTypedCSSModules()],
output: {
assetPrefix: "/newtabplus/",
assetPrefix: ".",
cssModules: {
auto: (resource) => {
return resource.includes("") || resource.includes(".module.");
Expand Down
1 change: 1 addition & 0 deletions src/WidgetMap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const WidgetMap = {
size: { width: 4, height: 2 },
settings: {
use24HourClock: false,
showAMPM: false,
showDate: true,
showYear: true,
} satisfies ClockSettings,
Expand Down
1 change: 1 addition & 0 deletions src/widgets/Clock.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
}

.clock {
text-wrap-mode: nowrap;
font-size: 4rem;
font-weight: 700;
}
Expand Down
8 changes: 7 additions & 1 deletion src/widgets/Clock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import styles from "./Clock.css";

export interface ClockSettings {
use24HourClock: boolean;
showAMPM: boolean;
showDate: boolean;
showYear: boolean;
}
Expand All @@ -28,7 +29,12 @@ export function Clock({ settings }: WidgetState<ClockSettings>) {
? date.getHours()
: date.getHours() % 12 || 12) +
":" +
date.getMinutes().toString().padStart(2, "0")}
date.getMinutes().toString().padStart(2, "0") +
(!settings.use24HourClock && settings.showAMPM
? date.getHours() > 11
? " PM"
: " AM"
: "")}
</span>
{settings.showDate && (
<span className={styles.date}>
Expand Down