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

51bbaa9f

Commit 51bbaa9f authored 6 years ago by Julia Friesel

Downloads
- Plain Diff

Merge branch '197-re-make-chart-with-svg-again' into 'master'

Resolve "re-make chart with svg (again)"

Closes #197 and #168

See merge request bloodyhealth/drip!77

parents 024b553e 03022ffa

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

android/app/build.gradle 1 addition, 0 deletions

android/app/build.gradle
android/app/src/main/java/com/drip/MainApplication.java 2 additions, 0 deletions

android/app/src/main/java/com/drip/MainApplication.java
android/settings.gradle 2 additions, 0 deletions

android/settings.gradle
components/chart/chart.js 4 additions, 3 deletions

components/chart/chart.js
components/chart/day-column.js 47 additions, 40 deletions

components/chart/day-column.js
components/chart/dot-and-line.js 16 additions, 34 deletions

components/chart/dot-and-line.js
components/chart/nfp-lines.js 3 additions, 3 deletions

components/chart/nfp-lines.js
components/chart/styles.js 21 additions, 23 deletions

components/chart/styles.js
ios/drip.xcodeproj/project.pbxproj 16 additions, 0 deletions

ios/drip.xcodeproj/project.pbxproj
package-lock.json 43 additions, 0 deletions

package-lock.json
package.json 1 addition, 0 deletions

package.json

with 156 additions and 103 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