Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions cssAsPlugin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// https://github.com/tailwindlabs/tailwindcss-intellisense/issues/227#issuecomment-1462034856
// cssAsPlugin.js
const postcss = require("postcss")
const postcssJs = require("postcss-js")
const { readFileSync } = require("node:fs")

require.extensions[".css"] = function (module, filename) {
const cssAsPlugin = ({ addBase, addComponents, addUtilities }) => {
const css = readFileSync(filename, "utf8")
const root = postcss.parse(css)
const jss = postcssJs.objectify(root)

if ("@layer base" in jss) {
addBase(jss["@layer base"])
}
if ("@layer components" in jss) {
addComponents(jss["@layer components"])
}
if ("@layer utilities" in jss) {
addUtilities(jss["@layer utilities"])
}
}
module.exports = cssAsPlugin
}
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
"eslint": "^9.3.0",
"eslint-config-hyoban": "^2.9.3",
"lint-staged": "15.2.4",
"postcss": "8.4.38",
"postcss-js": "4.0.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"simple-git-hooks": "2.11.1",
Expand Down
12 changes: 9 additions & 3 deletions pnpm-lock.yaml

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

8 changes: 0 additions & 8 deletions src/renderer/src/assets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ body,
font-family: "SN Pro", sans-serif;
}

.drag-region {
-webkit-app-region: drag;
}

.no-drag-region {
-webkit-app-region: no-drag;
}

button,
a {
@apply cursor-default;
Expand Down
13 changes: 13 additions & 0 deletions src/renderer/src/assets/tailwind-extend.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* This CSS File do not import anywhere, just write atom class for tailwindcss. The tailwindcss intellisense will be work. */

@tailwind components;

@layer components {
.drag-region {
-webkit-app-region: drag;
}

.no-drag-region {
-webkit-app-region: no-drag;
}
}
13 changes: 11 additions & 2 deletions src/renderer/src/components/entry-column/article-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import { FeedIcon } from "@renderer/components/feed-icon"
import { Image } from "@renderer/components/ui/image"
import dayjs from "@renderer/lib/dayjs"
import type { EntriesResponse } from "@renderer/lib/types"
import { cn } from "@renderer/lib/utils"

export function ArticleItem({ entry }: { entry: EntriesResponse[number] }) {
return (
<div className="my-5 flex px-2 py-3">
<FeedIcon feed={entry.feeds} />
<div className="-mt-0.5 line-clamp-5 flex-1 text-sm leading-tight">
<div className="space-x-1 text-[10px] text-zinc-500">
<div className="space-x-1 text-[10px] font-bold text-zinc-500">
<span>{entry.feeds.title}</span>
<span>·</span>
<span>
Expand All @@ -20,7 +21,15 @@ export function ArticleItem({ entry }: { entry: EntriesResponse[number] }) {
.humanize()}
</span>
</div>
<div className="my-0.5 break-words font-medium">{entry.title}</div>

<div
className={cn(
"my-0.5 break-words font-medium text-foreground/60",
!entry.read && "text-black dark:text-white/90",
)}
>
{entry.title}
</div>
<div className="text-[13px] text-zinc-500">{entry.description}</div>
</div>
{entry.images?.[0] && (
Expand Down
4 changes: 2 additions & 2 deletions src/renderer/src/components/entry-column/item-wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ export function EntryItemWrapper({
key={entry.id}
className={cn(
"rounded-md transition-colors",
activeEntry === entry.id && "bg-native-active",
entry.read && "text-foreground/50",
activeEntry === entry.id && "bg-native-active/50",
entry.read && "text-foreground/80",
)}
ref={itemRef}
onClick={(e) => {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/components/entry-content/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export function EntryContent({ entryId }: { entryId: ActiveEntry }) {
<a
href={entry.data?.url || void 0}
target="_blank"
className="mx-auto block max-w-[598px] rounded-md p-6 transition-colors hover:bg-zinc-100"
className="mx-auto block max-w-[598px] rounded-md p-6 transition-colors hover:bg-zinc-100 dark:hover:bg-neutral-800"
rel="noreferrer"
>
<div className="select-text break-words text-3xl font-bold">
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/src/pages/(main)/(context)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export function Component() {
<>
<div
className={cn(
"h-full shrink-0 overflow-y-auto border-r pt-10",
"h-full shrink-0 overflow-y-auto border-r",
window.electron ? "pt-10" : "pt-4",
activeList && wideMode.has(activeList.view) ? "flex-1" : "w-[340px]",
)}
>
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/src/pages/(main)/(context)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { FeedColumn } from "@renderer/components/feed-column"
import { cn } from "@renderer/lib/utils"
import { Outlet } from "react-router-dom"

export function Component() {
return (
<div className="flex h-full">
<div className="w-64 shrink-0 border-r bg-native/80 pt-10 backdrop-blur">
<div className={cn("w-64 shrink-0 border-r bg-native/80 backdrop-blur", window.electron ? "pt-10" : "pt-4")}>
<FeedColumn />
</div>
<div className="flex flex-1 bg-background">
Expand Down
3 changes: 3 additions & 0 deletions tailwind.config.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const { iconsPlugin, getIconCollections } = require("@egoist/tailwindcss-icons")

require("./cssAsPlugin")

/** @type {import('tailwindcss').Config} */
module.exports = {
darkMode: ["class"],
Expand Down Expand Up @@ -88,5 +90,6 @@ module.exports = {
}),
require("tailwindcss-animate"),
require("@tailwindcss/typography"),
require("./src/renderer/src/assets/tailwind-extend.css"),
],
}