Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f22f726
feat: add BadgeComponent
PendragonDevelopment Apr 17, 2026
92d779b
feat: add IconComponent with Feather icon set
PendragonDevelopment Apr 17, 2026
5eb7e28
feat: add LinkComponent
PendragonDevelopment Apr 17, 2026
d99d9db
Merge branch 'feat/link-component' into feat/banner-component
PendragonDevelopment Apr 17, 2026
88130db
feat: add BannerComponent (molecule)
PendragonDevelopment Apr 17, 2026
0d3cb6c
Merge branch 'feat/banner-component' into develop
PendragonDevelopment Apr 18, 2026
d9374b6
docs: document the develop integration branch and its maintenance
PendragonDevelopment Apr 18, 2026
63161a8
feat(icons): expand to full Feather set (289 icons)
PendragonDevelopment Apr 18, 2026
e155d32
Merge branch 'feat/icon-component' into develop
PendragonDevelopment Apr 18, 2026
6838929
feat: add BrandIconComponent with Figma SVG exporter
PendragonDevelopment Apr 18, 2026
cc1227b
Merge branch 'feat/icon-component' into develop
PendragonDevelopment Apr 18, 2026
12dce19
chore: export Figma brand icons
PendragonDevelopment Apr 18, 2026
2fe9721
feat: add AccordionComponent
PendragonDevelopment Apr 18, 2026
8c15b59
Merge branch 'feat/accordion-component' into develop
PendragonDevelopment Apr 18, 2026
98b3ec5
feat(accordion): add CSS transition + body top padding
PendragonDevelopment Apr 18, 2026
25af367
Merge branch 'feat/accordion-component' into develop
PendragonDevelopment Apr 18, 2026
4372f82
feat: add AvatarComponent
PendragonDevelopment Apr 18, 2026
fcf0c6c
Merge branch 'feat/avatar-component' into develop
PendragonDevelopment Apr 18, 2026
c96f8a9
fix: remove stale conflict marker in develop showcase page
PendragonDevelopment Apr 18, 2026
0dc0d00
feat: add BreadcrumbComponent
PendragonDevelopment Apr 18, 2026
9c08908
feat(showcase): add breadcrumb examples
PendragonDevelopment Apr 18, 2026
1a5ea10
Merge branch 'feat/breadcrumb-component' into develop
PendragonDevelopment Apr 18, 2026
e5883d2
feat: add CheckboxComponent
PendragonDevelopment Apr 19, 2026
433fc9a
feat(showcase): add checkbox examples
PendragonDevelopment Apr 19, 2026
99110c4
Merge branch 'feat/checkbox-component' into develop
PendragonDevelopment Apr 19, 2026
a716f4d
fix(checkbox): use group-has-checked and literal class strings
PendragonDevelopment Apr 19, 2026
56c4808
Merge branch 'feat/checkbox-component' into develop
PendragonDevelopment Apr 19, 2026
f70adfa
fix(checkbox): unique auto-generated ids + working select-all demo
PendragonDevelopment Apr 19, 2026
2f1703a
fix(checkbox): walk up to label for select-all demo data attribute
PendragonDevelopment Apr 19, 2026
52b41ee
feat: add DropdownComponent
PendragonDevelopment Apr 19, 2026
85bd368
Merge branch 'feat/dropdown-component' into develop
PendragonDevelopment Apr 19, 2026
61ceb03
feat: add LogoComponent + avatar/logo variations on Dropdown, Banner,…
PendragonDevelopment Apr 19, 2026
0580a3a
Merge branch 'feat/logo-component' into develop
PendragonDevelopment Apr 19, 2026
171e76d
feat: add FileUploadComponent with inline + dropzone variants
PendragonDevelopment Apr 19, 2026
01193ad
Merge branch 'feat/file-upload-component' into develop
PendragonDevelopment Apr 19, 2026
0a828c7
feat: add InputComponent (single-line text input)
PendragonDevelopment Apr 19, 2026
6a79974
Merge branch 'feat/input-component' into develop
PendragonDevelopment Apr 19, 2026
05f1765
feat: add Toast, ToastContainer, and flash-helper integration
PendragonDevelopment Apr 19, 2026
e9c715a
Merge branch 'feat/toast-component' into develop
PendragonDevelopment Apr 19, 2026
b830404
fix(toast): load init script from container so appended toasts work
PendragonDevelopment Apr 19, 2026
ed6abb1
Merge branch 'fix/toast-preview-init-script' into develop
PendragonDevelopment Apr 19, 2026
7f13195
fix(toast): store init script as frozen String constant, not partial
PendragonDevelopment Apr 19, 2026
e437f14
feat(toast): per-variant default icons + documented override
PendragonDevelopment Apr 19, 2026
988b94c
feat: add TableComponent (organism) with selectable/sortable/striped
PendragonDevelopment Apr 19, 2026
c39013e
Merge branch 'feat/table-component' into develop
PendragonDevelopment Apr 19, 2026
36b3e62
feat: add PaginationComponent (paginator-agnostic)
PendragonDevelopment Apr 20, 2026
45e0588
Merge branch 'feat/pagination-component' into develop
PendragonDevelopment Apr 20, 2026
89d68c8
feat: add RadioComponent + RadioGroupComponent
PendragonDevelopment Apr 20, 2026
dce4022
Merge branch 'feat/radio-component' into develop
PendragonDevelopment Apr 20, 2026
8add827
fix: require view_component at gem load time
PendragonDevelopment Apr 20, 2026
4b94e4c
Merge branch 'fix/require-view-component' into develop
PendragonDevelopment Apr 20, 2026
a377d36
fix: register preview path before Lookbook's set_autoload_paths
PendragonDevelopment Apr 20, 2026
c4bfa86
Merge branch 'fix/preview-autoload-path' into develop
PendragonDevelopment Apr 20, 2026
b7a1dd2
fix: register preview path with view_component.previews.paths too
PendragonDevelopment Apr 20, 2026
2d8bee5
Merge branch 'fix/preview-template-paths' into develop
PendragonDevelopment Apr 20, 2026
a7c3e81
fix: wrap icons in Shipwright::Icons so filename matches Zeitwerk
PendragonDevelopment Apr 21, 2026
4416506
Merge branch 'fix/icons-zeitwerk-namespace' into develop
PendragonDevelopment Apr 21, 2026
474d56c
fix: move staged-list template inside wrapper so JS can find it
PendragonDevelopment Apr 24, 2026
12f3dce
Merge branch 'fix/file-upload-template-scope' into develop
PendragonDevelopment Apr 24, 2026
3279fa2
feat: add SlideoutComponent (sheet/side panel)
PendragonDevelopment Apr 24, 2026
3e5c1f0
Merge branch 'feat/slideout-component' into develop
PendragonDevelopment Apr 24, 2026
b6b188d
fix(slideout): clear <dialog>:modal UA inset:0 on the unused axis
PendragonDevelopment Apr 25, 2026
a2be161
Merge branch 'fix/slideout-dialog-modal-inset' into develop
PendragonDevelopment Apr 25, 2026
e8a381e
feat(slideout): interactive tabs + header bg + per-region class overr…
PendragonDevelopment Apr 25, 2026
d9ad5fd
Merge branch 'fix/slideout-tabs-interactive' into develop
PendragonDevelopment Apr 25, 2026
d7796d5
feat: add ModalComponent (centered dialog)
PendragonDevelopment Apr 28, 2026
4c9cb78
Merge branch 'feat/modal-component' into develop
PendragonDevelopment Apr 28, 2026
5de3232
fix(modal): use arbitrary px widths to dodge --spacing-* collision
PendragonDevelopment Apr 28, 2026
30d24c2
Merge branch 'fix/modal-spacing-container-collision' into develop
PendragonDevelopment Apr 28, 2026
cd43907
fix(toast): use arbitrary width to dodge --spacing-md collision
PendragonDevelopment Apr 28, 2026
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
52 changes: 52 additions & 0 deletions DEVELOP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# `develop` integration branch

While individual component PRs are in review, the `develop` branch
aggregates them so that consuming apps can target a single branch to
preview the full in-flight work without juggling multiple PR branches.

## What's included

Currently integrates:

| Branch / PR | Adds |
|-------------|------|
| `fix/lookbook-button-previews` (#1) | Button & ButtonGroup fixes, Shipwright Pro tokens, Manrope, Lookbook block binding fix |
| `feat/badge-component` (#3) | BadgeComponent, utility color palette |
| `feat/icon-component` (#4) | IconComponent + Feather icon manifest |
| `feat/link-component` (#5) | LinkComponent |
| `feat/banner-component` (#6) | BannerComponent (molecule composing Icon + Link) |

## How to consume

Point your app's Gemfile at this branch:

```ruby
gem "shipwright", github: "headwayio/shipwright-rails", branch: "develop"
```

## Maintenance

### When a feature branch merges to `main`

1. `git checkout develop && git fetch origin && git merge origin/main`
2. Resolve any conflicts (usually `tailwind.css`, `components.html.erb`,
`CHANGELOG.md`) and re-run `cd test/dummy && bundle exec rake tailwindcss:build`
3. `bundle exec rake test` — confirm still green
4. `git push origin develop`

### When a new feature branch opens

1. `git checkout develop`
2. `git merge feat/<new-branch>`
3. Resolve conflicts, rebuild Tailwind, run tests
4. Push

### When develop drifts too far from main

Once all in-flight PRs are merged, consider deleting and recreating
develop from main so it doesn't accumulate stale merge commits.

## Not intended for merging to `main`

`develop` is a preview branch. Don't merge it into `main`. Individual
feature PRs are the source of truth.
5 changes: 5 additions & 0 deletions app/assets/images/shipwright/brand/amex-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/shipwright/brand/amex-fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/shipwright/brand/amex-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/shipwright/brand/angelist-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/shipwright/brand/apple-brand.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions app/assets/images/shipwright/brand/apple-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/assets/images/shipwright/brand/applepay-color.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/shipwright/brand/applepay-fill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading