diff --git a/package.json b/package.json index 7cdce9a..b4ba0c8 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@trpc/server": "11.18.0", "anchorme": "^3.0.8", "astro": "7.0.3", - "css95": "^0.2.0", + "css95": "^0.3.0", "solid-js": "^1.9.13", "solid-markdown": "^2.1.1", "tsx": "^4.22.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f2ef18..ee89578 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,8 +33,8 @@ importers: specifier: 7.0.3 version: 7.0.3(@astrojs/markdown-remark@7.2.0)(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)(@types/node@26.0.1)(jiti@2.7.0)(rollup@4.62.2)(tsx@4.22.4)(yaml@2.9.0) css95: - specifier: ^0.2.0 - version: 0.2.0(solid-js@1.9.13) + specifier: ^0.3.0 + version: 0.3.0(solid-js@1.9.13) solid-js: specifier: ^1.9.13 version: 1.9.13 @@ -1621,8 +1621,8 @@ packages: resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==} engines: {node: '>= 6'} - css95@0.2.0: - resolution: {integrity: sha512-/KfPdtRTD/V14mEggX0aTfL6qj2tzuN6D5Wbs+McRWAL9RYC+Ho64TDUpol6rkvd36cHcM/0CFpGLhJidlxcBA==} + css95@0.3.0: + resolution: {integrity: sha512-oNUMzvSZsJdGeR2k9WvmmkGN62U9+L+r1ddnBNUbWJJ7zbpvbyzxtnleF2i1efF4XH807n2T3GAg+3Njho7/fg==} engines: {node: '>=18'} peerDependencies: react: '>=18' @@ -5143,7 +5143,7 @@ snapshots: css-what@6.2.2: {} - css95@0.2.0(solid-js@1.9.13): + css95@0.3.0(solid-js@1.9.13): optionalDependencies: solid-js: 1.9.13 diff --git a/src/Wes95/components/Explorer.tsx b/src/Wes95/components/Explorer.tsx index 084a203..2399a00 100644 --- a/src/Wes95/components/Explorer.tsx +++ b/src/Wes95/components/Explorer.tsx @@ -23,8 +23,8 @@ import { } from '../system/FileSystem/registry'; import { isAppURL } from '../utils/url'; import { createWindowURL } from '../utils/Windows'; +import { ExplorerList } from './ExplorerList'; import { Icon } from './Icon'; -import { ItemList } from './ItemList'; import { MenuButton } from './MenuButton'; import { Window } from './Window'; @@ -222,7 +222,7 @@ export const Explorer = () => { onClick={handleDesktopTaskbarClick} ref={desktopRef} > - ; }; -export function ItemList(p: { +export function ExplorerList(p: { appearance?: 'icons' | 'icons-vertical' | 'list' | 'details'; columns?: { key: string; name: string }[]; items: Item[]; @@ -22,16 +22,18 @@ export function ItemList(p: { return ( - +
{(column) => ( )} @@ -40,7 +42,7 @@ export function ItemList(p: { {(item) => ( - +
- + - +
)} diff --git a/src/Wes95/components/Window.tsx b/src/Wes95/components/Window.tsx index d74cf1b..d28a7bb 100644 --- a/src/Wes95/components/Window.tsx +++ b/src/Wes95/components/Window.tsx @@ -1,3 +1,4 @@ +import { WindowTitleButton } from 'css95/solid'; import { createContext, createEffect, @@ -389,20 +390,18 @@ export function Window(p: {
- + - + - +
-
+
{description()}

diff --git a/src/Wes95/programs/Bluesky/PostSearchWindow.tsx b/src/Wes95/programs/Bluesky/PostSearchWindow.tsx index e44dff3..1a45513 100644 --- a/src/Wes95/programs/Bluesky/PostSearchWindow.tsx +++ b/src/Wes95/programs/Bluesky/PostSearchWindow.tsx @@ -87,7 +87,11 @@ export function BlueskyPostSearchWindow(p: { [styles.PostList!]: true, }} > -
+
{(post) => ( <> diff --git a/src/Wes95/programs/Bluesky/PostThreadWindow.tsx b/src/Wes95/programs/Bluesky/PostThreadWindow.tsx index a47e6a2..94c35ac 100644 --- a/src/Wes95/programs/Bluesky/PostThreadWindow.tsx +++ b/src/Wes95/programs/Bluesky/PostThreadWindow.tsx @@ -65,7 +65,7 @@ export function BlueskyPostThreadWindow(p: { [styles.PostList!]: true, }} > -
+
diff --git a/src/Wes95/programs/Bluesky/UserListWindow.tsx b/src/Wes95/programs/Bluesky/UserListWindow.tsx index 0a16c3f..aa9d4e0 100644 --- a/src/Wes95/programs/Bluesky/UserListWindow.tsx +++ b/src/Wes95/programs/Bluesky/UserListWindow.tsx @@ -244,7 +244,7 @@ export function BlueskyUserListWindow(p: { }} >
diff --git a/src/Wes95/programs/DiskDefragmenter/MainWindow.tsx b/src/Wes95/programs/DiskDefragmenter/MainWindow.tsx index 5ee24e2..602567d 100644 --- a/src/Wes95/programs/DiskDefragmenter/MainWindow.tsx +++ b/src/Wes95/programs/DiskDefragmenter/MainWindow.tsx @@ -318,7 +318,7 @@ export function DiskDefragmenterMainWindow(p: { window: WindowState }) { <>
diff --git a/src/Wes95/programs/FileExplorer/MainWindow.tsx b/src/Wes95/programs/FileExplorer/MainWindow.tsx index 6ee698a..cb19761 100644 --- a/src/Wes95/programs/FileExplorer/MainWindow.tsx +++ b/src/Wes95/programs/FileExplorer/MainWindow.tsx @@ -7,8 +7,8 @@ import { Show, } from 'solid-js'; import { Combobox } from '../../components/Combobox'; +import { ExplorerList } from '../../components/ExplorerList'; import { Icon } from '../../components/Icon'; -import { ItemList } from '../../components/ItemList'; import { MenuBar } from '../../components/MenuBar'; import { FileSystemManager } from '../../lib/FileSystemManager'; import { WindowManager } from '../../lib/WindowManager'; @@ -297,11 +297,11 @@ export function FileExplorerMainWindow(p: { >
- -
+
diff --git a/src/Wes95/programs/WordPad/MainWindow.tsx b/src/Wes95/programs/WordPad/MainWindow.tsx index 3fa42df..60ac020 100644 --- a/src/Wes95/programs/WordPad/MainWindow.tsx +++ b/src/Wes95/programs/WordPad/MainWindow.tsx @@ -411,7 +411,7 @@ export function WordPadMainWindow(p: {
-
+
diff --git a/src/Wes95/system/About/MainWindow.tsx b/src/Wes95/system/About/MainWindow.tsx index ad5f6cd..f0d513b 100644 --- a/src/Wes95/system/About/MainWindow.tsx +++ b/src/Wes95/system/About/MainWindow.tsx @@ -43,7 +43,7 @@ export function AboutWindow(p: { data: AboutData; window: WindowState }) {
{acknowledgements()} diff --git a/src/Wes95/system/FileSystem/OpenWindow.tsx b/src/Wes95/system/FileSystem/OpenWindow.tsx index e59f134..ab33c2c 100644 --- a/src/Wes95/system/FileSystem/OpenWindow.tsx +++ b/src/Wes95/system/FileSystem/OpenWindow.tsx @@ -6,8 +6,8 @@ import { Show, } from 'solid-js'; import { Combobox } from '../../components/Combobox'; +import { ExplorerList } from '../../components/ExplorerList'; import { Icon } from '../../components/Icon'; -import { ItemList } from '../../components/ItemList'; import type { MenuItem } from '../../components/Menu'; import { FileSystemManager } from '../../lib/FileSystemManager'; import { WindowManager } from '../../lib/WindowManager'; @@ -164,8 +164,8 @@ export function FileSystemOpenWindow(p: {
-
- +