Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ecolyo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

77d640e8

Commit 77d640e8 authored 4 years ago by Romain CREY

Downloads
- Plain Diff

Merge branch 'dev' into features/US142-right-badges-design

parents fafd0ddd f9437b20

No related branches found

No related tags found

3 merge requests!28Merge fix from dev,!27Dev,!17Features/us142 right badges design

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx 8 additions, 3 deletions

...s/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx
src/components/ContentComponents/EcogestureCard/EcogestureCard.tsx 4 additions, 4 deletions

...nents/ContentComponents/EcogestureCard/EcogestureCard.tsx
src/db/ecogestureData.json 2 additions, 2 deletions

src/db/ecogestureData.json
src/services/challengeDataManagerService.ts 2 additions, 2 deletions

src/services/challengeDataManagerService.ts
src/styles/components/_ecogesture.scss 8 additions, 5 deletions

src/styles/components/_ecogesture.scss

with 24 additions and 16 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