+1








913b1178c8
* fix(path): change path package to pathe * fix: handle special chat in filename, fixed #3342 - Integrated @sindresorhus/slugify to format file names based on titles. - Updated pnpm-lock.yaml to include new dependencies. - Minor adjustments in package.json files to ensure consistency. Signed-off-by: Innei <tukon479@gmail.com> * fix: add eslint rule for use pathe first * refactor: useWhoami from user store (#4061) * refactor: useWhoami from user store * update * update * update * update * return all * fix: invalidate entries query after unsubscribe * feat: implement imperative modal (#4041) * feat: implement ImperativeModalProvider with modal context and controls * fix: make onClose prop optional for bottom modal * chore: add ImperativeModalProvider to context providers * feat: wrap BottomModal content in KeyboardAvoidingView for better keyboard handling * chore: add polyfill for Promise.withResolvers * fix: wrap ImperativeModal in a View and update onClose to accept modal ID * feat: implement ImperativeModal with context and modal control hooks * refactor: redesign imperative modal with root-siblings * fix: wrap BottomModal in a View to resolve rendering issues on Android * refactor: replace Alert.prompt with modalPrompt for category creation and renaming * fix(desktop): show login modal when auth fail * feat: invalidate entry readability cache * refactor: long press to open text select sheet for ai summary * feat: new domain folo.is * fix: enhance auth client with mobile-specific headers (#4064) * feat(desktop): add missing i18n key (#4066) * feat: update twitter handle * docs: use google play badge * feat: add hideAvatar prop to ProfileSettingForm for conditional avatar display Signed-off-by: Innei <tukon479@gmail.com> * docs: update images * feat(ssr): add Google Analytics tracking to index.html - Integrated Google Tag Manager for enhanced tracking and analytics capabilities. - Added asynchronous loading of gtag.js and configuration for tracking ID G-DZMBZBW3EC. Signed-off-by: Innei <tukon479@gmail.com> * chore: Update Japanese Languages (#4078) * chore: update ja.json * chore: update 6 ja.json files chore: update and bump 6 ja.json files. * chore: update error/ja.json fix locale/error/ja.json * chore: auto-fix linting and formatting issues * chore: update app/ja.json * chore: update ja.json * chore: update ja.json * chore: update ja.json and tested local. * chore: update ja.json update settings/ja.json * feat(i18n): update Japanese locale files with new error messages and dialog options * chore(vscode): set default formatter for JSON and JSONC files * Remove JSON and JSONC formatter settings so sorry, @hyoban 😢 Perhaps my local settings are in. I have restored it to the original. Thanks for your kindness. You have always been a great help. * chore: auto-fix linting and formatting issues * chore: update ja.json sync and update settings/ja.json * chore: update Japanese translations for clarity and consistency * chore: update some ja.json * chore(locales): update Japanese translations with new entry actions and settings * fix: update Japanese translations for user actions and login prompts * feat(locales): add Japanese translations for login and registration features * feat(locales): update Japanese translations for RSSHub and related settings * chore: auto-fix linting and formatting issues * feat(i18n): update Japanese locale with new toolbar customization and profile link social fields * feat(locales): update Japanese translations for search results and two-factor authentication * feat: 日本語ローカライズの更新 --------- Co-authored-by: dai <dai@users.noreply.github.com> Co-authored-by: Innei <i@innei.in> Co-authored-by: Innei <Innei@users.noreply.github.com> * feat(desktop): real user deletion * feat(mobile): real user deletion * feat(settings): add accent color customization and update UI components - Introduced accent color setting to allow users to customize the app's interface. - Updated various components to utilize the new accent color, including buttons, sliders, and text elements. - Added translations for accent color settings in English, Japanese, and Chinese. - Refactored related styles in Tailwind CSS configuration to support the new accent color feature. Signed-off-by: Innei <tukon479@gmail.com> * fix: update text styling for feed parameters message * feat: use insertedBefore for mark above read * feat(mobile): use insertedBefore for mark above read * fix: improved lightbox component for iOS (#4089) * feat: replace Image component with ProxyImage for improved performance and styling * fix: update Image component style prop * fix: improved layout in ImageItem component * feat: integrate animated ref for media preview in EntryPictureItem * fix: option can not be press when out of screen in the FlatList * fix: lint * fix: types * fix: update lock * fix: lint * chore: auto-fix linting and formatting issues --------- Signed-off-by: Innei <tukon479@gmail.com> Co-authored-by: Innei <tukon479@gmail.com> Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com> Co-authored-by: Whitewater <me@waterwater.moe> Co-authored-by: lawvs <18554747+lawvs@users.noreply.github.com> Co-authored-by: DIYgod <i@diygod.me> Co-authored-by: Konv Suu <2583695112@qq.com> Co-authored-by: dai <dosada@gmail.com> Co-authored-by: dai <dai@users.noreply.github.com> Co-authored-by: Innei <i@innei.in> Co-authored-by: Innei <Innei@users.noreply.github.com>
199 lines
5.4 KiB
TypeScript
199 lines
5.4 KiB
TypeScript
/* @moduleResolution bundler */
|
|
import "./tw-css-plugin"
|
|
|
|
import { getIconCollections, iconsPlugin } from "@egoist/tailwindcss-icons"
|
|
import { cleanupSVG, importDirectorySync, isEmptyColor, parseColors, runSVGO } from "@iconify/tools"
|
|
import { compareColors, stringToColor } from "@iconify/utils/lib/colors"
|
|
import { merge } from "es-toolkit/compat"
|
|
import path, { resolve } from "pathe"
|
|
import { theme } from "tailwindcss/defaultConfig"
|
|
import type { Config } from "tailwindcss/types/config"
|
|
import { withUIKit } from "tailwindcss-uikit-colors/src/macos/tailwind"
|
|
import { workspaceRootSync } from "workspace-root"
|
|
|
|
const workspaceRoot = workspaceRootSync(__dirname)
|
|
const twConfig = {
|
|
darkMode: ["class", '[data-theme="dark"]'],
|
|
content: [],
|
|
prefix: "",
|
|
theme: {
|
|
container: {
|
|
center: true,
|
|
padding: "2rem",
|
|
screens: {
|
|
"2xl": "1400px",
|
|
},
|
|
},
|
|
|
|
fontSize: {
|
|
...theme?.fontSize,
|
|
largeTitle: ["1.625rem", "2rem"], // 26px
|
|
title1: ["1.375rem", "1.625rem"], // 22px
|
|
title2: ["1.0625rem", "1.375rem"], // 17px
|
|
title3: ["0.9375rem", "1.25rem"], // 15px
|
|
headline: ["0.8125rem", "1rem"], // 13px
|
|
body: ["0.8125rem", "1rem"], // 13px
|
|
callout: ["0.75rem", "0.9375rem"], // 12px
|
|
subheadline: ["0.6875rem", "0.875rem"], // 11px
|
|
footnote: ["0.625rem", "0.8125rem"], // 10px
|
|
caption: ["0.625rem", "0.8125rem"], // 10px
|
|
},
|
|
|
|
extend: {
|
|
fontFamily: {
|
|
theme: "var(--fo-font-family)",
|
|
default: "SN pro, sans-serif, system-ui",
|
|
},
|
|
|
|
colors: {
|
|
border: "hsl(var(--border) / <alpha-value>)",
|
|
background: "hsl(var(--background) / <alpha-value>)",
|
|
|
|
accent: "hsl(var(--fo-a) / <alpha-value>)",
|
|
folo: "#FF5C00",
|
|
|
|
theme: {
|
|
boxShadow: {
|
|
"context-menu":
|
|
"0px 0px 1px rgba(0, 0, 0, 0.4), 0px 0px 1.5px rgba(0, 0, 0, 0.3), 0px 7px 22px rgba(0, 0, 0, 0.25)",
|
|
},
|
|
|
|
item: {
|
|
active: "var(--fo-item-active)",
|
|
hover: "var(--fo-item-hover)",
|
|
},
|
|
selection: {
|
|
active: "var(--fo-selection-active)",
|
|
hover: "var(--fo-selection-hover)",
|
|
foreground: "var(--fo-selection-foreground)",
|
|
},
|
|
|
|
inactive: "hsl(var(--fo-inactive) / <alpha-value>)",
|
|
disabled: "hsl(var(--fo-disabled) / <alpha-value>)",
|
|
|
|
background: "var(--fo-background)",
|
|
},
|
|
},
|
|
borderRadius: {
|
|
lg: "var(--radius)",
|
|
md: "calc(var(--radius) - 2px)",
|
|
sm: "calc(var(--radius) - 4px)",
|
|
},
|
|
backdropBlur: {
|
|
background: "80px",
|
|
},
|
|
|
|
typography: (theme: any) => ({
|
|
zinc: {
|
|
css: {
|
|
"--tw-prose-body": theme("colors.zinc.500"),
|
|
"--tw-prose-quotes": theme("colors.zinc.500"),
|
|
},
|
|
},
|
|
}),
|
|
},
|
|
},
|
|
|
|
plugins: [
|
|
iconsPlugin({
|
|
collections: {
|
|
...getIconCollections(["mingcute", "simple-icons", "logos"]),
|
|
mgc: getCollections(path.resolve(workspaceRoot!, "./icons/mgc")),
|
|
},
|
|
}),
|
|
require("tailwindcss-animate"),
|
|
require("@tailwindcss/container-queries"),
|
|
require("@tailwindcss/typography"),
|
|
require("tailwindcss-motion"),
|
|
require("tailwindcss-safe-area"),
|
|
|
|
require(resolve(__dirname, "./tailwind-extend.css")),
|
|
],
|
|
} satisfies Config
|
|
|
|
export const extendConfig = (config: Config) => {
|
|
const result = merge({}, withUIKit(twConfig), config)
|
|
if (config.plugins) {
|
|
// Merge plugin array
|
|
result.plugins = [...twConfig.plugins, ...config.plugins]
|
|
}
|
|
return result
|
|
}
|
|
|
|
function getCollections(dir: string) {
|
|
// Import icons
|
|
const iconSet = importDirectorySync(dir, {
|
|
includeSubDirs: false,
|
|
})
|
|
|
|
// Validate, clean up, fix palette and optimism
|
|
iconSet.forEachSync((name, type) => {
|
|
if (type !== "icon") {
|
|
return
|
|
}
|
|
|
|
const svg = iconSet.toSVG(name)
|
|
if (!svg) {
|
|
// Invalid icon
|
|
iconSet.remove(name)
|
|
return
|
|
}
|
|
|
|
// Clean up and optimize icons
|
|
try {
|
|
// Clean up icon code
|
|
cleanupSVG(svg)
|
|
|
|
// Change color to `currentColor`
|
|
// Skip this step if icon has hardcoded palette
|
|
const blackColor = stringToColor("black")!
|
|
const whiteColor = stringToColor("white")!
|
|
parseColors(svg, {
|
|
defaultColor: "currentColor",
|
|
callback: (attr, colorStr, color) => {
|
|
if (!color) {
|
|
// Color cannot be parsed!
|
|
throw new Error(`Invalid color: "${colorStr}" in attribute ${attr}`)
|
|
}
|
|
|
|
if (isEmptyColor(color)) {
|
|
// Color is empty: 'none' or 'transparent'. Return as is
|
|
return color
|
|
}
|
|
|
|
// Change black to 'currentColor'
|
|
if (compareColors(color, blackColor)) {
|
|
return "currentColor"
|
|
}
|
|
|
|
// Remove shapes with white color
|
|
if (compareColors(color, whiteColor)) {
|
|
return "remove"
|
|
}
|
|
|
|
// NOTE: MGC icons has default color of #10161F
|
|
if (compareColors(color, stringToColor("#10161F")!)) {
|
|
return "currentColor"
|
|
}
|
|
|
|
// Icon is not monotone
|
|
return color
|
|
},
|
|
})
|
|
|
|
runSVGO(svg)
|
|
} catch (err) {
|
|
// Invalid icon
|
|
console.error(`Error parsing ${name}:`, err)
|
|
iconSet.remove(name)
|
|
return
|
|
}
|
|
|
|
// Update icon
|
|
iconSet.fromSVG(name, svg)
|
|
})
|
|
|
|
// Export
|
|
return iconSet.export()
|
|
}
|