Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 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
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