Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

W

wallet
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

4cec89ee

Commit 4cec89ee authored 5 years ago by Gandalf

Downloads
- Plain Diff

Merge branch 'witnesses-page' into 'autoclave'

Refresh Witnesses page design

See merge request !7

parents f56097a2 57f61ac4

No related branches found

No related tags found

2 merge requests!11merge autoclave into master,!7Refresh Witnesses page design

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/elements/Icon.jsx 11 additions, 1 deletion

src/app/components/elements/Icon.jsx
src/app/components/elements/Userpic.jsx 5 additions, 2 deletions

src/app/components/elements/Userpic.jsx
src/app/components/modules/ProposalList/Proposal.jsx 2 additions, 5 deletions

src/app/components/modules/ProposalList/Proposal.jsx
src/app/components/modules/ProposalList/styles.scss 4 additions, 4 deletions

src/app/components/modules/ProposalList/styles.scss
src/app/components/pages/Witnesses.jsx 292 additions, 32 deletions

src/app/components/pages/Witnesses.jsx
src/app/components/pages/Witnesses.scss 61 additions, 13 deletions

src/app/components/pages/Witnesses.scss
src/app/locales/en.json 17 additions, 6 deletions

src/app/locales/en.json
src/app/utils/ParsersAndFormatters.js 26 additions, 1 deletion

src/app/utils/ParsersAndFormatters.js

with 418 additions and 64 deletions

Loading

0% Loading 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