Merge branch 'combine-fonts-theme' into 'master' (06f83009) · Commits · xpub / xpub-faraday · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xpub-faraday
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Container Registry
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

06f83009

Commit 06f83009 authored 7 years ago by

Alf Eaton

Downloads
- Plain Diff

Merge branch 'combine-fonts-theme' into 'master'

Merge xpub-fonts into xpub-theme

See merge request xpub/xpub!41

parents 2dab4ef4 1a507556

No related branches found

No related tags found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

packages/xpub-collabra/app/app.js 0 additions, 1 deletion

packages/xpub-collabra/app/app.js
packages/xpub-collabra/package.json 0 additions, 1 deletion

packages/xpub-collabra/package.json
packages/xpub-fonts/package.json 0 additions, 17 deletions

packages/xpub-fonts/package.json
packages/xpub-fonts/src/index.js 0 additions, 6 deletions

packages/xpub-fonts/src/index.js
packages/xpub-styleguide/package.json 0 additions, 1 deletion

packages/xpub-styleguide/package.json
packages/xpub-styleguide/src/components/StyleGuideRenderer.js 0 additions, 1 deletion

...ages/xpub-styleguide/src/components/StyleGuideRenderer.js
packages/xpub-styleguide/src/components/Wrapper.js 0 additions, 1 deletion

packages/xpub-styleguide/src/components/Wrapper.js
packages/xpub-theme/package.json 11 additions, 1 deletion

packages/xpub-theme/package.json
packages/xpub-theme/src/index.js 7 additions, 0 deletions

packages/xpub-theme/src/index.js
yarn.lock 13 additions, 13 deletions

yarn.lock

with 31 additions and 42 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment