# Merge codex/reconcile-main-into-cloud into cloud-ux/side-rail · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/94a48df1b7ee45b8792baad5af951babfc4e1194)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: 94a48df1b7ee45b8792baad5af951babfc4e1194

Requested commit: 94a48df1b7ee45b8792baad5af951babfc4e1194

Commit: 94a48df1b7ee45b8792baad5af951babfc4e1194

Tree: c915c7b91fd68396d76275b2b30cc1814bd1e4b9

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Merge codex/reconcile-main-into-cloud into cloud-ux/side-rail

Resolves the _LibraryRailItem conflict in favor of the slimmed rail item
(40px rows, 18px icons, tooltip description), which already includes the
disabled-item opacity decay that came in from the library-states PR.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

```

## Parents

- [785928990f977c355add19d8a6341c3b939b51fe](https://git.cafe/dara/icarus/commit/785928990f977c355add19d8a6341c3b939b51fe?format=markdown)

- [83aa0c4771df340a9d09f47c05b6dfaa27136487](https://git.cafe/dara/icarus/commit/83aa0c4771df340a9d09f47c05b6dfaa27136487?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/94a48df1b7ee45b8792baad5af951babfc4e1194?format=markdown)