diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index c052d888..f5813ed0 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -13,7 +13,7 @@ font-family: 'Cabin', sans-serif; } -.harvey-ball__legend { +.harvey-ball-legend { display: flex; justify-content: space-around; align-items: center; @@ -23,12 +23,11 @@ } .subcategory-card { - border: 1px solid #CECECE; + border: 1px solid $gray-2; background-color: $gray-3; min-width: 95%; margin: auto; padding: 8px; - border: 1px solid #CECECE; font-size: 14px; } @@ -70,3 +69,32 @@ .zone-header { @extend .sub-header-4; } + +.harvey-ball { + stroke: $black; +} + +.harvey-ball__ideal { + fill: $purple; +} + +.harvey-ball__approval { + fill: $purple; +} + +.harvey-ball__growth { + fill: $gold; +} + +.harvey-ball__watch { + fill: $gold; +} + +.harvey-ball__warning { + fill: $white; +} + +.harvey-ball__no_zone { + stroke: $gray-2; + fill: $gray-3; +} diff --git a/app/presenters/subcategory_card_presenter.rb b/app/presenters/subcategory_card_presenter.rb index 8f54af8b..9082e5cd 100644 --- a/app/presenters/subcategory_card_presenter.rb +++ b/app/presenters/subcategory_card_presenter.rb @@ -5,18 +5,14 @@ class SubcategoryCardPresenter @score = score end - def display_icon? - zone.type != :no_zone - end - def harvey_ball_icon icons_by_zone_type = { ideal: "full-circle", approval: "three-quarter-circle", growth: "half-circle", watch: "one-quarter-circle", - warning: "empty-circle", - no_zone: "empty-circle" + warning: "full-circle", + no_zone: "full-circle" } icons_by_zone_type[zone.type] end diff --git a/app/views/dashboard/_subcategory_card.html.erb b/app/views/dashboard/_subcategory_card.html.erb index e11bd6c7..f5f39cf9 100644 --- a/app/views/dashboard/_subcategory_card.html.erb +++ b/app/views/dashboard/_subcategory_card.html.erb @@ -1,8 +1,6 @@