diff --git a/app/assets/stylesheets/colours.scss b/app/assets/stylesheets/colours.scss index b72eb38..5e42a93 100644 --- a/app/assets/stylesheets/colours.scss +++ b/app/assets/stylesheets/colours.scss @@ -9,6 +9,6 @@ $warning-pink: #ffe6e6; $warning-blue: #ece6ff; $glucose: $orange; -$carbs: $blue; -$meds: $yellow; +$meds: $blue; +$carbs: $yellow; $exercise: $green; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 3715288..35a045d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -16,8 +16,8 @@ def date_sift measurements def models [ GlucoseMeasurement, - CarbohydrateIntake, MedicationEvent, + CarbohydrateIntake, PhysicalExercise ] end