Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

Drip
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4ed3aa48

Commit 4ed3aa48 authored 6 years ago by Julia Friesel

Downloads
- Plain Diff

Merge branch 'master' into 156-make-components-like-prettier-radio-buttons

parents ac9ff0dc c07dc51e

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

android/app/src/main/res/values/colors.xml 12 additions, 0 deletions

android/app/src/main/res/values/colors.xml
android/app/src/main/res/values/styles.xml 1 addition, 0 deletions

android/app/src/main/res/values/styles.xml
components/cycle-day/cycle-day-overview.js 43 additions, 9 deletions

components/cycle-day/cycle-day-overview.js
components/cycle-day/labels/labels.js 14 additions, 4 deletions

components/cycle-day/labels/labels.js
components/cycle-day/symptoms/index.js 4 additions, 2 deletions

components/cycle-day/symptoms/index.js
components/cycle-day/symptoms/note.js 3 additions, 2 deletions

components/cycle-day/symptoms/note.js
components/cycle-day/symptoms/pain.js 144 additions, 0 deletions

components/cycle-day/symptoms/pain.js
components/cycle-day/symptoms/sex.js 1 addition, 4 deletions

components/cycle-day/symptoms/sex.js
components/labels.js 2 additions, 1 deletion

components/labels.js
db/index.js 21 additions, 1 deletion

db/index.js

with 245 additions and 23 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