diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss index 49c7c52..9e9bfe9 100644 --- a/app/assets/stylesheets/custom.scss +++ b/app/assets/stylesheets/custom.scss @@ -23,11 +23,11 @@ body { } .event__link--more-male { - color: $blue; + color: $accent-light; } .event__link--more-female { - color: $red; + color: $accent; } .sorting { diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss index 101d95c..aa1797a 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -1,5 +1,5 @@ #header { - background: $red; + background: $accent; color: white; padding: 0px; diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 4f4838b..7ffa3e7 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -51,6 +51,9 @@ $admin-steel-blue: #4682B4; $yellow: #FFBB00; +$accent: #00978b; +$accent-light: #A1D9D4; + // Bootsrap Settings for the `` element. $body-bg: white !default; $body-color: $dark-grey; diff --git a/app/views/events/_all_events_donut.html.erb b/app/views/events/_all_events_donut.html.erb index d7fd484..758b219 100644 --- a/app/views/events/_all_events_donut.html.erb +++ b/app/views/events/_all_events_donut.html.erb @@ -10,10 +10,11 @@ value: <%= percent %>}, ], backgroundColor: 'whitesmoke', + formatter: function(y) { return y + "%"}, labelColor: '#4E4E4E', colors: [ - '#375E97', - '#E43A15' + '#A1D9D4', + '#00978b' ] }); diff --git a/app/views/events/_donut.html.erb b/app/views/events/_donut.html.erb index dc2e154..648d9c3 100644 --- a/app/views/events/_donut.html.erb +++ b/app/views/events/_donut.html.erb @@ -7,13 +7,14 @@ {label: "<%= I18n.t 'show.event.donut.male' %>", value: <%= event.percent_male %>}, {label: "<%= I18n.t 'show.event.donut.female' %>", - value: <%= event.percent_female %>}, + value: <%= event.percent_female %> }, ], + formatter: function(y) { return y + "%"}, backgroundColor: 'whitesmoke', labelColor: '#4E4E4E', colors: [ - '#375E97', - '#c5141c' + '#A1D9D4', + '#00978b' ] });