From 94b85fb9e38bd37895d655a27848b77d8f55ea2f Mon Sep 17 00:00:00 2001 From: Cillian O'Ruanaidh Date: Thu, 28 May 2020 20:52:47 +0100 Subject: [PATCH] Fix up Code Climate issues with Open Street Map code. --- app/assets/stylesheets/darkswarm/map.css.scss | 7 +++-- app/models/preference_sections/map_section.rb | 2 ++ .../api/open_street_map_config_serializer.rb | 26 ++++++++++++------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/map.css.scss b/app/assets/stylesheets/darkswarm/map.css.scss index 70d28a5f6b..8f9ee717f9 100644 --- a/app/assets/stylesheets/darkswarm/map.css.scss +++ b/app/assets/stylesheets/darkswarm/map.css.scss @@ -49,15 +49,18 @@ left: 54px; width: 50%; z-index: 1000; + .autocomplete-input, .autocomplete-result-list { - border: 2px solid #888; + border: 2px solid $grey-500; + &:hover, &:active, &:focus { border-color: $clr-brick; } } + .autocomplete-result-list { - border-top: 1px dotted #888; + border-top: 1px dotted $grey-500; } } } diff --git a/app/models/preference_sections/map_section.rb b/app/models/preference_sections/map_section.rb index 9fc8112cac..cc16939c36 100644 --- a/app/models/preference_sections/map_section.rb +++ b/app/models/preference_sections/map_section.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module PreferenceSections class MapSection def name diff --git a/app/serializers/api/open_street_map_config_serializer.rb b/app/serializers/api/open_street_map_config_serializer.rb index 37d6a8bd36..8c5aec5dbb 100644 --- a/app/serializers/api/open_street_map_config_serializer.rb +++ b/app/serializers/api/open_street_map_config_serializer.rb @@ -1,15 +1,21 @@ -class Api::OpenStreetMapConfigSerializer < ActiveModel::Serializer - attributes :open_street_map_enabled, :open_street_map_provider_name, :open_street_map_provider_options +# frozen_string_literal: true - def open_street_map_enabled - ContentConfig.open_street_map_enabled - end +module Api + class OpenStreetMapConfigSerializer < ActiveModel::Serializer + attributes :open_street_map_enabled, + :open_street_map_provider_name, + :open_street_map_provider_options - def open_street_map_provider_name - ContentConfig.open_street_map_provider_name - end + def open_street_map_enabled + ContentConfig.open_street_map_enabled + end - def open_street_map_provider_options - ContentConfig.open_street_map_provider_options.to_json + def open_street_map_provider_name + ContentConfig.open_street_map_provider_name + end + + def open_street_map_provider_options + ContentConfig.open_street_map_provider_options.to_json + end end end